Simplify render command buffer

7 files changed, 77 insertions, 139 deletions

diff --git a/src/include/daw/daw.h b/src/include/daw/daw.h
index acbbcd9..ca611b3 100644
--- a/src/include/daw/daw.h
+++ b/src/include/daw/daw.h
@@ -38,6 +38,7 @@ typedef struct Instance {
   Camera *cam;
 
   /* Global resources that live from engine_init to engine_free */
+  /* TODO: Add state-specific resources */
   Resources* resources;
 
   memory* mem;
diff --git a/src/include/daw/keycodes.h b/src/include/daw/keycodes.h
index 869809f..5608741 100644
--- a/src/include/daw/keycodes.h
+++ b/src/include/daw/keycodes.h
@@ -6,16 +6,16 @@ extern "C" {
 
 // We want to reserve the following bytes marked with X for MODS,
 // one bit per MODIFIER (shift, control, alt, super):
-// XXXX 0000 0000 0000  0000 0000 0000 0000
+// 0000 0000 XXXX 0000  0000 0000 0000 0000
 //
 // We want to reserve the following bytes marked with X for ACTIONS
 // enumerate by action type, pressed, released, repeat
-// 0000 0000 XXXX 0000  0000 0000 0000 0000
+// 0000 0000 0000 XXXX  0000 0000 0000 0000
 //
 // We want to reserve the following bytes marked with X for the KEYCODE
 // 0000 0000 0000 0000  XXXX XXXX XXXX XXXX
-#define KEY_MOD(x) (1 << (32-4 + x))
-#define ACTION(x) ((1 << (32-8)) + x)
+#define ACTION(x)  (1 << (16 + x))
+#define KEY_MOD(x) (1 << (20 + x))
 
 typedef enum {
   KEY_SPACE         = ' ',
diff --git a/src/include/daw/platform.h b/src/include/daw/platform.h
deleted file mode 100644
index c837c63..0000000
--- a/src/include/daw/platform.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <cglm/ivec2.h>
-
-#include <daw/types.h>
-// TODO: We only need the window once all the garbage in Instance is cleaned up.
-#include <daw/window.h>
-
-#define DAW_WINDOW_VSYNC      (1 << 0)
-#define DAW_WINDOW_FULLSCREEN (1 << 1)
-#define DAW_WINDOW_RESIZEABLE (1 << 2)
-
-// Whether or not it is clever to force API consistency using a struct like this
-// can be debated, at the time of writing it seemed like a smart idea.
-
-// Platform libraries must implement a struct Platform:
-struct Platform {
-  /* Initialize a window for the given platform. The rendering backend should
-   * also be initialized here.
-   * Parameters:
-   *   const char* title: window title.
-   *   ivec2 windowsize:  the size in pixels for the new window.
-   *   const u32 flags:   window flags, such as static size and fullscreen.
-   *                      The flags are platform agnostic and needs to be
-   *                      converted to the specific library
-   * Returns:
-   *   A pointer to a struct Window, NULL on error.
-   */
-  Window* (*window_init)(const char *restrict title, ivec2 windowsize, const u32 flags);
-
-  /* Destroy, close, and free up resources related to the window and the
-   * platform library specific resources.
-   */
-  void (*window_destroy)(Window *restrict w);
-
-  /* Resize the given window. Resize callbacks are handled by the wrapper
-   * implementation.
-   */
-  void (*window_resize)(Window *restrict window, int width, int height);
-
-  /* Return true if the platform has ordered the window to exit. */
-  bool (*window_should_close)(Window *restrict w);
-
-  /* Poll events on the window from the operating system. */
-  void (*window_poll)(void);
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/include/daw/platform_glfw.h b/src/include/daw/platform_glfw.h
index 1136a9f..01964c9 100644
--- a/src/include/daw/platform_glfw.h
+++ b/src/include/daw/platform_glfw.h
@@ -8,7 +8,6 @@ extern "C" {
 #include <cglm/ivec2.h>
 
 #include <daw/types.h>
-#include <daw/platform.h>
 #include <daw/window.h>
 
 Window* window_init_glfw(const char *restrict windowtitle, ivec2 windowsize, const u32 flags);
diff --git a/src/include/daw/rendering.h b/src/include/daw/rendering.h
index 9f53f78..9c4b647 100644
--- a/src/include/daw/rendering.h
+++ b/src/include/daw/rendering.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 #include <daw/types.h>
-#include <daw/window.h>
+//#include <daw/window.h>
 
 #include <cglm/ivec2.h>
 
@@ -15,14 +15,6 @@ extern "C" {
 #define RGB(_r, _g, _b)      RGBA(_r, _g, _b, 0xFF)
 
 /* Types */
-/* TODO: Cleanup these types. */
-typedef struct {
-  u8 r;
-  u8 g;
-  u8 b;
-  u8 a;
-} Engine_color;
-
 typedef struct {
   /* Maybe implement types, such as `atlas` (default), `standalone`, or
    * something idk. */
@@ -31,11 +23,6 @@ typedef struct {
   i32 height;
 } Texture;
 
-typedef struct {
-  u32 texture_id;
-  ivec2 coord;
-} Sprite;
-
 typedef enum {
   Shader_Error,
 
@@ -63,33 +50,33 @@ typedef enum {
   ShaderBufferFlag_none = 0x00,
 
   // First 3 bytes describe the access frequency.
-  ShaderBuffer_AccessFrequency_stream  = 1, // 1
-  ShaderBuffer_AccessFrequency_static  = 2, // 2
-  ShaderBuffer_AccessFrequency_dynamic = 3, // 3
+  ShaderBuffer_AccessFrequency_stream  =  1, // 1
+  ShaderBuffer_AccessFrequency_static  =  2, // 2
+  ShaderBuffer_AccessFrequency_dynamic =  3, // 3
 
   // Next 3 bytes describe the access type.
-  ShaderBuffer_AccessType_draw         = 1 << 3, //  8
-  ShaderBuffer_AccessType_read         = 2 << 3, // 16
-  ShaderBuffer_AccessType_copy         = 3 << 3, // 24
+  ShaderBuffer_AccessType_draw         =  1 << 3, //  8
+  ShaderBuffer_AccessType_read         =  2 << 3, // 16
+  ShaderBuffer_AccessType_copy         =  3 << 3, // 24
 
   // Next 3 bytes describe the buffer type
-  ShaderBuffer_Type_vertexData         = 1 << 6, // 64
-  ShaderBuffer_Type_vertexPosition     = 2 << 6, // 128
-  ShaderBuffer_Type_vertexIndex        = 3 << 6, // 192
+  ShaderBuffer_Type_vertexData         =  1 << 6, // 64
+  ShaderBuffer_Type_vertexPosition     =  2 << 6, // 128
+  ShaderBuffer_Type_vertexIndex        =  3 << 6, // 192
 
   // Next 4 bytes are designated for the data type
-  ShaderBuffer_DataType_nil            = 1 << 9, //  512
+  ShaderBuffer_DataType_nil            =  1 << 9, //  512
 
-  ShaderBuffer_DataType_f32            = 2 << 9, // 1024
-  ShaderBuffer_DataType_f64            = 3 << 9, // 1536
+  ShaderBuffer_DataType_f32            =  2 << 9, // 1024
+  ShaderBuffer_DataType_f64            =  3 << 9, // 1536
 
-  ShaderBuffer_DataType_i8             = 4 << 9, // 2048
-  ShaderBuffer_DataType_i16            = 5 << 9, // 2560
-  ShaderBuffer_DataType_i32            = 6 << 9, // 3072
-  ShaderBuffer_DataType_i64            = 7 << 9, // 3584
+  ShaderBuffer_DataType_i8             =  4 << 9, // 2048
+  ShaderBuffer_DataType_i16            =  5 << 9, // 2560
+  ShaderBuffer_DataType_i32            =  6 << 9, // 3072
+  ShaderBuffer_DataType_i64            =  7 << 9, // 3584
 
-  ShaderBuffer_DataType_u8             = 8 << 9, // 4096
-  ShaderBuffer_DataType_u16            = 9 << 9, // 4608
+  ShaderBuffer_DataType_u8             =  8 << 9, // 4096
+  ShaderBuffer_DataType_u16            =  9 << 9, // 4608
   ShaderBuffer_DataType_u32            = 10 << 9, // 5120
   ShaderBuffer_DataType_u64            = 11 << 9, // 5632
 } ShaderBufferFlag;
@@ -216,12 +203,6 @@ u32 ShaderBuffer_get_gl_type(u64 flags);
 u32 ShaderBuffer_get_gl_accesstype(u64 flags);
 u32 ShaderBuffer_get_gl_datatype(u64 flags);
 
-/* Rendering functions */
-void render_begin(Window* w);
-void render_present(Window* w);
-void drawcall_reset(void);
-void render(Window* w);
-
 /* Misc */
 void r_perspective(f32 fov, Camera *c);
 void r_perspective_ortho(f32 sz, Camera *c);
@@ -231,35 +212,12 @@ void r_reset_camera(Camera* c);
 
 //void window_size_callback(GLFWwindow* window, i32 width, i32 height);
 
-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);
 
-Sprite sprite_new(u64 tid, u8 coord);
-
-typedef enum {
-  RenderDrawCallType_Text,
-  RenderDrawCallType_Sprite,
-  RenderDrawCallType_Model,
-} RenderDrawCallType;
-
 typedef struct {
-  RenderDrawCallType type;
-  union {
-    void* data;
-    struct {
-      Sprite* sprite;
-      i32 x;
-      i32 y;
-      f32 scale;
-    } sprite;
-    struct {
-      RenderObject* model;
-      vec3 pos;
-      f32 scale;
-    } model;
-  } data;
+  vec3 pos;
+  f32 scale;
+  RenderObject* model;
 } RenderDrawCall;
 
 // TODO make all the shader buffers a list
diff --git a/src/include/daw/utils.h b/src/include/daw/utils.h
index 5f735e9..046b4bc 100644
--- a/src/include/daw/utils.h
+++ b/src/include/daw/utils.h
@@ -11,16 +11,6 @@ extern "C" {
 #define MIN(a, b) ((a < b) ? (a) : (b))
 #define MAX(a, b) ((a > b) ? (a) : (b))
 
-#define MASK_TL (1 << 0)
-#define MASK_T (1 << 1)
-#define MASK_TR (1 << 2)
-#define MASK_L (1 << 3)
-#define MASK_C (1 << 4)
-#define MASK_R (1 << 5)
-#define MASK_BL (1 << 6)
-#define MASK_B (1 << 7)
-#define MASK_BR (1 << 8)
-
 /* Linear interpolate */
 f32 lerp(f32 dt, f32 a, f32 b);
 i32 int_lerp(f32 dt, i32 a, i32 b);
diff --git a/src/include/daw/window.h b/src/include/daw/window.h
index 2924448..83280ec 100644
--- a/src/include/daw/window.h
+++ b/src/include/daw/window.h
@@ -10,9 +10,7 @@ extern "C" {
 #include <daw/types.h>
 #include <daw/input.h>
 
-#ifndef ENGINE_RENDERING_WINDOW_H_EXCLUDE_EXTERNS
-extern u64 (*get_time)(void);
-#endif
+#include <daw/rendering.h>
 
 typedef enum {
   WINDOW_FRAMEWORK_NONE = 0,
@@ -43,10 +41,58 @@ typedef struct {
   i_ctx** bindings;
 } Window;
 
-#include <daw/platform.h>
+#define DAW_WINDOW_VSYNC      (1 << 0)
+#define DAW_WINDOW_FULLSCREEN (1 << 1)
+#define DAW_WINDOW_RESIZEABLE (1 << 2)
+
+// Whether or not it is clever to force API consistency using a struct like this
+// can be debated, at the time of writing it seemed like a smart idea.
+
+// Platform libraries must implement a struct Platform:
+struct Platform {
+  /* Initialize a window for the given platform. The rendering backend should
+   * also be initialized here.
+   * Parameters:
+   *   const char* title: window title.
+   *   ivec2 windowsize:  the size in pixels for the new window.
+   *   const u32 flags:   window flags, such as static size and fullscreen.
+   *                      The flags are platform agnostic and needs to be
+   *                      converted to the specific library
+   * Returns:
+   *   A pointer to a struct Window, NULL on error.
+   */
+  Window* (*window_init)(const char *restrict title, ivec2 windowsize, const u32 flags);
+
+  /* Destroy, close, and free up resources related to the window and the
+   * platform library specific resources.
+   */
+  void (*window_destroy)(Window *restrict w);
+
+  /* Resize the given window. Resize callbacks are handled by the wrapper
+   * implementation.
+   */
+  void (*window_resize)(Window *restrict window, int width, int height);
+
+  /* Return true if the platform has ordered the window to exit. */
+  bool (*window_should_close)(Window *restrict w);
+
+  /* Poll events on the window from the operating system. */
+  void (*window_poll)(void);
+};
+
+
+#ifndef ENGINE_RENDERING_WINDOW_H_EXCLUDE_EXTERNS
+extern u64 (*get_time)(void);
+#endif
 
 Window* Window_new(const struct Platform *p, const char *restrict title, Window_framework framework, Window_renderer renderer, ivec2 size, u32 flags);
 
+/* Rendering functions */
+void render_begin(Window* w);
+void render_present(Window* w);
+void window_reset_drawing(void);
+void render(Window* w);
+
 void get_mousepos(double *x, double *y);
 
 #ifdef __cplusplus