Rename ImmRenderer -> Imm

5 files changed, 36 insertions, 39 deletions

diff --git a/include/gfx/gfx.h b/include/gfx/gfx.h
index d5c25b6..eb7a3cd 100644
--- a/include/gfx/gfx.h
+++ b/include/gfx/gfx.h
@@ -2,7 +2,7 @@
 
 typedef struct AssetCache  AssetCache;
 typedef struct GfxCore     GfxCore;
-typedef struct ImmRenderer ImmRenderer;
+typedef struct Imm Imm;
 typedef struct LLR         LLR;
 typedef struct Renderer    Renderer;
 
@@ -21,7 +21,7 @@ GfxCore* gfx_get_core(Gfx*);
 Renderer* gfx_get_renderer(Gfx*);
 
 /// Get the immediate mode renderer.
-ImmRenderer* gfx_get_imm_renderer(Gfx*);
+Imm* gfx_get_imm(Gfx*);
 
 /// Get the low-level renderer.
 LLR* gfx_get_llr(Gfx*);
diff --git a/include/gfx/renderer/imm_renderer.h b/include/gfx/renderer/imm_renderer.h
index db4d290..62c071e 100644
--- a/include/gfx/renderer/imm_renderer.h
+++ b/include/gfx/renderer/imm_renderer.h
@@ -2,41 +2,38 @@
 
 #include <math/aabb2.h>
 #include <math/aabb3.h>
-#include <math/camera.h>
-#include <math/mat4.h>
 #include <math/vec3.h>
-#include <math/vec4.h>
 
-typedef struct ImmRenderer ImmRenderer;
+typedef struct Imm Imm;
 
 /// Prepare the graphics systems for immediate-mode rendering.
 ///
 /// Call this before issuing any immediate-mode rendering draws.
-void gfx_imm_start(ImmRenderer*);
+void gfx_imm_start(Imm*);
 
 /// End immediate mode rendering.
 ///
 /// Call this after issuing immediate-mode rendering draws and before swapping
 /// buffers.
-void gfx_imm_end(ImmRenderer*);
+void gfx_imm_end(Imm*);
 
 /// Flush draw commands.
 ///
 /// This should be done when changing any state that may affect the rendering of
 /// primitives; for example, LLR matrix stack changes.
-void gfx_imm_flush(ImmRenderer*);
+void gfx_imm_flush(Imm*);
 
 /// Draw a set of triangles.
-void gfx_imm_draw_triangles(ImmRenderer*, const vec3[], size_t num_triangles);
+void gfx_imm_draw_triangles(Imm*, const vec3[], size_t num_triangles);
 
 /// Draw a triangle.
-void gfx_imm_draw_triangle(ImmRenderer*, const vec3[3]);
+void gfx_imm_draw_triangle(Imm*, const vec3[3]);
 
 /// Draw a bounding box.
-void gfx_imm_draw_aabb2(ImmRenderer*, aabb2);
+void gfx_imm_draw_aabb2(Imm*, aabb2);
 
 /// Draw a bounding box.
-void gfx_imm_draw_aabb3(ImmRenderer*, aabb3);
+void gfx_imm_draw_aabb3(Imm*, aabb3);
 
 /// Draw a box.
 ///
@@ -49,7 +46,7 @@ void gfx_imm_draw_aabb3(ImmRenderer*, aabb3);
 ///   | 4 ----- 5
 ///   |/      |/
 ///   0 ----- 1
-void gfx_imm_draw_box3(ImmRenderer* renderer, const vec3 vertices[8]);
+void gfx_imm_draw_box3(Imm* renderer, const vec3 vertices[8]);
 
 /// Set the render colour.
