diff options
author | 3gg <3gg@shellblade.net> | 2025-07-09 19:45:49 -0700 |
---|---|---|
committer | 3gg <3gg@shellblade.net> | 2025-07-09 19:45:49 -0700 |
commit | 9fa21837ae7b54b62ea09939473aa987f07eaf90 (patch) | |
tree | ede6fffe6424ac087b8c549407fecfd9e17e08b4 | |
parent | 5c67ec95d51e3cf4f3ebe755b3824a1cd0f09225 (diff) |
Rename scene_memory -> memory
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | include/gfx/llr/llr.h | 3 | ||||
-rw-r--r-- | include/gfx/scene/scene.h | 3 | ||||
-rw-r--r-- | src/asset/asset_cache.c | 2 | ||||
-rw-r--r-- | src/gfx.c | 2 | ||||
-rw-r--r-- | src/llr/light.c | 4 | ||||
-rw-r--r-- | src/llr/material.c | 2 | ||||
-rw-r--r-- | src/llr/mesh.c | 2 | ||||
-rw-r--r-- | src/memory.c (renamed from src/scene/scene_memory.c) | 14 | ||||
-rw-r--r-- | src/memory.h (renamed from src/scene/scene_memory.h) | 2 | ||||
-rw-r--r-- | src/renderer/renderer.c | 2 | ||||
-rw-r--r-- | src/scene/animation.c | 18 | ||||
-rw-r--r-- | src/scene/camera.c | 2 | ||||
-rw-r--r-- | src/scene/model.c | 2 | ||||
-rw-r--r-- | src/scene/model_impl.h | 2 | ||||
-rw-r--r-- | src/scene/node.c | 2 | ||||
-rw-r--r-- | src/scene/object.c | 2 | ||||
-rw-r--r-- | src/scene/scene.c | 2 | ||||
-rw-r--r-- | src/scene/scene_graph.h | 2 |
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 | |||
53 | src/llr/light.c | 53 | src/llr/light.c |
54 | src/llr/material.c | 54 | src/llr/material.c |
55 | src/llr/mesh.c | 55 | src/llr/mesh.c |
56 | src/memory.c | ||
56 | src/renderer/imm_renderer.c | 57 | src/renderer/imm_renderer.c |
57 | src/renderer/renderer.c | 58 | src/renderer/renderer.c |
58 | src/scene/animation.c | 59 | src/scene/animation.c |
@@ -61,7 +62,6 @@ add_library(gfx SHARED | |||
61 | src/scene/node.c | 62 | src/scene/node.c |
62 | src/scene/object.c | 63 | src/scene/object.c |
63 | src/scene/scene.c | 64 | src/scene/scene.c |
64 | src/scene/scene_memory.c | ||
65 | src/gfx.c | 65 | src/gfx.c |
66 | src/util/geometry.c | 66 | src/util/geometry.c |
67 | src/util/ibl.c | 67 | 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*); | |||
36 | /// Set the camera. | 36 | /// Set the camera. |
37 | void gfx_llr_set_camera(LLR*, const Camera*); | 37 | void gfx_llr_set_camera(LLR*, const Camera*); |
38 | 38 | ||
39 | /// Set the view-projection matrix. | ||
40 | // void gfx_llr_set_view_projection_matrix(LLR*, const mat4*); | ||
41 | |||
42 | /// Set the aspect ratio. | 39 | /// Set the aspect ratio. |
43 | void gfx_llr_set_aspect(LLR*, float aspect); | 40 | void gfx_llr_set_aspect(LLR*, float aspect); |
44 | 41 | ||
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 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | 2 | ||
3 | #include <math/defs.h> | ||
4 | #include <math/fwd.h> | ||
5 | |||
6 | typedef struct SceneNode SceneNode; | 3 | typedef struct SceneNode SceneNode; |
7 | 4 | ||
8 | typedef struct Scene Scene; | 5 | 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 @@ | |||
1 | #include "asset_cache.h" | 1 | #include "asset_cache.h" |
2 | 2 | ||
3 | #include "memory.h" | ||
3 | #include "model.h" | 4 | #include "model.h" |
4 | #include "scene/animation_impl.h" | 5 | #include "scene/animation_impl.h" |
5 | #include "scene/model_impl.h" | 6 | #include "scene/model_impl.h" |
6 | #include "scene/node_impl.h" | 7 | #include "scene/node_impl.h" |
7 | #include "scene/scene_memory.h" | ||
8 | #include "texture.h" | 8 | #include "texture.h" |
9 | 9 | ||
10 | #include <gfx/asset.h> | 10 | #include <gfx/asset.h> |
@@ -3,9 +3,9 @@ | |||
3 | #include "asset/asset_cache.h" | 3 | #include "asset/asset_cache.h" |
4 | #include "core/core_impl.h" | 4 | #include "core/core_impl.h" |
5 | #include "llr/llr_impl.h" | 5 | #include "llr/llr_impl.h" |
6 | #include "memory.h" | ||
6 | #include "renderer/imm_renderer_impl.h" | 7 | #include "renderer/imm_renderer_impl.h" |
7 | #include "renderer/renderer_impl.h" | 8 | #include "renderer/renderer_impl.h" |
8 | #include "scene/scene_memory.h" | ||
9 | 9 | ||
10 | #include <assert.h> | 10 | #include <assert.h> |
11 | #include <stdlib.h> | 11 | #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 @@ | |||
1 | #include "light_impl.h" | 1 | #include "light_impl.h" |
2 | 2 | ||
3 | #include "../scene/node_impl.h" | 3 | #include "memory.h" |
4 | #include "../scene/scene_memory.h" | 4 | #include "scene/node_impl.h" |
5 | 5 | ||
6 | #include <error.h> | 6 | #include <error.h> |
7 | 7 | ||
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 @@ | |||
1 | #include "material_impl.h" | 1 | #include "material_impl.h" |
2 | 2 | ||
3 | #include "../scene/scene_memory.h" | 3 | #include "memory.h" |
4 | 4 | ||
5 | #include <gfx/core.h> | 5 | #include <gfx/core.h> |
6 | 6 | ||
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 @@ | |||
1 | #include "mesh_impl.h" | 1 | #include "mesh_impl.h" |
2 | 2 | ||
3 | #include "../scene/scene_memory.h" | 3 | #include "memory.h" |
4 | 4 | ||
5 | #include <assert.h> | 5 | #include <assert.h> |
6 | 6 | ||
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 @@ | |||
1 | #include "scene_memory.h" | 1 | #include "memory.h" |
2 | 2 | ||
3 | #include <gfx/sizes.h> | 3 | #include <gfx/sizes.h> |
4 | 4 | ||
5 | #include "animation_impl.h" | ||
6 | #include "camera_impl.h" | ||
7 | #include "llr/light_impl.h" | 5 | #include "llr/light_impl.h" |
8 | #include "llr/material_impl.h" | 6 | #include "llr/material_impl.h" |
9 | #include "llr/mesh_impl.h" | 7 | #include "llr/mesh_impl.h" |
10 | #include "model_impl.h" | 8 | #include "scene/animation_impl.h" |
11 | #include "node_impl.h" | 9 | #include "scene/camera_impl.h" |
12 | #include "object_impl.h" | 10 | #include "scene/model_impl.h" |
13 | #include "scene_impl.h" | 11 | #include "scene/node_impl.h" |
12 | #include "scene/object_impl.h" | ||
13 | #include "scene/scene_impl.h" | ||
14 | 14 | ||
15 | #include <log/log.h> | 15 | #include <log/log.h> |
16 | #include <mempool.h> | 16 | #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 @@ | |||
1 | /// Memory management of scene objects. | 1 | /// Memory management of scene objects. |
2 | #pragma once | 2 | #pragma once |
3 | 3 | ||
4 | #include "types.h" | 4 | #include "scene/types.h" |
5 | 5 | ||
6 | /// Initialize scene memory. | 6 | /// Initialize scene memory. |
7 | /// | 7 | /// |
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 @@ | |||
2 | 2 | ||
3 | #include "llr/light_impl.h" | 3 | #include "llr/light_impl.h" |
4 | #include "llr/mesh_impl.h" | 4 | #include "llr/mesh_impl.h" |
5 | #include "memory.h" | ||
5 | #include "scene/animation_impl.h" | 6 | #include "scene/animation_impl.h" |
6 | #include "scene/camera_impl.h" | 7 | #include "scene/camera_impl.h" |
7 | #include "scene/model_impl.h" | 8 | #include "scene/model_impl.h" |
8 | #include "scene/node_impl.h" | 9 | #include "scene/node_impl.h" |
9 | #include "scene/object_impl.h" | 10 | #include "scene/object_impl.h" |
10 | #include "scene/scene_impl.h" | 11 | #include "scene/scene_impl.h" |
11 | #include "scene/scene_memory.h" | ||
12 | 12 | ||
13 | #include <gfx/core.h> | 13 | #include <gfx/core.h> |
14 | #include <gfx/llr/llr.h> | 14 | #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 @@ | |||
1 | #include "animation_impl.h" | 1 | #include "animation_impl.h" |
2 | 2 | ||
3 | #include "memory.h" | ||
3 | #include "node_impl.h" | 4 | #include "node_impl.h" |
4 | #include "scene_memory.h" | ||
5 | 5 | ||
6 | #include <string.h> | 6 | #include <string.h> |
7 | 7 | ||
@@ -504,21 +504,21 @@ Box gfx_get_joint_box( | |||
504 | return (Box){ | 504 | return (Box){ |
505 | .vertices = { | 505 | .vertices = { |
506 | mat4_mul_vec3( | 506 | mat4_mul_vec3( |
507 | joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmax.z), 1), | 507 | joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmax.z), 1), |
508 | mat4_mul_vec3( | 508 | mat4_mul_vec3( |
509 | joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmax.z), 1), | 509 | joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmax.z), 1), |
510 | mat4_mul_vec3( | 510 | mat4_mul_vec3( |
511 | joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmax.z), 1), | 511 | joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmax.z), 1), |
512 | mat4_mul_vec3( | 512 | mat4_mul_vec3( |
513 | joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmax.z), 1), | 513 | joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmax.z), 1), |
514 | mat4_mul_vec3( | 514 | mat4_mul_vec3( |
515 | joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmin.z), 1), | 515 | joint->joint_matrix, vec3_make(pmin.x, pmin.y, pmin.z), 1), |
516 | mat4_mul_vec3( | 516 | mat4_mul_vec3( |
517 | joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmin.z), 1), | 517 | joint->joint_matrix, vec3_make(pmax.x, pmin.y, pmin.z), 1), |
518 | mat4_mul_vec3( | 518 | mat4_mul_vec3( |
519 | joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmin.z), 1), | 519 | joint->joint_matrix, vec3_make(pmax.x, pmax.y, pmin.z), 1), |
520 | mat4_mul_vec3( | 520 | mat4_mul_vec3( |
521 | joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmin.z), 1), | 521 | joint->joint_matrix, vec3_make(pmin.x, pmax.y, pmin.z), 1), |
522 | } | 522 | } |
523 | }; | 523 | }; |
524 | } | 524 | } |
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 @@ | |||
1 | #include "camera_impl.h" | 1 | #include "camera_impl.h" |
2 | 2 | ||
3 | #include "memory.h" | ||
3 | #include "node_impl.h" | 4 | #include "node_impl.h" |
4 | #include "scene_memory.h" | ||
5 | 5 | ||
6 | #include <assert.h> | 6 | #include <assert.h> |
7 | 7 | ||
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 @@ | |||
2 | 2 | ||
3 | #include <gfx/scene/node.h> | 3 | #include <gfx/scene/node.h> |
4 | 4 | ||
5 | #include "scene_memory.h" | 5 | #include "memory.h" |
6 | 6 | ||
7 | #include <assert.h> | 7 | #include <assert.h> |
8 | 8 | ||
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 @@ | |||
2 | 2 | ||
3 | #include <gfx/scene/model.h> | 3 | #include <gfx/scene/model.h> |
4 | 4 | ||
5 | #include "scene_memory.h" | 5 | #include "memory.h" |
6 | 6 | ||
7 | /// Model. | 7 | /// Model. |
8 | typedef struct Model { | 8 | 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 @@ | |||
3 | #include "animation_impl.h" | 3 | #include "animation_impl.h" |
4 | #include "camera_impl.h" | 4 | #include "camera_impl.h" |
5 | #include "llr/light_impl.h" | 5 | #include "llr/light_impl.h" |
6 | #include "memory.h" | ||
6 | #include "model_impl.h" | 7 | #include "model_impl.h" |
7 | #include "object_impl.h" | 8 | #include "object_impl.h" |
8 | #include "scene_graph.h" | 9 | #include "scene_graph.h" |
9 | #include "scene_memory.h" | ||
10 | 10 | ||
11 | #include "gfx_assert.h" | 11 | #include "gfx_assert.h" |
12 | 12 | ||
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 @@ | |||
3 | #include <gfx/core.h> | 3 | #include <gfx/core.h> |
4 | 4 | ||
5 | #include "llr/mesh_impl.h" | 5 | #include "llr/mesh_impl.h" |
6 | #include "memory.h" | ||
6 | #include "node_impl.h" | 7 | #include "node_impl.h" |
7 | #include "scene_memory.h" | ||
8 | 8 | ||
9 | #include <assert.h> | 9 | #include <assert.h> |
10 | 10 | ||
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 @@ | |||
1 | #include "scene_impl.h" | 1 | #include "scene_impl.h" |
2 | 2 | ||
3 | #include "memory.h" | ||
3 | #include "node_impl.h" | 4 | #include "node_impl.h" |
4 | #include "scene_memory.h" | ||
5 | 5 | ||
6 | #include <assert.h> | 6 | #include <assert.h> |
7 | 7 | ||
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 @@ | |||
1 | /// Functions for list manipulation. | 1 | /// Functions for list manipulation. |
2 | #pragma once | 2 | #pragma once |
3 | 3 | ||
4 | #include "scene_memory.h" | 4 | #include "memory.h" |
5 | 5 | ||
6 | // NOTE: SceneMemory guarantees that index 0 can be regarded as an invalid | 6 | // NOTE: SceneMemory guarantees that index 0 can be regarded as an invalid |
7 | // index. | 7 | // index. |