Refator pass 1

src/display/CMakeLists.txt

@@ -7,17 +7,17 @@
 target_sources(${DUSK_TARGET_NAME}
   PRIVATE
     display.c
+    framebuffer.c
     camera.c
-    tileset.c
     screen.c
+    texture.c
+    spritebatch.c
 )
 
 # Subdirectories
-add_subdirectory(framebuffer)
 add_subdirectory(mesh)
 add_subdirectory(palette)
-add_subdirectory(texture)
-add_subdirectory(spritebatch)
+add_subdirectory(tileset)
 
 if(DUSK_TARGET_SYSTEM STREQUAL "linux")
   target_compile_definitions(${DUSK_TARGET_NAME}

src/display/camera.c

@@ -8,7 +8,7 @@
 #include "camera.h"
 #include "display/display.h"
 #include "assert/assert.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 
 void cameraInit(camera_t *camera) {
   cameraInitPerspective(camera);

src/display/display.c

@@ -7,11 +7,10 @@
 
 #include "display/display.h"
 #include "console/console.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 #include "scene/scenemanager.h"
-#include "display/spritebatch/spritebatch.h"
+#include "display/spritebatch.h"
 #include "display/mesh/quad.h"
-#include "game/game.h"
 #include "display/screen.h"
 
 display_t DISPLAY;

src/display/display.h

@@ -9,7 +9,7 @@
 #include "displaydefs.h"
 #include "error/error.h"
 #include "display/camera.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 
 typedef struct {
   #if DISPLAY_SDL2

src/display/framebuffer.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "display/texture/texture.h"
+#include "display/texture.h"
 
 #define FRAMEBUFFER_CLEAR_COLOR (1 << 0)
 #define FRAMEBUFFER_CLEAR_DEPTH (1 << 1)

src/display/screen.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "dusk.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 #include "display/camera.h"
 #include "display/mesh/quad.h"
 

src/display/spritebatch.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "display/mesh/quad.h"
-#include "display/texture/texture.h"
+#include "display/texture.h"
 
 #define SPRITEBATCH_SPRITES_MAX 1
 #define SPRITEBATCH_VERTEX_COUNT (SPRITEBATCH_SPRITES_MAX * QUAD_VERTEX_COUNT) 

src/display/spritebatch/CMakeLists.txt

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

src/display/texture/CMakeLists.txt

@@ -1,13 +0,0 @@
-# Copyright (c) 2025 Dominic Masters
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-# Sources
-target_sources(${DUSK_TARGET_NAME}
-  PRIVATE
-    texture.c
-)
-
-# Subdirs
-# add_subdirectory(draw)

src/display/tileset/CMakeLists.txt

@@ -6,5 +6,5 @@
 # Sources
 target_sources(${DUSK_TARGET_NAME}
   PRIVATE
-    framebuffer.c
+    tileset.c
 )