2 files changed, 12 insertions, 15 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);