Consolidate scene header

11 files changed, 14 insertions, 18 deletions

diff --git a/src/asset/asset_cache.c b/src/asset/asset_cache.c
index 2df0242..dfaf7c6 100644
--- a/src/asset/asset_cache.c
+++ b/src/asset/asset_cache.c
@@ -1,6 +1,6 @@
 #include "asset_cache.h"
 
-#include "../animation_impl.h"
+#include "animation_impl.h"
 #include "memory.h"
 #include "model.h"
 #include "scene/model_impl.h"
@@ -9,7 +9,7 @@
 
 #include <gfx/asset.h>
 #include <gfx/gfx.h>
-#include <gfx/scene/node.h>
+#include <gfx/scene.h>
 #include <gfx_assert.h>
 
 #include <cstring.h>
diff --git a/src/asset/model.c b/src/asset/model.c
index 60e7ad1..2ee3cd1 100644
--- a/src/asset/model.c
+++ b/src/asset/model.c
@@ -89,9 +89,7 @@
 #include <gfx/core.h>
 #include <gfx/gfx.h>
 #include <gfx/render/llr.h>
-#include <gfx/scene/camera.h>
-#include <gfx/scene/node.h>
-#include <gfx/scene/object.h>
+#include <gfx/scene.h>
 #include <gfx/sizes.h>
 #include <gfx/util/shader.h>
 
diff --git a/src/memory.c b/src/memory.c
index a4d6920..de20f78 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -1,6 +1,6 @@
 #include "memory.h"
 
-#include <gfx/scene/camera.h>
+#include <gfx/scene.h>
 #include <gfx/sizes.h>
 
 #include "animation_impl.h"
@@ -11,7 +11,6 @@
 #include "scene/scene_impl.h"
 
 #include <log/log.h>
-#include <math/camera.h>
 #include <mempool.h>
 
 DEF_MEMPOOL(anima_pool, Anima, GFX_MAX_NUM_ANIMAS)
diff --git a/src/scene/camera.c b/src/scene/camera.c
index 475101d..eeb5f7e 100644
--- a/src/scene/camera.c
+++ b/src/scene/camera.c
@@ -1,11 +1,11 @@
-#include <gfx/scene/camera.h>
+#include <gfx/scene.h>
 
 #include "memory.h"
 
 #include <assert.h>
 #include <math/camera.h>
 
-Camera* gfx_make_camera() {
+Camera* gfx_make_camera(void) {
   Camera* camera = mem_alloc_camera();
   *camera        = camera_perspective(
       /*fovy=*/90.0 * TO_RAD, /*aspect=*/16.0 / 9.0,
diff --git a/src/scene/model.c b/src/scene/model.c
index e280a41..1bd0112 100644
--- a/src/scene/model.c
+++ b/src/scene/model.c
@@ -1,6 +1,6 @@
 #include "model_impl.h"
 
-#include <gfx/scene/node.h>
+#include <gfx/scene.h>
 
 #include "memory.h"
 
diff --git a/src/scene/model_impl.h b/src/scene/model_impl.h
index 079aede..72cd0ab 100644
--- a/src/scene/model_impl.h
+++ b/src/scene/model_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/scene/model.h>
+#include <gfx/scene.h>
 
 #include "memory.h"
 
diff --git a/src/scene/node.c b/src/scene/node.c
index 7032324..0004d27 100644
--- a/src/scene/node.c
+++ b/src/scene/node.c
@@ -8,7 +8,7 @@
 
 #include "gfx_assert.h"
 
-#include <gfx/scene/camera.h>
+#include <gfx/scene.h>
 
 #include <cstring.h>
 #include <log/log.h>
diff --git a/src/scene/node_impl.h b/src/scene/node_impl.h
index aba8c41..9e65588 100644
--- a/src/scene/node_impl.h
+++ b/src/scene/node_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/scene/node.h>
+#include <gfx/scene.h>
 
 #include "../types.h"
 
diff --git a/src/scene/object_impl.h b/src/scene/object_impl.h
index 1b14cb5..345d615 100644
--- a/src/scene/object_impl.h
+++ b/src/scene/object_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/scene/object.h>
+#include <gfx/scene.h>
 
 #include "../types.h"
 
diff --git a/src/scene/scene_impl.h b/src/scene/scene_impl.h
index 157f891..ad2e892 100644
--- a/src/scene/scene_impl.h
+++ b/src/scene/scene_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/scene/scene.h>
+#include <gfx/scene.h>
 
 #include "../types.h"
 
diff --git a/src/util/skyquad.c b/src/util/skyquad.c
index 1a9b4af..f4561f2 100644
--- a/src/util/skyquad.c
+++ b/src/util/skyquad.c
@@ -1,9 +1,8 @@
 #include <gfx/util/skyquad.h>
 
-#include <../../include/gfx/render/llr.h>
 #include <gfx/core.h>
-#include <gfx/scene/node.h>
-#include <gfx/scene/object.h>
+#include <gfx/render/llr.h>
+#include <gfx/scene.h>
 #include <gfx/util/geometry.h>
 #include <gfx/util/shader.h>