Moved a few things around, definitely not clean but better.

src/display/CMakeLists.txt

@@ -8,13 +8,13 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
     display.c
     framebuffer.c
-    camera.c
     screen.c
     texture.c
     spritebatch.c
 )
 
 # Subdirectories
+add_subdirectory(camera)
 add_subdirectory(mesh)
 add_subdirectory(palette)
 add_subdirectory(tileset)

src/display/camera/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    camera.c
+)

src/display/camera/camera.h

@@ -9,8 +9,6 @@
 #include "dusk.h"
 #include "display/color.h"
 
-#define CAMERA_COUNT_MAX 4
-
 typedef enum {
   CAMERA_PROJECTION_TYPE_PERSPECTIVE,
   CAMERA_PROJECTION_TYPE_PERSPECTIVE_FLIPPED,
@@ -32,20 +30,20 @@ typedef struct {
     mat4 view;
 
     struct {
-      float_t position[3];
-      float_t target[3];
-      float_t up[3];
+      vec3 position;
+      vec3 target;
+      vec3 up;
     } lookat;
 
     struct {
-      float_t offset[3];
-      float_t target[3];
-      float_t up[3];
+      vec3 offset;
+      vec3 target;
+      vec3 up;
       float_t pixelsPerUnit;
     } lookatPixelPerfect;
 
     struct {
-      float_t position[2];
+      vec2 position;
       float_t zoom;
     } _2d;
   };

src/display/display.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "displaydefs.h"
 #include "error/error.h"
-#include "display/camera.h"
+#include "display/camera/camera.h"
 #include "display/framebuffer.h"
 
 typedef struct {

src/display/screen.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "dusk.h"
 #include "display/framebuffer.h"
-#include "display/camera.h"
+#include "display/camera/camera.h"
 #include "display/mesh/quad.h"
 
 #if DISPLAY_SIZE_DYNAMIC == 1