1 files changed, 29 insertions, 16 deletions

diff --git a/gfx/src/renderer/imm_renderer.c b/gfx/src/renderer/imm_renderer.c
index e8c0410..dd5e2cb 100644
--- a/gfx/src/renderer/imm_renderer.c
+++ b/gfx/src/renderer/imm_renderer.c
@@ -135,32 +135,45 @@ void gfx_imm_draw_aabb3(ImmRenderer* renderer, aabb3 box) {
   assert(renderer);
 
   // clang-format off
-  const vec3 verts[8] = {
-      box.min,                                    //     2 ----- 6
-      vec3_make(box.min.x, box.min.y, box.max.z), //    /       /|
-      vec3_make(box.min.x, box.max.y, box.min.z), //   3 ----- 7 |
+  const vec3 vertices[8] = {
+      vec3_make(box.min.x, box.min.y, box.max.z), //     7 ----- 6
+      vec3_make(box.max.x, box.min.y, box.max.z), //    /       /|
+      vec3_make(box.max.x, box.max.y, box.max.z), //   3 ----- 2 |
       vec3_make(box.min.x, box.max.y, box.max.z), //   |       | |
-      vec3_make(box.max.x, box.min.y, box.min.z), //   | 0 ----- 4
-      vec3_make(box.max.x, box.min.y, box.max.z), //   |/      |/
-      vec3_make(box.max.x, box.max.y, box.min.z), //   1 ----- 5
-      box.max};
+      vec3_make(box.min.x, box.min.y, box.min.z), //   | 4 ----- 5
+      vec3_make(box.max.x, box.min.y, box.min.z), //   |/      |/
+      vec3_make(box.max.x, box.max.y, box.min.z), //   0 ----- 1
+      vec3_make(box.min.x, box.max.y, box.min.z)};
   // clang-format on
 
-#define tri(i0, i1, i2) verts[i0], verts[i1], verts[i2]
-  // TODO: Use vertex indices in Geometry.
+  gfx_imm_draw_box3(renderer, vertices);
+}
+
+void gfx_imm_draw_box3(ImmRenderer* renderer, const vec3 vertices[8]) {
+  assert(renderer);
+  assert(vertices);
+
+  //     7 ----- 6
+  //    /       /|
+  //   3 ----- 2 |
+  //   |       | |
+  //   | 4 ----- 5
+  //   |/      |/
+  //   0 ----- 1
+
+#define tri(i0, i1, i2) vertices[i0], vertices[i1], vertices[i2]
   const vec3 tris[36] = {// Front.
-                         tri(1, 5, 7), tri(1, 7, 3),
+                         tri(0, 1, 2), tri(0, 2, 3),
                          // Right.
-                         tri(5, 4, 6), tri(5, 6, 7),
+                         tri(1, 5, 6), tri(1, 6, 2),
                          // Back.
-                         tri(4, 0, 2), tri(4, 2, 6),
+                         tri(5, 4, 7), tri(5, 7, 6),
                          // Left.
-                         tri(0, 1, 3), tri(0, 3, 2),
+                         tri(4, 0, 03), tri(4, 3, 7),
                          // Top.
-                         tri(3, 7, 6), tri(3, 6, 2),
+                         tri(3, 2, 6), tri(3, 6, 7),
                          // Bottom.
                          tri(0, 4, 5), tri(0, 5, 1)};
-#undef tri
 
   gfx_imm_draw_triangles(renderer, tris, 12);
 }