8 files changed, 45 insertions, 44 deletions

diff --git a/game/src/plugins/texture_view.c b/game/src/plugins/texture_view.c
index 31bf23e..2c5db34 100644
--- a/game/src/plugins/texture_view.c
+++ b/game/src/plugins/texture_view.c
@@ -1,11 +1,11 @@
 #include "plugin.h"
 
+#include "../../../gfx/src/asset/texture.h"
 #include <gfx/render_backend.h>
 #include <gfx/renderer.h>
 #include <gfx/scene.h>
 #include <gfx/util/geometry.h>
 #include <gfx/util/shader.h>
-#include <gfx/util/texture.h>
 
 #include <math/camera.h>
 
diff --git a/game/src/plugins/viewer.c b/game/src/plugins/viewer.c
index 769887f..ad87821 100644
--- a/game/src/plugins/viewer.c
+++ b/game/src/plugins/viewer.c
@@ -1,10 +1,10 @@
 #include "plugin.h"
 
+#include "../../../gfx/src/asset/scene.h"
+#include "../../../gfx/src/asset/texture.h"
 #include <gfx/renderer.h>
 #include <gfx/scene.h>
-#include <gfx/util/scene.h>
 #include <gfx/util/skyquad.h>
-#include <gfx/util/texture.h>
 #include <math/camera.h>
 #include <math/spatial3.h>
 
diff --git a/gfx/CMakeLists.txt b/gfx/CMakeLists.txt
index 2b295d5..2d83a7c 100644
--- a/gfx/CMakeLists.txt
+++ b/gfx/CMakeLists.txt
@@ -34,6 +34,8 @@ add_shader_library(shaders
 
 add_library(gfx SHARED
   src/asset/asset_cache.c
+  src/asset/scene.c
+  src/asset/texture.c
   src/render/buffer.c
   src/render/framebuffer.c
   src/render/geometry.c
@@ -57,9 +59,7 @@ add_library(gfx SHARED
   src/util/geometry.c
   src/util/ibl.c
   src/util/shader.c
-  src/util/scene.c
-  src/util/skyquad.c
-  src/util/texture.c)
+  src/util/skyquad.c)
 
 target_include_directories(gfx PUBLIC
   include)
diff --git a/gfx/src/asset/asset_cache.c b/gfx/src/asset/asset_cache.c
index fd9f1f8..0075d41 100644
--- a/gfx/src/asset/asset_cache.c
+++ b/gfx/src/asset/asset_cache.c
@@ -1,11 +1,14 @@
 #include "asset_cache.h"
 
+#include "scene.h"
+#include "texture.h"
 #include <gfx/asset.h>
 #include <gfx/gfx.h>
-#include <gfx/util/scene.h>
-#include <gfx/util/texture.h>
+#include <gfx/scene/node.h>
 #include <gfx_assert.h>
 
+#include "scene/node_impl.h"
+
 #include <cstring.h>
 #include <log/log.h>
 
@@ -119,8 +122,6 @@ SceneNode* gfx_load_scene(
   AssetCache* cache = gfx_get_asset_cache(gfx);
 
   // First search for the asset in the cache.
-  // TODO: Animated models are currently mutated in place, so sharing them is
-  //  not really valid.
   const uint64_t hash  = calc_scene_hash(cmd);
   Asset*         asset = lookup_cache(cache, hash);
   if (asset) {
diff --git a/gfx/src/util/scene.c b/gfx/src/asset/scene.c
index a491238..156e7b6 100644
--- a/gfx/src/util/scene.c
+++ b/gfx/src/asset/scene.c
@@ -79,34 +79,34 @@
 /// In our case, we use the specular-glosiness model if parameters for it are
 /// provided, otherwise we use the metallic-roughness model.
 
-#include <gfx/util/scene.h>
-
-#include <gfx/gfx.h>
-#include <gfx/render_backend.h>
-#include <gfx/scene/animation.h>
-#include <gfx/scene/camera.h>
-#include <gfx/scene/material.h>
-#include <gfx/scene/mesh.h>
-#include <gfx/scene/node.h>
-#include <gfx/scene/object.h>
-#include <gfx/scene/scene.h>
-#include <gfx/sizes.h>
-#include <gfx/util/shader.h>
-#include <gfx/util/texture.h>
-
-#include <cstring.h>
-#include <error.h>
-#include <log/log.h>
-#include <math/camera.h>
-#include <math/defs.h>
-#include <math/mat4.h>
-#include <math/quat.h>
-#include <math/vec2.h>
-#include <math/vec3.h>
-
-#include <cgltf_tangents.h>
+#include "asset/scene.h"
+
+#include "asset/texture.h"
+#include "gfx/gfx.h"
+#include "gfx/render_backend.h"
+#include "gfx/scene/animation.h"
+#include "gfx/scene/camera.h"
+#include "gfx/scene/material.h"
+#include "gfx/scene/mesh.h"
+#include "gfx/scene/node.h"
+#include "gfx/scene/object.h"
+#include "gfx/scene/scene.h"
+#include "gfx/sizes.h"
+#include "gfx/util/shader.h"
+
+#include "cstring.h"
+#include "error.h"
+#include "log/log.h"
+#include "math/camera.h"
+#include "math/defs.h"
+#include "math/mat4.h"
+#include "math/quat.h"
+#include "math/vec2.h"
+#include "math/vec3.h"
+
+#include "cgltf_tangents.h"
 #define CGLTF_IMPLEMENTATION
-#include <cgltf.h>
+#include "cgltf.h"
 
 #include <assert.h>
 #include <stdbool.h>
@@ -1320,7 +1320,7 @@ static void load_nodes(
       gfx_construct_object_node(nodes[n], object);
       if (node->skin) {
         assert(anima);
-        
+
         const cgltf_size skin_index = node->skin - data->skins;
         assert(skin_index < data->skins_count);
         const Skeleton* skeleton = gfx_get_anima_skeleton(anima, skin_index);
diff --git a/gfx/include/gfx/util/scene.h b/gfx/src/asset/scene.h
index 5c47196..a8dab13 100644
--- a/gfx/include/gfx/util/scene.h
+++ b/gfx/src/asset/scene.h
@@ -1,7 +1,7 @@
 /// Load scene files.
 #pragma once
 
-#include <gfx/asset.h>
+#include "gfx/asset.h"
 
 typedef struct Gfx       Gfx;
 typedef struct SceneNode SceneNode;
diff --git a/gfx/src/util/texture.c b/gfx/src/asset/texture.c
index 0d2e4b8..d15f09f 100644
--- a/gfx/src/util/texture.c
+++ b/gfx/src/asset/texture.c
@@ -1,11 +1,11 @@
-#include <gfx/util/texture.h>
+#include "texture.h"
 
-#include <gfx/render_backend.h>
+#include "gfx/render_backend.h"
 
-#include <error.h>
+#include "error.h"
 
 #define STB_IMAGE_IMPLEMENTATION
-#include <stb_image.h>
+#include "stb_image.h"
 
 #include <assert.h>
 
diff --git a/gfx/include/gfx/util/texture.h b/gfx/src/asset/texture.h
index a3239fe..4204008 100644
--- a/gfx/include/gfx/util/texture.h
+++ b/gfx/src/asset/texture.h
@@ -1,7 +1,7 @@
 /// Load textures from images.
 #pragma once
 
-#include <gfx/asset.h>
+#include "gfx/asset.h"
 
 /// Load a texture.
 Texture* gfx_texture_load(RenderBackend*, const LoadTextureCmd*);