Moved some files around

src/asset/type/assetpalette.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "error/error.h"
-#include "display/palette/palette.h"
+#include "display/texture/palette.h"
 
 typedef struct assetentire_s assetentire_t;
 

src/asset/type/assettexture.c

@@ -8,7 +8,7 @@
 #include "assettexture.h"
 #include "asset/assettype.h"
 #include "assert/assert.h"
-#include "display/texture.h"
+#include "display/texture/texture.h"
 #include "util/endian.h"
 
 errorret_t assetTextureLoad(assetentire_t entire) {

src/asset/type/assettileset.c

@@ -7,7 +7,7 @@
 
 #include "asset/asset.h"
 #include "assert/assert.h"
-#include "display/tileset/tileset.h"
+#include "display/texture/tileset.h"
 #include "util/memory.h"
 #include "util/endian.h"
 

src/display/CMakeLists.txt

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

src/display/framebuffer.h

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

src/display/spritebatch.h

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

src/display/text.h

@@ -7,8 +7,8 @@
 
 #pragma once
 #include "asset/asset.h"
-#include "display/texture.h"
-#include "display/tileset/tileset.h"
+#include "display/texture/texture.h"
+#include "display/texture/tileset.h"
 
 #define TEXT_CHAR_START '!'
 

src/display/texture/CMakeLists.txt

@@ -6,5 +6,7 @@
 # Sources
 target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
+    tileset.c
+    texture.c
     palette.c
 )

src/display/texture/texture.c

@@ -75,6 +75,7 @@ void textureInit(
           
         GLenum err = glGetError();
         if(err != GL_NO_ERROR) {
+          printf("GL Error uploading palette texture: %d\n", err);
           assertUnreachable("GL error uploading palette texture");
         }
         break;

src/display/texture/texture.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "display/color.h"
 #include "display/displaydefs.h"
-#include "display/palette/palette.h"
+#include "display/texture/palette.h"
 
 typedef enum {
   #if DISPLAY_SDL2

src/display/tileset/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_LIBRARY_TARGET_NAME}
-  PUBLIC
-    tileset.c
-)

src/script/module/display/moduletexture.c

@@ -7,7 +7,7 @@
 
 #include "moduletexture.h"
 #include "asset/asset.h"
-#include "display/texture.h"
+#include "display/texture/texture.h"
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "util/string.h"

src/script/module/display/moduletileset.c

@@ -7,7 +7,7 @@
 
 #include "moduletileset.h"
 #include "assert/assert.h"
-#include "display/tileset/tileset.h"
+#include "display/texture/tileset.h"
 #include "util/memory.h"
 #include "util/string.h"
 #include "debug/debug.h"