Rename scene_memory -> memory

19 files changed, 32 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c480daf..de5f0dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ add_library(gfx SHARED
   src/llr/light.c
   src/llr/material.c
   src/llr/mesh.c
+  src/memory.c
   src/renderer/imm_renderer.c
   src/renderer/renderer.c
   src/scene/animation.c
@@ -61,7 +62,6 @@ add_library(gfx SHARED
   src/scene/node.c
   src/scene/object.c
   src/scene/scene.c
-  src/scene/scene_memory.c
   src/gfx.c
   src/util/geometry.c
   src/util/ibl.c
diff --git a/include/gfx/llr/llr.h b/include/gfx/llr/llr.h
index 77df33f..8add1d5 100644
--- a/include/gfx/llr/llr.h
+++ b/include/gfx/llr/llr.h
@@ -36,9 +36,6 @@ void gfx_llr_clear_skeleton(LLR*);
 /// Set the camera.
 void gfx_llr_set_camera(LLR*, const Camera*);
 
-/// Set the view-projection matrix.
-// void gfx_llr_set_view_projection_matrix(LLR*, const mat4*);
-
 /// Set the aspect ratio.
 void gfx_llr_set_aspect(LLR*, float aspect);
 
diff --git a/include/gfx/scene/scene.h b/include/gfx/scene/scene.h
index 0d96210..ac1b315 100644
--- a/include/gfx/scene/scene.h
+++ b/include/gfx/scene/scene.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <math/defs.h>
-#include <math/fwd.h>
-
 typedef struct SceneNode SceneNode;
 
 typedef struct Scene Scene;
diff --git a/src/asset/asset_cache.c b/src/asset/asset_cache.c
index 727b63f..a364330 100644
--- a/src/asset/asset_cache.c
+++ b/src/asset/asset_cache.c
@@ -1,10 +1,10 @@
 #include "asset_cache.h"
 
+#include "memory.h"
 #include "model.h"
 #include "scene/animation_impl.h"
 #include "scene/model_impl.h"
 #include "scene/node_impl.h"
-#include "scene/scene_memory.h"
 #include "texture.h"
 
 #include <gfx/asset.h>
diff --git a/src/gfx.c b/src/gfx.c
index 4291ae7..39b04cd 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -3,9 +3,9 @@
 #include "asset/asset_cache.h"
 #include "core/core_impl.h"
 #include "llr/llr_impl.h"
+#include "memory.h"
 #include "renderer/imm_renderer_impl.h"
 #include "renderer/renderer_impl.h"
-#include "scene/scene_memory.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/llr/light.c b/src/llr/light.c
index 1d1c40d..0fa1522 100644
--- a/src/llr/light.c
+++ b/src/llr/light.c
@@ -1,7 +1,7 @@
 #include "light_impl.h"
 
-#include "../scene/node_impl.h"
-#include "../scene/scene_memory.h"
+#include "memory.h"
+#include "scene/node_impl.h"
 
 #include <error.h>
 
diff --git a/src/llr/material.c b/src/llr/material.c
index 4014482..f09dd3f 100644
--- a/src/llr/material.c
+++ b/src/llr/material.c
@@ -1,6 +1,6 @@
 #include "material_impl.h"
 
-#include "../scene/scene_memory.h"
+#include "memory.h"
 
 #include <gfx/core.h>
 
diff --git a/src/llr/mesh.c b/src/llr/mesh.c
index 3aebb04..5f9e5d0 100644
--- a/src/llr/mesh.c
+++ b/src/llr/mesh.c
@@ -1,6 +1,6 @@
 #include "mesh_impl.h"
 
-#include "../scene/scene_memory.h"
+#include "memory.h"
 
 #include <assert.h>
 
diff --git a/src/scene/scene_memory.c b/src/memory.c
index 3a01325..59bf8ca 100644
--- a/src/scene/scene_memory.c
+++ b/src/memory.c
@@ -1,16 +1,16 @@
-#include "scene_memory.h"
+#include "memory.h"
 
 #include <gfx/sizes.h>
 
-#include "animation_impl.h"
-#include "camera_impl.h"
 #include "llr/light_impl.h"
 #include "llr/material_impl.h"
 #include "llr/mesh_impl.h"
-#include "model_impl.h"
-#include "node_impl.h"
-#include "object_impl.h"
-#include "scene_impl.h"
+#include "scene/animation_impl.h"
+#include "scene/camera_impl.h"
+#include "scene/model_impl.h"
+#include "scene/node_impl.h"
+#include "scene/object_impl.h"
+#include "scene/scene_impl.h"
 
 #include <log/log.h>
 #include <mempool.h>
diff --git a/src/scene/scene_memory.h b/src/memory.h
index d175cba..366c6e4 100644
--- a/src/scene/scene_memory.h
+++ b/src/memory.h
@@ -1,7 +1,7 @@
 /// Memory management of scene objects.
 #pragma once
 
-#include "types.h"
+#include "scene/types.h"
 
 /// Initialize scene memory.
 ///
diff --git a/src/renderer/renderer.c b/src/renderer/renderer.c
index 29a1813..6bcf5cc 100644
--- a/src/renderer/renderer.c
+++ b/src/renderer/renderer.c
@@ -2,13 +2,13 @@
 
 #include "llr/light_impl.h"
 #include "llr/mesh_impl.h"
+#include "memory.h"
 #include "scene/animation_impl.h"
 #include "scene/camera_impl.h"
 #include "scene/model_impl.h"
 #include "scene/node_impl.h"
 #include "scene/object_impl.h"
 #include "scene/scene_impl.h"
-#include "scene/scene_memory.h"
 
 #include <gfx/core.h>
 #include <gfx/llr/llr.h>
diff --git a/src/scene/animation.c b/src/scene/animation.c
index 08d02ce..601c400 100644
--- a/src/scene/animation.c
+++ b/src/scene/animation.c
@@ -1,7 +1,7 @@
 #include "animation_impl.h"
 
+#include "memory.h"
 #include "node_impl.h"
-#include "scene_memory.h"
 
 #include <string.h>
 
@@ -504,21 +504,21 @@ Box gfx_get_joint_box(
   return (Box){
       .vertices = {
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmax.z), 1),
+              joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmax.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmax.z), 1),
+              joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmax.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmax.z), 1),
+              joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmax.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmax.z), 1),
+              joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmax.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmin.z), 1),
+              joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmin.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmin.z), 1),
+              joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmin.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmin.z), 1),
+              joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmin.z), 1),
                    mat4_mul_vec3(
-                   joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmin.z), 1),
+              joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmin.z), 1),
                    }
   };
 }
