diff options
Diffstat (limited to 'src/rendering/include/engine')
4 files changed, 7 insertions, 8 deletions
diff --git a/src/rendering/include/engine/rendering/platform.h b/src/rendering/include/engine/rendering/platform.h index 5d2408e..9497fdb 100644 --- a/src/rendering/include/engine/rendering/platform.h +++ b/src/rendering/include/engine/rendering/platform.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include <cglm/cglm.h> +#include <cglm/ivec2.h> #include <engine/core/types.h> // TODO: We only need the window once all the garbage in Instance is cleaned up. diff --git a/src/rendering/include/engine/rendering/platform_glfw.h b/src/rendering/include/engine/rendering/platform_glfw.h index cbc3520..056d130 100644 --- a/src/rendering/include/engine/rendering/platform_glfw.h +++ b/src/rendering/include/engine/rendering/platform_glfw.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include <cglm/cglm.h> +#include <cglm/ivec2.h> #include <engine/core/types.h> #include <engine/rendering/platform.h> diff --git a/src/rendering/include/engine/rendering/rendering.h b/src/rendering/include/engine/rendering/rendering.h index d338778..5badec7 100644 --- a/src/rendering/include/engine/rendering/rendering.h +++ b/src/rendering/include/engine/rendering/rendering.h @@ -6,10 +6,9 @@ extern "C" { #endif #include <engine/core/types.h> -#include <engine/utils/vector.h> #include <engine/rendering/window.h> -#include <cglm/cglm.h> +#include <cglm/ivec2.h> /* Definitions */ #define RGBA(_r, _g, _b, _a) ((Engine_color){.r = _r, .g = _g, .b = _b, .a = _a}) @@ -34,7 +33,7 @@ typedef struct { typedef struct { u32 texture_id; - v2_i32 coord; + ivec2 coord; } Sprite; typedef enum { @@ -230,8 +229,8 @@ void r_reset_camera(Camera* c); //void window_size_callback(GLFWwindow* window, i32 width, i32 height); -void engine_draw_sprite(Sprite* s, v2_i32* pos, f32 scale); -void engine_draw_sprite_ex(Sprite* s, v2_i32* pos, f32 scale, +void engine_draw_sprite(Sprite* s, ivec2* pos, f32 scale); +void engine_draw_sprite_ex(Sprite* s, ivec2* pos, f32 scale, Engine_color colormod); void engine_draw_model(RenderObject* o, vec3 pos); diff --git a/src/rendering/include/engine/rendering/window.h b/src/rendering/include/engine/rendering/window.h index 83384bc..10d4ddd 100644 --- a/src/rendering/include/engine/rendering/window.h +++ b/src/rendering/include/engine/rendering/window.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include <cglm/cglm.h> +#include <cglm/ivec2.h> #include <engine/core/types.h> |