nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor rearrangements

Browse Source
This commit is contained in:
nullifiedcat 2017-11-13 22:55:58 +03:00
parent a539bd4b73
commit c78d9feb4c
26 changed files with 180 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.cproject
View File

@ -116,26 +116,29 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="freetype-gl|imgui|include|memory|classinfo|ncc|source-sdk-2013|autogen|vtables|segvcatch|gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="autogen|segvcatch|xoverlay|include|classinfo|vtables|ipc|ncc|memory|hooks|sdk|imgui|src|freetype-gl|copypasted|source-sdk-2013|targeting|gui|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="freetype-gl"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="imgui"/>
<entry excluding="copypasted|gui|classinfo|hooks|hacks|sdk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
<entry excluding="hacks|copypasted|visual|gui|classinfo|hooks|sdk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/classinfo"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/copypasted"/>
<entry excluding="ncc|im" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui"/>
<entry excluding="im|ncc" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui/im"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui/ncc"/>
<entry excluding="ac" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/hacks"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/hacks/ac"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/hooks"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/sdk"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/visual"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="segvcatch"/>
<entry excluding="hacks/ac|memory|imgui|classinfo|autogen|vtables|segvcatch|gui|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
<entry excluding="autogen|segvcatch|targeting|visual|classinfo|vtables|gui|ipc|mem|memory|imgui|hacks/ac" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/classinfo"/>
<entry excluding="im|ncc|depr" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
<entry excluding="im|depr|ncc" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui/im"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui/ncc"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hacks/ac"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/visual"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="xoverlay"/>
</sourceEntries>
</configuration>
</storageModule>

15
include/common.hpp
View File

@ -51,7 +51,7 @@
#include <aftercheaders.hpp>
#include "macros.hpp"
#include "colors.hpp"
#include <visual/colors.hpp>
#if ENABLE_VISUALS == 1
@ -59,14 +59,13 @@ extern "C" {
#include <vec234.h>
}
#include "ftrender.hpp"
#include "drawing.hpp"
#include <visual/ftrender.hpp>
#include <visual/drawing.hpp>
#include "fidgetspinner.hpp"
#include DRAW_API
#include "EffectGlow.hpp"
#include "atlas.hpp"
#include "EffectChams.hpp"
#include "drawmgr.hpp"
#include<visual/drawex.hpp>#include <visual/EffectGlow.hpp>
#include <visual/atlas.hpp>
#include <visual/EffectChams.hpp>
#include <visual/drawmgr.hpp>
#endif

2
include/fidgetspinner.hpp
View File

@ -7,8 +7,8 @@
#pragma once
#include <visual/atlas.hpp>
#include "common.hpp"
#include "atlas.hpp"
class CatVar;

0
include/EffectChams.hpp → include/visual/EffectChams.hpp
View File

0
include/EffectGlow.hpp → include/visual/EffectGlow.hpp
View File

0
include/atlas.hpp → include/visual/atlas.hpp
View File

0
include/colors.hpp → include/visual/colors.hpp
View File

0
include/drawex.hpp → include/visual/drawex.hpp
View File

10
include/drawgl.hpp → include/visual/drawgl.hpp
View File