-void gfx_imm_set_colour(ImmRenderer*, vec4 colour);
+void gfx_imm_set_colour(Imm*, vec4 colour);
diff --git a/src/gfx.c b/src/gfx.c
index 39b04cd..18098d2 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -11,11 +11,11 @@
 #include <stdlib.h>
 
 typedef struct Gfx {
-  AssetCache  asset_cache;
-  GfxCore     gfxcore;
-  LLR         llr;
-  ImmRenderer imm_renderer;
-  Renderer    renderer;
+  AssetCache asset_cache;
+  GfxCore    gfxcore;
+  LLR        llr;
+  Imm        imm;
+  Renderer   renderer;
 } Gfx;
 
 Gfx* gfx_init(void) {
@@ -28,7 +28,7 @@ Gfx* gfx_init(void) {
     gfx_destroy(&gfx);
     return 0;
   }
-  if (!gfx_imm_make(&gfx->imm_renderer, &gfx->gfxcore, &gfx->llr)) {
+  if (!gfx_imm_make(&gfx->imm, &gfx->gfxcore, &gfx->llr)) {
     // TODO: Add error logs to the initialization failure cases here and inside
     // the renderers.
     gfx_destroy(&gfx);
@@ -50,7 +50,7 @@ void gfx_destroy(Gfx** gfx) {
   scene_mem_destroy();
   gfx_destroy_asset_cache(&(*gfx)->asset_cache);
   gfx_renderer_destroy(&(*gfx)->renderer);
-  gfx_imm_destroy(&(*gfx)->imm_renderer);
+  gfx_imm_destroy(&(*gfx)->imm);
   gfx_llr_destroy(&(*gfx)->llr);
   gfx_del_gfxcore(&(*gfx)->gfxcore);
   free(*gfx);
@@ -67,9 +67,9 @@ Renderer* gfx_get_renderer(Gfx* gfx) {
   return &gfx->renderer;
 }
 
-ImmRenderer* gfx_get_imm_renderer(Gfx* gfx) {
+Imm* gfx_get_imm(Gfx* gfx) {
   assert(gfx);
-  return &gfx->imm_renderer;
+  return &gfx->imm;
 }
 
 LLR* gfx_get_llr(Gfx* gfx) {
diff --git a/src/renderer/imm_renderer.c b/src/renderer/imm_renderer.c
index 01cc5bb..b3af7e8 100644
--- a/src/renderer/imm_renderer.c
+++ b/src/renderer/imm_renderer.c
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <string.h> // memcpy
 
-bool gfx_imm_make(ImmRenderer* renderer, GfxCore* gfxcore, LLR* llr) {
+bool gfx_imm_make(Imm* renderer, GfxCore* gfxcore, LLR* llr) {
   assert(renderer);
   assert(gfxcore);
   assert(llr);
@@ -45,7 +45,7 @@ cleanup:
   return false;
 }
 
-void gfx_imm_destroy(ImmRenderer* renderer) {
+void gfx_imm_destroy(Imm* renderer) {
   assert(renderer);
   assert(renderer->gfxcore);
 
@@ -59,7 +59,7 @@ void gfx_imm_destroy(ImmRenderer* renderer) {
   }
 }
 
-void gfx_imm_flush(ImmRenderer* renderer) {
+void gfx_imm_flush(Imm* renderer) {
   assert(renderer);
 
   if (renderer->num_triangle_verts > 0) {
@@ -78,7 +78,7 @@ void gfx_imm_flush(ImmRenderer* renderer) {
   }
 }
 
-void gfx_imm_start(ImmRenderer* renderer) {
+void gfx_imm_start(Imm* renderer) {
   assert(renderer);
 
   // Shader uniforms are applied lazily.
@@ -88,7 +88,7 @@ void gfx_imm_start(ImmRenderer* renderer) {
   gfx_llr_set_shader(renderer->llr, renderer->shader);
 }
 
-void gfx_imm_end(ImmRenderer* renderer) {
+void gfx_imm_end(Imm* renderer) {
   assert(renderer);
 
   gfx_imm_flush(renderer);
@@ -97,7 +97,7 @@ void gfx_imm_end(ImmRenderer* renderer) {
 }
 
 void gfx_imm_draw_triangles(
-    ImmRenderer* renderer, const vec3 verts[], size_t num_triangles) {
+    Imm* renderer, const vec3 verts[], size_t num_triangles) {
   assert(renderer);
   assert(verts);
   const size_t new_verts = num_triangles * 3;
@@ -112,11 +112,11 @@ void gfx_imm_draw_triangles(
   renderer->num_triangle_verts += new_verts;
 }
 
-void gfx_imm_draw_triangle(ImmRenderer* renderer, const vec3 verts[3]) {
+void gfx_imm_draw_triangle(Imm* renderer, const vec3 verts[3]) {
   gfx_imm_draw_triangles(renderer, verts, 1);
 }
 
-void gfx_imm_draw_aabb2(ImmRenderer* renderer, aabb2 box) {
+void gfx_imm_draw_aabb2(Imm* renderer, aabb2 box) {
   assert(renderer);
 
   // clang-format off
@@ -134,7 +134,7 @@ void gfx_imm_draw_aabb2(ImmRenderer* renderer, aabb2 box) {
   gfx_imm_draw_triangles(renderer, tris, 2);
 }
 
-void gfx_imm_draw_aabb3(ImmRenderer* renderer, aabb3 box) {
+void gfx_imm_draw_aabb3(Imm* renderer, aabb3 box) {
   assert(renderer);
 
   // clang-format off
@@ -152,7 +152,7 @@ void gfx_imm_draw_aabb3(ImmRenderer* renderer, aabb3 box) {
   gfx_imm_draw_box3(renderer, vertices);
 }
 
-void gfx_imm_draw_box3(ImmRenderer* renderer, const vec3 vertices[8]) {
+void gfx_imm_draw_box3(Imm* renderer, const vec3 vertices[8]) {
   assert(renderer);
   assert(vertices);
 
@@ -182,7 +182,7 @@ void gfx_imm_draw_box3(ImmRenderer* renderer, const vec3 vertices[8]) {
   gfx_imm_draw_triangles(renderer, tris, 12);
 }
 
-void gfx_imm_set_colour(ImmRenderer* renderer, vec4 colour) {
+void gfx_imm_set_colour(Imm* renderer, vec4 colour) {
   assert(renderer);
   assert(renderer->shader);
 
diff --git a/src/renderer/imm_renderer_impl.h b/src/renderer/imm_renderer_impl.h
index 61b49a7..d87b910 100644
--- a/src/renderer/imm_renderer_impl.h
+++ b/src/renderer/imm_renderer_impl.h
@@ -22,7 +22,7 @@ typedef struct Texture       Texture;
 /// things simple while the extra complexity is not needed.
 /// TODO: Flush the buffer when it reaches its maximum size to remove this
 ///  constraint.
-typedef struct ImmRenderer {
+typedef struct Imm {
   GfxCore* gfxcore;
   LLR*     llr;
 
@@ -34,10 +34,10 @@ typedef struct ImmRenderer {
     bool wireframe : 1;
   } flags;
   vec3 triangle_verts[GFX_IMM_MAX_NUM_TRIANGLES * 3];
-} ImmRenderer;
+} Imm;
 
 /// Create a new immediate mode renderer.
-bool gfx_imm_make(ImmRenderer*, GfxCore*, LLR*);
+bool gfx_imm_make(Imm*, GfxCore*, LLR*);
 
 /// Destroy the immediate mode renderer.
-void gfx_imm_destroy(ImmRenderer*);
+void gfx_imm_destroy(Imm*);