Include model rendering in rendering functionality

2 files changed, 14 insertions, 20 deletions

diff --git a/src/rendering/include/engine/rendering/rendering.h b/src/rendering/include/engine/rendering/rendering.h
index 50a61a7..bde298c 100644
--- a/src/rendering/include/engine/rendering/rendering.h
+++ b/src/rendering/include/engine/rendering/rendering.h
@@ -49,10 +49,10 @@ typedef struct {
 } RenderObject;
 
 /* Rendering functions */
-void render_begin(Window w);
-void render_present(Window w);
+void render_begin(Window* w);
+void render_present(Window* w);
 void drawcall_reset(void);
-void render(Window w);
+void render(Window* w);
 
 /* Misc */
 //void window_size_callback(GLFWwindow* window, i32 width, i32 height);
@@ -62,7 +62,7 @@ void render(Window w);
 void engine_draw_sprite(Sprite* s, v2_i32* pos, f32 scale);
 void engine_draw_sprite_ex(Sprite* s, v2_i32* pos, f32 scale,
                            Engine_color colormod);
-void engine_draw_model(RenderObject* o, vec2 pos);
+void engine_draw_model(RenderObject* o, vec3 pos);
 
 Sprite sprite_new(u64 tid, u8 coord);
 
@@ -84,7 +84,7 @@ typedef struct {
     } sprite;
     struct {
       RenderObject* model;
-      vec2 pos;
+      vec3 pos;
       f32 scale;
     } model;
   } data;
diff --git a/src/rendering/include/engine/rendering/window.h b/src/rendering/include/engine/rendering/window.h
index f6da016..bd4eb9c 100644
--- a/src/rendering/include/engine/rendering/window.h
+++ b/src/rendering/include/engine/rendering/window.h
@@ -9,21 +9,17 @@ extern void* window_poll_events;
 extern f64 (*get_time)(void);
 #endif
 
-enum Window_framework {
+typedef enum {
   WINDOW_FRAMEWORK_NONE = 0,
   WINDOW_FRAMEWORK_GLFW,
-};
+} Window_framework;
 
-typedef enum Window_framework Window_framework;
-
-enum Window_renderer {
+typedef enum {
   WINDOW_RENDERER_NONE = 0,
   WINDOW_RENDERER_OPENGL,
-};
-
-typedef enum Window_renderer Window_renderer;
+} Window_renderer;
 
-struct Window {
+typedef struct {
   // Specifies the framwork & renderer combo used.
   Window_framework framework;
   Window_renderer renderer;
@@ -34,16 +30,14 @@ struct Window {
   // Subject to change to a union of backend-dependent structs
   void* window;
   void* context;
-};
-
-typedef struct Window* Window;
+} Window;
 
 // Window function
-Window init_window_glfw(const char* windowtitle, ivec2 windowsize, const u32 flags);
-void destroy_window(Window w);
+Window* init_window_glfw(const char* windowtitle, ivec2 windowsize, const u32 flags);
+void destroy_window(Window* w);
 
 // Renderer intializer(s)
-void init_render_opengl(Window w);
+void init_render_opengl(Window* w);
 
 #undef API
 #endif