@ -8,15 +8,13 @@
#ifndef DRAWGL_HPP_
#define DRAWGL_HPP_
#include <drawing.hpp>
#include <visual/drawing.hpp>
#include <freetype-gl/freetype-gl.h>
#include <freetype-gl/vertex-buffer.h>
#define draw_api drawgl
extern "C" {
#include "freetype-gl/vec234.h"
#include "freetype-gl/vertex-buffer.h"
}
namespace drawgl {
struct vertex_v2c4_t {

0
include/drawing.hpp → include/visual/drawing.hpp
View File

0
include/drawmgr.hpp → include/visual/drawmgr.hpp
View File

0
include/ftrender.hpp → include/visual/ftrender.hpp
View File

2
makefile
View File

@ -74,6 +74,8 @@ DEFINES=
ifeq ($(RENDERING_ENGINE), XOVERLAY)
ENABLE_GUI=0
INCLUDES+= -Ixoverlay
LDLIBS+=-loverlay
endif
DEFINES+=_GLIBCXX_USE_CXX11_ABI=0 _POSIX=1 FREETYPE_GL_USE_VAO=1 RAD_TELEMETRY_DISABLED=1 LINUX=1 USE_SDL=1 _LINUX=1 POSIX=1 GNUC=1 NO_MALLOC_OVERRIDE=1

2
src/hack.cpp
View File

@ -12,7 +12,7 @@
#define TO_STRING(x) STRINGIFY(x)
#if ENABLE_VISUALS == 1
#include "ftrender.hpp"
#include <visual/ftrender.hpp>
#endif

2
src/EffectChams.cpp → src/visual/EffectChams.cpp
View File

@ -5,8 +5,8 @@
* Author: nullifiedcat
*/
#include <visual/EffectChams.hpp>
#include "common.hpp"
#include "EffectChams.hpp"
//static CatVar chams_experimental(CV_SWITCH, "chams_effect", "0", "Experimental Chams");

2
src/EffectGlow.cpp → src/visual/EffectGlow.cpp
View File

@ -5,8 +5,8 @@
* Author: nullifiedcat
*/
#include <visual/EffectGlow.hpp>
#include "common.hpp"
#include "EffectGlow.hpp"
IMaterialSystem* materials = nullptr;

0
src/atlas.cpp → src/visual/atlas.cpp
View File

0
src/colors.cpp → src/visual/colors.cpp
View File

0
src/drawex.cpp → src/visual/drawex.cpp
View File

4
src/drawgl.cpp → src/visual/drawgl.cpp
View File

@ -5,9 +5,9 @@
* Author: nullifiedcat
*/
#include "drawgl.hpp"
#include <visual/atlas.hpp>
#include <visual/drawgl.hpp>
#include "common.hpp"
#include "atlas.hpp"
extern "C" {
#include <mat4.h>

0
src/drawing.cpp → src/visual/drawing.cpp
View File

0
src/drawmgr.cpp → src/visual/drawmgr.cpp
View File

0
src/ftrender.cpp → src/visual/ftrender.cpp
View File

20
xoverlay/fontapi.h Normal file
View File

@ -0,0 +1,20 @@
/*
* fontapi.h
*
* Created on: Nov 11, 2017
* Author: nullifiedcat
*/
#pragma once
typedef unsigned int xoverlay_font_handle_t;
#define XOVERLAY_FONT_COUNT 64
xoverlay_font_handle_t
xoverlay_font_load(const char *path, float size);
void
xoverlay_font_unload(xoverlay_font_handle_t handle);
void
xoverlay_string_size(xoverlay_font_handle_t handle, const char *string, int *x, int *y);

114
xoverlay/overlay.h Normal file
View File

@ -0,0 +1,114 @@
/*
* overlay.hpp
*
* Created on: Nov 8, 2017
* Author: nullifiedcat
*/
#pragma once
#include "fontapi.h"
#include "textureapi.h"
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
typedef void(*xoverlay_callback_keypress)(unsigned int keycode, int action);
typedef void(*xoverlay_callback_click)(unsigned int buttoncode, int action);
typedef void(*xoverlay_callback_scroll)(int value);
typedef void(*xoverlay_callback_mousemove)(int dx, int dy, int x, int y);
struct xoverlay_library
{
xoverlay_callback_keypress cb_keypress;
xoverlay_callback_click cb_click;
xoverlay_callback_scroll cb_scroll;
xoverlay_callback_mousemove cb_mousemove;
Display *display;
Window window;
Colormap colormap;
GC gc;
XGCValues gcvalues;
XFontStruct font;
int screen;
int width;
int height;
struct
{
int x;
int y;
} mouse;
char init;
char drawing;
char mapped;
};
struct xoverlay_library xoverlay_library;
typedef struct xoverlay_vec4_t
{
union
{
float data[4];
struct
{
float r;
float g;
float b;
float a;
};
struct
{
float x;
float y;
float z;
float w;
};
};
} xoverlay_vec4_t, xoverlay_rgba_t;
int xoverlay_init();
void xoverlay_destroy();
void xoverlay_install_keyboard_callback(xoverlay_callback_keypress callback);
void xoverlay_install_click_callback(xoverlay_callback_click callback);
void xoverlay_install_scroll_callback(xoverlay_callback_scroll callback);
void xoverlay_install_mouse_callback(xoverlay_callback_mousemove callback);
void
xoverlay_show();
void
xoverlay_hide();
xoverlay_rgba_t
xoverlay_rgba(int r, int g, int b, int a);
void
xoverlay_draw_line(float x, float y, float dx, float dy, xoverlay_rgba_t color, float thickness);
void
xoverlay_draw_rect(float x, float y, float w, float h, xoverlay_rgba_t color);
void
xoverlay_draw_rect_outline(float x, float y, float w, float h, xoverlay_rgba_t color, float thickness);
void
xoverlay_draw_rect_textured(float x, float y, float w, float h, xoverlay_rgba_t color, xoverlay_texture_handle_t texture, float tx, float ty, float tw, float th);
void
xoverlay_draw_string(float x, float y, const char *string, xoverlay_font_handle_t font, xoverlay_vec4_t color, float *out_x, float *out_y);
void
xoverlay_draw_string_with_outline(float x, float y, const char *string, xoverlay_font_handle_t font, xoverlay_vec4_t color, xoverlay_vec4_t outline_color, float outline_width, int adjust_outline_alpha, float *out_x, float *out_y);
void
xoverlay_draw_circle(float x, float y, float radius, xoverlay_rgba_t color, float thickness, int steps);
void xoverlay_poll_events();
void xoverlay_draw_begin();
void xoverlay_draw_end();

19
xoverlay/textureapi.h Normal file
View File

@ -0,0 +1,19 @@
/*
* textureapi.h
*
* Created on: Nov 11, 2017
* Author: nullifiedcat
*/
#pragma once
typedef unsigned xoverlay_texture_handle_t;
xoverlay_texture_handle_t
xoverlay_texture_load_png_rgba(const char *path);
void
xoverlay_texture_unload(xoverlay_texture_handle_t handle);
void
xoverlay_texture_get_size(xoverlay_texture_handle_t handle, int *width, int *height);