diff --git a/src/scene/camera.c b/src/scene/camera.c
index be7d806..bb073ba 100644
--- a/src/scene/camera.c
+++ b/src/scene/camera.c
@@ -1,7 +1,7 @@
 #include "camera_impl.h"
 
+#include "memory.h"
 #include "node_impl.h"
-#include "scene_memory.h"
 
 #include <assert.h>
 
diff --git a/src/scene/model.c b/src/scene/model.c
index cc41a9a..e280a41 100644
--- a/src/scene/model.c
+++ b/src/scene/model.c
@@ -2,7 +2,7 @@
 
 #include <gfx/scene/node.h>
 
-#include "scene_memory.h"
+#include "memory.h"
 
 #include <assert.h>
 
diff --git a/src/scene/model_impl.h b/src/scene/model_impl.h
index a99d32c..39ac27f 100644
--- a/src/scene/model_impl.h
+++ b/src/scene/model_impl.h
@@ -2,7 +2,7 @@
 
 #include <gfx/scene/model.h>
 
-#include "scene_memory.h"
+#include "memory.h"
 
 /// Model.
 typedef struct Model {
diff --git a/src/scene/node.c b/src/scene/node.c
index e359f73..9d45aa7 100644
--- a/src/scene/node.c
+++ b/src/scene/node.c
@@ -3,10 +3,10 @@
 #include "animation_impl.h"
 #include "camera_impl.h"
 #include "llr/light_impl.h"
+#include "memory.h"
 #include "model_impl.h"
 #include "object_impl.h"
 #include "scene_graph.h"
-#include "scene_memory.h"
 
 #include "gfx_assert.h"
 
diff --git a/src/scene/object.c b/src/scene/object.c
index 27ff5db..e985fd5 100644
--- a/src/scene/object.c
+++ b/src/scene/object.c
@@ -3,8 +3,8 @@
 #include <gfx/core.h>
 
 #include "llr/mesh_impl.h"
+#include "memory.h"
 #include "node_impl.h"
-#include "scene_memory.h"
 
 #include <assert.h>
 
diff --git a/src/scene/scene.c b/src/scene/scene.c
index 54452dd..8c53810 100644
--- a/src/scene/scene.c
+++ b/src/scene/scene.c
@@ -1,7 +1,7 @@
 #include "scene_impl.h"
 
+#include "memory.h"
 #include "node_impl.h"
-#include "scene_memory.h"
 
 #include <assert.h>
 
diff --git a/src/scene/scene_graph.h b/src/scene/scene_graph.h
index 0b1f7d0..e7135a4 100644
--- a/src/scene/scene_graph.h
+++ b/src/scene/scene_graph.h
@@ -1,7 +1,7 @@
 /// Functions for list manipulation.
 #pragma once
 
-#include "scene_memory.h"
+#include "memory.h"
 
 // NOTE: SceneMemory guarantees that index 0 can be regarded as an invalid
 // index.