16 files changed, 12 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e05db1..44f679a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ add_shader_library(shaders
   shaders/view_texture.vert)
 
 add_library(gfx SHARED
+  src/animation.c
   src/asset/asset_cache.c
   src/asset/model.c
   src/asset/texture.c
@@ -53,7 +54,6 @@ add_library(gfx SHARED
   src/render/imm.c
   src/render/llr.c
   src/render/renderer.c
-  src/scene/animation.c
   src/scene/camera.c
   src/scene/model.c
   src/scene/node.c
diff --git a/include/gfx/scene/animation.h b/include/gfx/animation.h
index 11d8984..b55e575 100644
--- a/include/gfx/scene/animation.h
+++ b/include/gfx/animation.h
@@ -1,4 +1,3 @@
-// TODO: Move outside of scene/
 #pragma once
 
 #include <gfx/sizes.h>
diff --git a/include/gfx/scene.h b/include/gfx/scene.h
index e9a6a89..3098221 100644
--- a/include/gfx/scene.h
+++ b/include/gfx/scene.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <gfx/scene/animation.h>
 #include <gfx/scene/camera.h>
 #include <gfx/scene/model.h>
 #include <gfx/scene/node.h>
diff --git a/src/scene/animation.c b/src/animation.c
index a498961..c52df73 100644
--- a/src/scene/animation.c
+++ b/src/animation.c
@@ -1,7 +1,6 @@
 #include "animation_impl.h"
 
 #include "memory.h"
-#include "node_impl.h"
 
 #include <string.h>
 
diff --git a/src/scene/animation_impl.h b/src/animation_impl.h
index ef1492c..4929b97 100644
--- a/src/scene/animation_impl.h
+++ b/src/animation_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/scene/animation.h>
+#include <gfx/animation.h>
 #include <gfx/sizes.h>
 
 #include "types.h"
diff --git a/src/asset/asset_cache.c b/src/asset/asset_cache.c
index 191a5fd..2df0242 100644
--- a/src/asset/asset_cache.c
+++ b/src/asset/asset_cache.c
@@ -1,8 +1,8 @@
 #include "asset_cache.h"
 
+#include "../animation_impl.h"
 #include "memory.h"
 #include "model.h"
-#include "scene/animation_impl.h"
 #include "scene/model_impl.h"
 #include "scene/node_impl.h"
 #include "texture.h"
diff --git a/src/asset/model.c b/src/asset/model.c
index df116fb..f5131d2 100644
--- a/src/asset/model.c
+++ b/src/asset/model.c
@@ -85,10 +85,10 @@
 #include "gfx_assert.h"
 #include "scene/model_impl.h"
 
+#include <gfx/animation.h>
 #include <gfx/core.h>
 #include <gfx/gfx.h>
 #include <gfx/render/llr.h>
-#include <gfx/scene/animation.h>
 #include <gfx/scene/camera.h>
 #include <gfx/scene/node.h>
 #include <gfx/scene/object.h>
diff --git a/src/memory.c b/src/memory.c
index 3481791..a4d6920 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -3,8 +3,8 @@
 #include <gfx/scene/camera.h>
 #include <gfx/sizes.h>
 
+#include "animation_impl.h"
 #include "render/llr_impl.h"
-#include "scene/animation_impl.h"
 #include "scene/model_impl.h"
 #include "scene/node_impl.h"
 #include "scene/object_impl.h"
diff --git a/src/memory.h b/src/memory.h
index 624216d..bfbee66 100644
--- a/src/memory.h
+++ b/src/memory.h
@@ -1,7 +1,7 @@
 /// Memory management of scene objects.
 #pragma once
 
-#include "scene/types.h"
+#include "types.h"
 
 typedef struct Camera Camera;
 
diff --git a/src/render/llr.c b/src/render/llr.c
index 189041a..76935f9 100644
--- a/src/render/llr.c
+++ b/src/render/llr.c
@@ -1,7 +1,7 @@
 #include "llr_impl.h"
 
+#include "animation_impl.h"
 #include "memory.h"
-#include "scene/animation_impl.h"
 #include "scene/node_impl.h"
 
 #include <gfx/core.h>
diff --git a/src/render/llr_impl.h b/src/render/llr_impl.h
index 1c08b03..c85ad15 100644
--- a/src/render/llr_impl.h
+++ b/src/render/llr_impl.h
@@ -3,7 +3,7 @@
 #include <gfx/render/llr.h>
 #include <gfx/sizes.h>
 
-#include "scene/types.h"
+#include "../types.h"
 
 #include <math/mat4.h>
 #include <math/vec3.h>
diff --git a/src/render/renderer.c b/src/render/renderer.c
index 385a8c1..fadf521 100644
--- a/src/render/renderer.c
+++ b/src/render/renderer.c
@@ -1,8 +1,8 @@
 #include "renderer_impl.h"
 
+#include "animation_impl.h"
 #include "llr_impl.h"
 #include "memory.h"
-#include "scene/animation_impl.h"
 #include "scene/model_impl.h"
 #include "scene/node_impl.h"
 #include "scene/object_impl.h"
diff --git a/src/scene/node_impl.h b/src/scene/node_impl.h
index 15ee232..aba8c41 100644
--- a/src/scene/node_impl.h
+++ b/src/scene/node_impl.h
@@ -2,7 +2,7 @@
 
 #include <gfx/scene/node.h>
 
-#include "types.h"
+#include "../types.h"
 
 #include <math/camera.h>
 #include <math/mat4.h>
diff --git a/src/scene/object_impl.h b/src/scene/object_impl.h
index b7a0752..1b14cb5 100644
--- a/src/scene/object_impl.h
+++ b/src/scene/object_impl.h
@@ -2,7 +2,7 @@
 
 #include <gfx/scene/object.h>
 
-#include "types.h"
+#include "../types.h"
 
 typedef struct MeshLink {
   mesh_idx      mesh;
diff --git a/src/scene/scene_impl.h b/src/scene/scene_impl.h
index 992f620..06a69f0 100644
--- a/src/scene/scene_impl.h
+++ b/src/scene/scene_impl.h
@@ -2,7 +2,7 @@
 
 #include <gfx/scene/scene.h>
 
-#include "types.h"
+#include "../types.h"
 
 typedef struct SceneNode SceneNode;
 
diff --git a/src/scene/types.h b/src/types.h
index d0ffc41..d0ffc41 100644
--- a/src/scene/types.h
+++ b/src/types.h