Refator pass 1

src/CMakeLists.txt

@@ -33,7 +33,6 @@ add_subdirectory(console)
 add_subdirectory(display)
 add_subdirectory(engine)
 add_subdirectory(error)
-add_subdirectory(game)
 add_subdirectory(input)
 # add_subdirectory(locale)
 add_subdirectory(physics)

src/asset/type/assetalphaimage.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "error/error.h"
-#include "display/texture/texture.h"
+#include "display/texture.h"
 
 #define ASSET_ALPHA_IMAGE_WIDTH_MAX 256
 #define ASSET_ALPHA_IMAGE_HEIGHT_MAX 256

src/asset/type/assetpaletteimage.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "error/error.h"
-#include "display/texture/texture.h"
+#include "display/texture.h"
 
 #define ASSET_PALETTE_IMAGE_WIDTH_MAX 128
 #define ASSET_PALETTE_IMAGE_HEIGHT_MAX 128

src/console/cmd/cmdscreen.h

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "console/console.h"
+#include "display/screen.h"
+
+void cmdScreen(const consolecmdexec_t *exec) {
+  if(exec->argc < 1) {
+    consolePrint("Expected 1 argument: <mode> [value]");
+    return;
+  }
+
+  if(strcmp(exec->argv[0], "backbuffer") == 0) {
+    SCREEN.mode = SCREEN_MODE_BACKBUFFER;
+    return;
+  }
+}

src/console/console.c

@@ -20,6 +20,7 @@
 #include "console/cmd/cmdtoggleconsole.h"
 #include "console/cmd/cmdalias.h"
 #include "console/cmd/cmdscene.h"
+#include "console/cmd/cmdscreen.h"
 
 console_t CONSOLE;
 
@@ -36,6 +37,7 @@ void consoleInit() {
   consoleRegCmd("toggleconsole", cmdToggleConsole);
   consoleRegCmd("alias", cmdAlias);
   consoleRegCmd("scene", cmdScene);
+  consoleRegCmd("screen", cmdScreen);
 
   #if CONSOLE_POSIX
     threadInit(&CONSOLE.thread, consoleInputThread);

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/framebuffer/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
-    framebuffer.c
-)

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
-    map.c
+    tileset.c
 )

src/engine/engine.c

@@ -13,7 +13,6 @@
 #include "display/display.h"
 #include "scene/scenemanager.h"
 #include "asset/assetmanager.h"
-#include "game/game.h"
 
 engine_t ENGINE;
 
@@ -31,11 +30,10 @@ errorret_t engineInit(void) {
   errorChain(assetManagerInit());
   errorChain(displayInit());
   errorChain(sceneManagerInit());
-  errorChain(gameInit());
 
   // Init scripts
   #if PSP
-    consoleExec("exec config/init_psp.dcf");
+    consoleExec("exec config/init-psp.dcf");
   #else
     consoleExec("exec config/init.dcf");
   #endif
@@ -49,7 +47,6 @@ errorret_t engineUpdate(void) {
   consoleUpdate();
   assetManagerUpdate();
   
-  gameUpdate();
   sceneManagerUpdate();
   errorChain(displayUpdate());
 
@@ -57,11 +54,9 @@ errorret_t engineUpdate(void) {
 }
 
 errorret_t engineDispose(void) {
-  gameDispose();
   sceneManagerDispose();
   errorChain(displayDispose());
   assetManagerDispose();
   consoleDispose();
-
   errorOk();
 }

src/game/CMakeLists.txt

@@ -1,18 +0,0 @@
-# Copyright (c) 2025 Dominic Masters
-# 
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-if(NOT DEFINED DUSK_TARGET_GAME)
-  message(FATAL_ERROR "DUSK_TARGET_GAME is not defined.")
-endif()
-
-string(TOUPPER "${DUSK_TARGET_GAME}" DUSK_TARGET_GAME_UPPER)
-
-target_compile_definitions(${DUSK_TARGET_NAME}
-  PRIVATE
-    DUSK_TARGET_GAME=${DUSK_TARGET_GAME}
-    DUSK_GAME_${DUSK_TARGET_GAME_UPPER}=1
-)
-
-add_subdirectory(${DUSK_TARGET_GAME})

src/game/game.h

@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "error/error.h"
-
-/**
- * Initialize the game.
- * 
- * @return Error code.
- */
-errorret_t gameInit(void);
-
-/**
- * Update the game state.
- */
-void gameUpdate(void);
-
-/**
- * Dispose of the game.
- */
-void gameDispose(void);

src/game/minesweeper/CMakeLists.txt

@@ -1,15 +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
-    game.c
-)
-
-# Subdirs
-add_subdirectory(display)
-add_subdirectory(scene)
-add_subdirectory(ui)

src/game/minesweeper/display/CMakeLists.txt

@@ -1,12 +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
-    sweepboard.c
-)
-
-# Subdirs

src/game/minesweeper/display/sweepboard.c

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "sweepboard.h"
-
-sweepboard_t SWEEPBOARD;
-
-void sweepBoardInit() {
-  // Initialize the sweep board
-}
-
-void sweepBoardRender(const float_t x, const float_t y) {
-  // Frame
-  // uiFrameDrawTiled(
-  //   32, 32,
-  //   w - 64, h - 64,
-  //   UI.frameTileset,
-  //   0, 0,
-  //   true,
-  //   &UI.frameAsset->paletteImage.texture
-  // );
-}
-
-void sweepBoardDispose() {
-  // Dispose of the sweep board resources
-}

src/game/minesweeper/display/sweepboard.h

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "dusk.h"
-
-typedef struct {
-  int32_t nothing;
-} sweepboard_t;
-
-extern sweepboard_t SWEEPBOARD;
-
-/**
- * Initializes the sweep board.
- */
-void sweepBoardInit();
-
-/**
- * Disposes of the sweep board resources.
- */
-void sweepBoardDispose();

src/game/minesweeper/game.c

@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "game/game.h"
-#include "game/minesweeper/ui/ui.h"
-#include "game/minesweeper/scene/scenesweep.h"
-#include "scene/scenemanager.h"
-#include "console/console.h"
-#include "display/screen.h"
-
-errorret_t gameInit(void) {
-  // Setup screen
-  SCREEN.mode = SCREEN_MODE_FIXED_HEIGHT;
-  SCREEN.fixedHeight.height = 270;
-
-  errorChain(uiInit());
-  
-  sceneManagerRegisterScene(&SCENE_SWEEP);
-
-  errorOk();
-}
-
-void gameUpdate(void) {
-
-}
-
-void gameDispose(void) {
-  uiDispose();
-}

src/game/minesweeper/scene/CMakeLists.txt

@@ -1,12 +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
-    scenesweep.c
-)
-
-# Subdirs

src/game/minesweeper/scene/scenesweep.c

@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "scenesweep.h"
-#include "game/minesweeper/ui/ui.h"
-#include "ui/uiframe.h"
-#include "display/spritebatch/spritebatch.h"
-#include "game/minesweeper/display/sweepboard.h"
-#include "display/screen.h"
-
-scene_t SCENE_SWEEP = {
-  .name = "sweep",
-  .init = sceneSweepInit,
-  .update = sceneSweepUpdate,
-  .render = sceneSweepRender,
-  .dispose = sceneSweepDispose,
-  .background = color_hex(0x48413cff)
-};
-
-scenesweep_t SCENE_SWEEP_DATA;
-
-errorret_t sceneSweepInit(void) {
-  cameraInitOrthographic(&SCENE_SWEEP_DATA.camera);
-
-  // Initialize scene data here
-  errorOk();
-}
-
-void sceneSweepUpdate(void) {
-  // Update scene logic here
-}
-
-void sceneSweepRender(void) {
-  int32_t w = SCREEN.width;
-  int32_t h = SCREEN.height;
-
-  SCENE_SWEEP_DATA.camera.orthographic.left = 0;
-  SCENE_SWEEP_DATA.camera.orthographic.right = w;
-  SCENE_SWEEP_DATA.camera.orthographic.bottom = h;
-  SCENE_SWEEP_DATA.camera.orthographic.top = 0;
-  cameraPushMatrix(&SCENE_SWEEP_DATA.camera);
-
-  // Background
-  uiFrameDrawTiled(
-    8, 8,
-    w - 16, h - 16,
-    UI.backgroundTileset,
-    0, 0,
-    true,
-    &UI.backgroundAsset->paletteImage.texture
-  );
-
-  // Frame
-  uiFrameDrawTiled(
-    32, 32,
-    w - 64, h - 64,
-    UI.frameTileset,
-    0, 0,
-    true,
-    &UI.frameAsset->paletteImage.texture
-  );
-
-  spriteBatchFlush();
-  cameraPopMatrix();
-
-  uiRender();
-}
-
-void sceneSweepDispose(void) {
-  // Clean up scene resources here
-  printf("Disposing sweep scene\n");
-}

src/game/minesweeper/scene/scenesweep.h

@@ -1,37 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "scene/scene.h"
-#include "display/camera.h"
-
-typedef struct {
-  camera_t camera;
-} scenesweep_t;
-
-extern scene_t SCENE_SWEEP;
-extern scenesweep_t SCENE_SWEEP_DATA;
-
-/**
- * Initializes the scene.
- */
-errorret_t sceneSweepInit(void);
-
-/**
- * Updates the state of the scene.
- */
-void sceneSweepUpdate(void);
-
-/**
- * Renders the current state of the scene.
- */
-void sceneSweepRender(void);
-
-/**
- * Cleans up resources used by the scene.
- */
-void sceneSweepDispose(void);

src/game/minesweeper/sweeper.c

@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "sweeper.h"
-#include "assert/assert.h"
-#include "util/memory.h"
-
-extern sweeper_t SWEEPER;
-
-void sweeperInit(void) {
-  memoryZero(&SWEEPER, sizeof(sweeper_t));
-}
-
-void sweeperReveal(const uint16_t x, const uint16_t y) {
-  assertTrue(x < SWEEPER_GRID_WIDTH, "X coordinate out of bounds");
-  assertTrue(y < SWEEPER_GRID_HEIGHT, "Y coordinate out of bounds");
-  
-  sweepercell_t *cell = &SWEEPER.grid[y * SWEEPER_GRID_WIDTH + x];
-
-  // Dont reveal twice.
-  if(*cell != SWEEPER_CELL_HIDDEN) {
-    return;
-  }
-
-  // Can't reveal flag.
-  if(*cell == SWEEPER_CELL_FLAGGED) {
-    return;
-  }
-
-  // Game over
-  if(cell == SWEEPER_CELL_HIDDEN_MINE) {
-    *cell = SWEEPER_CELL_MINE;
-    SWEEPER.gameOver = true;
-    return;
-  }
-
-  // Adjacent mines
-  uint8_t surrounding = 0;
-  for(int16_t dy = -1; dy <= 1; ++dy) {
-    for(int16_t dx = -1; dx <= 1; ++dx) {
-      if(dx == 0 && dy == 0) continue;
-
-      int16_t nx = x + dx;
-      int16_t ny = y + dy;
-      if(
-        nx < 0 || nx >= SWEEPER_GRID_WIDTH ||
-        ny < 0 || ny >= SWEEPER_GRID_HEIGHT
-      ) continue;
-
-      sweepercell_t neighbor = SWEEPER.grid[ny * SWEEPER_GRID_WIDTH + nx];
-      if(neighbor == SWEEPER_CELL_HIDDEN_MINE) surrounding++;
-    }
-  }
-  
-  if(surrounding > 0) {
-    *cell = SWEEPER_CELL_0 + surrounding;
-    return;
-  }
-  
-  // Cascade reveal
-  printf("Cascading reveal at %d, %d\n", x, y);
-  *cell = SWEEPER_CELL_0;
-}
-
-void sweeperFlag(const uint16_t x, const uint16_t y) {
-  assertTrue(x < SWEEPER_GRID_WIDTH, "X coordinate out of bounds");
-  assertTrue(y < SWEEPER_GRID_HEIGHT, "Y coordinate out of bounds");
-
-  sweepercell_t *cell = &SWEEPER.grid[y * SWEEPER_GRID_WIDTH + x];
-
-  if(*cell == SWEEPER_CELL_HIDDEN) {
-    *cell = SWEEPER_CELL_FLAGGED;
-  } else if(*cell == SWEEPER_CELL_FLAGGED) {
-    *cell = SWEEPER_CELL_HIDDEN;
-  }
-}

src/game/minesweeper/sweeper.h

@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "dusk.h"
-
-typedef enum {
-  SWEEPER_CELL_HIDDEN = 0x00,
-  SWEEPER_CELL_HIDDEN_MINE = 0x01,
-  SWEEPER_CELL_0 = 0x02,
-  SWEEPER_CELL_1 = 0x03,
-  SWEEPER_CELL_2 = 0x04,
-  SWEEPER_CELL_3 = 0x05,
-  SWEEPER_CELL_4 = 0x06,
-  SWEEPER_CELL_5 = 0x07,
-  SWEEPER_CELL_6 = 0x08,
-  SWEEPER_CELL_7 = 0x09,
-  SWEEPER_CELL_8 = 0x0A,
-  SWEEPER_CELL_9 = 0x0B,
-  SWEEPER_CELL_FLAGGED = 0x0C,
-  SWEEPER_CELL_MINE = 0x0D,
-} sweepercell_t;
-
-#define SWEEPER_GRID_WIDTH 16
-#define SWEEPER_GRID_HEIGHT 16
-
-typedef struct {
-  sweepercell_t grid[SWEEPER_GRID_WIDTH * SWEEPER_GRID_HEIGHT];
-  bool_t gameOver;
-} sweeper_t;
-
-extern sweeper_t SWEEPER;
-
-/**
- * Initializes the Minesweeper game state.
- */
-void sweeperInit(void);
-
-/**
- * Reveals the cell at the specified coordinates.
- * 
- * @param x The x-coordinate of the cell to reveal.
- * @param y The y-coordinate of the cell to reveal.
- */
-void sweeperReveal(const uint16_t x, const uint16_t y);
-
-/**
- * Flags or unflags the cell at the specified coordinates.
- * 
- * @param x The x-coordinate of the cell to flag or unflag.
- * @param y The y-coordinate of the cell to flag or unflag.
- */
-void sweeperFlag(const uint16_t x, const uint16_t y);

src/game/minesweeper/ui/CMakeLists.txt

@@ -1,12 +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
-    ui.c
-)
-
-# Subdirs

src/game/minesweeper/ui/ui.c

@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "ui.h"
-#include "ui/uifps.h"
-#include "ui/uiconsole.h"
-#include "ui/uiframe.h"
-#include "display/screen.h"
-#include "display/spritebatch/spritebatch.h"
-
-#include "display/tileset/tileset_minogram.h"
-#include "display/tileset/tileset_ui.h"
-#include "display/tileset/tileset_ui_frame.h"
-#include "display/tileset/tileset_background.h"
-
-ui_t UI;
-
-errorret_t uiInit(void) {
-  cameraInitOrthographic(&UI.camera);
-
-  UI.minogramTileset = (tileset_t*)&TILESET_MINOGRAM;
-  errorChain(assetManagerLoadAsset(
-    UI.minogramTileset->image,
-    &UI.minogramAsset,
-    &UI.minogramRef
-  ));
-
-  UI.uiTileset = (tileset_t*)&TILESET_UI;
-  errorChain(assetManagerLoadAsset(
-    UI.uiTileset->image,
-    &UI.uiAsset,
-    &UI.uiRef
-  ));
-
-  UI.frameTileset = (tileset_t*)&TILESET_UI_FRAME;
-  errorChain(assetManagerLoadAsset(
-    UI.frameTileset->image,
-    &UI.frameAsset,
-    &UI.frameRef
-  ));
-
-  UI.backgroundTileset = (tileset_t*)&TILESET_BACKGROUND;
-  errorChain(assetManagerLoadAsset(
-    UI.backgroundTileset->image,
-    &UI.backgroundAsset,
-    &UI.backgroundRef
-  ));
-
-  errorOk();
-}
-
-void uiRender(void) {
-  UI.camera.orthographic.left = 0;
-  UI.camera.orthographic.right = SCREEN.width;
-  UI.camera.orthographic.bottom = SCREEN.height;
-  UI.camera.orthographic.top = 0;
-
-  cameraPushMatrix(&UI.camera);
-
-  uiFPSRender(UI.minogramTileset, &UI.minogramAsset->alphaImage.texture);
-  uiConsoleRender(
-    0, 0,
-    UI.minogramTileset, &UI.minogramAsset->alphaImage.texture
-  );
-  spriteBatchFlush();
-
-  cameraPopMatrix();
-}
-
-void uiDispose(void) {
-  
-}

src/game/minesweeper/ui/ui.h

@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "dusk.h"
-#include "display/camera.h"
-#include "asset/assetmanager.h"
-#include "display/tileset.h"
-
-typedef struct {
-  camera_t camera;
-
-  tileset_t *minogramTileset;
-  asset_t *minogramAsset;
-  ref_t minogramRef;
-
-  tileset_t *uiTileset;
-  asset_t *uiAsset;
-  ref_t uiRef;
-
-  tileset_t *frameTileset;
-  asset_t *frameAsset;
-  ref_t frameRef;
-
-  tileset_t *backgroundTileset;
-  asset_t *backgroundAsset;
-  ref_t backgroundRef;
-} ui_t;
-
-extern ui_t UI;
-
-/**
- * Initializes the Minesweeper UI.
- * 
- * @return Error code indicating success or failure.
- */
-errorret_t uiInit(void);
-
-/**
- * Renders the Minesweeper UI.
- */
-void uiRender(void);
-
-/**
- * Disposes of the Minesweeper UI.
- */
-void uiDispose(void);

src/game/rpg/CMakeLists.txt

@@ -1,14 +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
-    rpg.c
-)
-
-# Subdirs
-add_subdirectory(entity)
-add_subdirectory(world)

src/game/rpg/entity/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
-    entity.c
-    npc.c
-    player.c
-    direction.c
-)

src/game/rpg/entity/direction.c

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "direction.h"
-#include "assert/assert.h"
-
-float_t directionToAngle(const direction_t dir) {
-  switch(dir) {
-    case DIRECTION_NORTH: return (M_PI_2);
-    case DIRECTION_SOUTH: return -(M_PI_2);
-    case DIRECTION_EAST: return 0;
-    case DIRECTION_WEST: return (M_PI);
-    default: return 0; // Should never happen
-  }
-}
-
-void directionGetVec2(const direction_t dir, vec2 out) {
-  assertNotNull(out, "Output vector cannot be NULL");
-
-  switch(dir) {
-    case DIRECTION_NORTH:
-      out[0] = 0.0f;
-      out[1] = 1.0f;
-      break;
-
-    case DIRECTION_SOUTH:
-      out[0] = 0.0f;
-      out[1] = -1.0f;
-      break;
-
-    case DIRECTION_EAST:
-      out[0] = 1.0f;
-      out[1] = 0.0f;
-      break;
-
-    case DIRECTION_WEST:
-      out[0] = -1.0f;
-      out[1] = 0.0f;
-      break;
-
-    default:
-      assertUnreachable("Invalid direction");
-  }
-}

src/game/rpg/entity/direction.h

@@ -1,37 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "dusk.h"
-
-typedef enum {
-  DIRECTION_SOUTH = 0,
-  DIRECTION_EAST = 1,
-  DIRECTION_WEST = 2,
-  DIRECTION_NORTH = 3,
-
-  DIRECTION_UP = DIRECTION_NORTH,
-  DIRECTION_DOWN = DIRECTION_SOUTH,
-  DIRECTION_LEFT = DIRECTION_WEST,
-  DIRECTION_RIGHT = DIRECTION_EAST,
-} direction_t;
-
-/**
- * Converts a direction to an angle in float_t format.
- * 
- * @param dir The direction to convert.
- * @return The angle corresponding to the direction.
- */
-float_t directionToAngle(const direction_t dir);
-
-/**
- * Converts a direction to a vec2 unit vector.
- * 
- * @param dir The direction to convert.
- * @param out Pointer to the vec2 array to populate.
- */
-void directionGetVec2(const direction_t dir, vec2 out);

src/game/rpg/entity/entity.c

@@ -1,107 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "entity.h"
-#include "rpg/world/map.h"
-#include "assert/assert.h"
-#include "util/memory.h"
-#include "display/tileset/tileset_entities.h"
-#include "time/time.h"
-#include "util/math.h"
-
-void entityInit(entity_t *entity, const entitytype_t type, map_t *map) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-  assertNotNull(map, "Map pointer cannot be NULL");
-  assertTrue(type < ENTITY_TYPE_COUNT, "Invalid entity type");
-  assertTrue(type != ENTITY_TYPE_NULL, "Cannot have NULL entity type");
-
-  memoryZero(entity, sizeof(entity_t));
-  entity->type = type;
-  entity->map = map;
-
-  // Init. I did use a callback struct but it was not flexible enough.
-  switch(type) {
-    case ENTITY_TYPE_PLAYER:
-      playerInit(entity);
-      break;
-
-    case ENTITY_TYPE_NPC:
-      npcInit(entity);
-      break;
-
-    default:
-      break;
-  }
-}
-
-void entityUpdate(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-  assertTrue(entity->type < ENTITY_TYPE_COUNT, "Invalid entity type");
-  assertTrue(entity->type != ENTITY_TYPE_NULL, "Cannot have NULL entity type");
-
-  // Handle movement logic
-  switch(entity->type) {
-    case ENTITY_TYPE_PLAYER:
-      playerMovement(entity);
-      break;
-
-    case ENTITY_TYPE_NPC:
-      npcUpdate(entity);
-      break;
-
-    default:
-      break;
-  }
-
-  // Apply velocity
-  if(entity->velocity[0] != 0.0f || entity->velocity[1] != 0.0f) {
-    entity->position[0] += entity->velocity[0] * TIME.delta;
-    entity->position[1] += entity->velocity[1] * TIME.delta;
-
-    // Hit test on other entities.
-    entity_t *start = entity->map->entities;
-    entity_t *end = &entity->map->entities[entity->map->entityCount];
-
-    // Our hitbox
-    physicscircle_t self;
-    glm_vec2_copy(entity->position, self.position);
-    self.radius = TILESET_ENTITIES.tileWidth / 2.0f;
-
-    physicscircle_t other;
-    other.radius = self.radius;
-
-    // TODO: what if multiple collisions?
-    do {
-      if(start == entity) continue;
-      if(start->type == ENTITY_TYPE_NULL) continue;
-      glm_vec2_copy(start->position, other.position);
-
-      physicscirclecircleresult_t result;
-      physicsCircleCheckCircle(self, other, &result);
-
-      if(result.hit) {
-        entity->position[0] -= result.normal[0] * result.depth;
-        entity->position[1] -= result.normal[1] * result.depth;
-        break;
-      }
-    } while((start++) != end);
-
-    // Friction (and dampening)
-    entity->velocity[0] *= ENTITY_FRICTION * TIME.delta;
-    entity->velocity[1] *= ENTITY_FRICTION * TIME.delta;
-    if(mathAbs(entity->velocity[0]) < ENTITY_MIN_VELOCITY) {
-      entity->velocity[0] = 0.0f;
-    }
-    if(mathAbs(entity->velocity[1]) < ENTITY_MIN_VELOCITY) {
-      entity->velocity[1] = 0.0f;
-    }
-  }
-
-  if(entity->type == ENTITY_TYPE_PLAYER) {
-    playerInteraction(entity);
-  }
-}

src/game/rpg/entity/entity.h

@@ -1,55 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "direction.h"
-#include "rpg/entity/player.h"
-#include "npc.h"
-#include "physics/physics.h"
-
-#define ENTITY_FRICTION 0.9f
-#define ENTITY_MIN_VELOCITY 0.05f
-
-typedef struct map_s map_t;
-
-typedef enum {
-  ENTITY_TYPE_NULL,
-  ENTITY_TYPE_PLAYER,
-  ENTITY_TYPE_NPC,
-
-  ENTITY_TYPE_COUNT
-} entitytype_t;
-
-typedef struct entity_s {
-  map_t *map;
-  entitytype_t type;
-  direction_t direction;
-
-  vec2 position;
-  vec2 velocity;
-
-  union {
-    player_t player;
-    npc_t npc;
-  };
-} entity_t;
-
-/**
- * Initializes an entity structure.
- * 
- * @param entity Pointer to the entity structure to initialize.
- * @param type The type of the entity.
- * @param map Pointer to the map the entity belongs to.
- */
-void entityInit(entity_t *entity, const entitytype_t type, map_t *map);
-
-/**
- * Updates an entity.
- * 
- * @param entity Pointer to the entity structure to update.
- */
-void entityUpdate(entity_t *entity);

src/game/rpg/entity/npc.c

@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "entity.h"
-#include "assert/assert.h"
-
-void npcInit(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-}
-
-void npcUpdate(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-}

src/game/rpg/entity/npc.h

@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "dusk.h"
-
-typedef struct entity_s entity_t;
-
-typedef struct {
-  void *nothing;
-} npc_t;
-
-/**
- * Initializes an NPC entity.
- * 
- * @param entity Pointer to the entity structure to initialize.
- */
-void npcInit(entity_t *entity);
-
-/**
- * Updates an NPC entity.
- * 
- * @param entity Pointer to the entity structure to update.
- */
-void npcUpdate(entity_t *entity);

src/game/rpg/entity/player.c

@@ -1,115 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "entity.h"
-#include "assert/assert.h"
-#include "input/input.h"
-#include "display/scene/overworld/sceneoverworld.h"
-#include "display/tileset/tileset_entities.h"
-
-void playerInit(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-}
-
-void playerMovement(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-
-  // Update velocity.
-  vec2 dir = {
-    inputAxis(INPUT_ACTION_LEFT, INPUT_ACTION_RIGHT),
-    inputAxis(INPUT_ACTION_DOWN, INPUT_ACTION_UP)
-  };
-  if(dir[0] == 0 && dir[1] == 0) return;
-
-  glm_vec2_normalize(dir);
-  entity->velocity[0] += PLAYER_SPEED * dir[0];
-  entity->velocity[1] += PLAYER_SPEED * dir[1];
-  
-  // Update direction.
-  if(dir[0] > 0) {
-    if(entity->direction == DIRECTION_RIGHT) {
-      entity->direction = DIRECTION_RIGHT;
-    } else {
-      if(dir[1] < 0) {
-        entity->direction = DIRECTION_UP;
-      } else if(dir[1] > 0) {
-        entity->direction = DIRECTION_DOWN;
-      } else {
-        entity->direction = DIRECTION_RIGHT;
-      }
-    }
-  } else if(dir[0] < 0) {
-    if(entity->direction == DIRECTION_LEFT) {
-      entity->direction = DIRECTION_LEFT;
-    } else {
-      if(dir[1] < 0) {
-        entity->direction = DIRECTION_UP;
-      } else if(dir[1] > 0) {
-        entity->direction = DIRECTION_DOWN;
-      } else {
-        entity->direction = DIRECTION_LEFT;
-      }
-    }
-  } else if(dir[1] < 0) {
-    entity->direction = DIRECTION_UP;
-  } else if(dir[1] > 0) {
-    entity->direction = DIRECTION_DOWN;
-  }
-}
-
-void playerInteraction(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-
-  if(!inputPressed(INPUT_ACTION_ACCEPT)) return;
-  
-  physicsbox_t interactBox;
-
-  // Get direction vector
-  directionGetVec2(entity->direction, interactBox.min);
-
-  // Scale by interact range
-  glm_vec2_scale(interactBox.min, PLAYER_INTERACTION_RANGE, interactBox.min);
-
-  // Add entity position, this makes the center of the box.
-  glm_vec2_add(interactBox.min, entity->position, interactBox.min);
-
-  // Copy to max
-  glm_vec2_copy(interactBox.min, interactBox.max);
-  
-  // Size of the hitbox
-  vec2 halfSize = {
-    TILESET_ENTITIES.tileWidth * PLAYER_INTERACTION_SIZE * 0.5f,
-    TILESET_ENTITIES.tileHeight * PLAYER_INTERACTION_SIZE * 0.5f
-  };
-
-  // Subtract from min, add to max.
-  glm_vec2_sub(interactBox.min, halfSize, interactBox.min);
-  glm_vec2_add(interactBox.max, halfSize, interactBox.max);
-
-  // For each entity
-  entity_t *start = entity->map->entities;
-  entity_t *end = &entity->map->entities[entity->map->entityCount];
-  vec2 otherSize = { TILESET_ENTITIES.tileWidth, TILESET_ENTITIES.tileHeight };
-  physicsbox_t otherBox;
-  physicsboxboxresult_t result;
-
-  do {
-    if(start->type != ENTITY_TYPE_NPC) continue;
-
-    // Setup other box.
-    glm_vec2_copy(start->position, otherBox.min);
-    glm_vec2_copy(start->position, otherBox.max);
-    glm_vec2_sub(otherBox.min, otherSize, otherBox.min);
-    glm_vec2_add(otherBox.min, otherSize, otherBox.max);
-    
-    physicsBoxCheckBox(interactBox, otherBox, &result);
-    if(!result.hit) continue;
-    
-    printf("Interacted with entity at (%.2f, %.2f)\n", start->position[0], start->position[1]);
-    break;
-  } while(++start != end);
-}

src/game/rpg/entity/player.h

@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "dusk.h"
-
-#define PLAYER_SPEED 64.0f
-#define PLAYER_INTERACTION_RANGE 1.0f
-#define PLAYER_INTERACTION_SIZE 0.5f
-
-typedef struct entity_s entity_t;
-
-typedef struct {
-  void *nothing;
-} player_t;
-
-/**
- * Initializes a player entity.
- * 
- * @param entity Pointer to the entity structure to initialize.
- */
-void playerInit(entity_t *entity);
-
-/**
- * Handles movement logic for the player entity.
- * 
- * @param entity Pointer to the player entity structure.
- */
-void playerMovement(entity_t *entity);
-
-/**
- * Handles interaction logic for the player entity.
- * 
- * @param entity Pointer to the player entity structure.
- */
-void playerInteraction(entity_t *entity);

src/game/rpg/overworld/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
-    sceneoverworld.c
-)

src/game/rpg/overworld/sceneoverworld.c

@@ -1,146 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "sceneoverworld.h"
-#include "rpg/entity/entity.h"
-#include "display/spritebatch/spritebatch.h"
-#include "display/framebuffer/framebuffer.h"
-#include "display/scene/scenemanager.h"
-#include "display/mesh/quad.h"
-#include "asset/assetmanager.h"
-#include "assert/assert.h"
-
-#include "display/tileset/tileset_entities.h"
-
-sceneoverworld_t SCENE_OVERWORLD;
-asset_t *testAsset;
-ref_t testAssetRef;
-
-errorret_t sceneOverworldInit(void) {
-  cameraInit(&SCENE_OVERWORLD.camera);
-  glm_vec3_copy((vec3){ 0.0f, 1.0f, 0.0f }, SCENE_OVERWORLD.camera.lookat.up);
-  SCENE_OVERWORLD.camera.perspective.fov = 45;
-  SCENE_OVERWORLD.camera.farClip = 10000.0f;
-
-  scene_t *scene = &SCENE_MANAGER_SCENES[SCENE_TYPE_OVERWORLD];
-  scene->flags |= SCENE_FLAG_ACTIVE | SCENE_FLAG_VISIBLE;
-
-  errorChain(assetManagerLoadAsset(
-    TILESET_ENTITIES.image, &testAsset, &testAssetRef
-  ));
-
-  errorOk();
-}
-
-void sceneOverworldUpdate(void) {
-  if(RPG.map == NULL) return;
-
-  // Move camera to player.
-  const entity_t *start = &RPG.map->entities[0];
-  const entity_t *end = &RPG.map->entities[RPG.map->entityCount];
-  while(start < end) {
-    if(start->type == ENTITY_TYPE_PLAYER) {
-      SCENE_OVERWORLD.camera.lookat.target[0] = start->position[0];
-      SCENE_OVERWORLD.camera.lookat.target[1] = start->position[1];
-      break;
-    }
-    start++;
-  }
-}
-
-void sceneOverworldRender(void) {
-  const float_t camOffset = 12.0f;
-  const float_t fbWidth = frameBufferGetWidth(FRAMEBUFFER_BOUND);
-  const float_t fbHeight = frameBufferGetHeight(FRAMEBUFFER_BOUND);
-  const float_t aspect = fbWidth / fbHeight;
-  const float_t pixelPerfectOffset = tanf(
-    (glm_rad(180) - SCENE_OVERWORLD.camera.perspective.fov) / 2.0f
-  ) * (fbHeight/ 2.0f);
-
-  // glm_vec3_copy((vec3){
-  //   -100.0f, -100.0f, 0.0f
-  // }, SCENE_OVERWORLD.camera.lookat.target);
-  glm_vec3_copy((vec3){
-    SCENE_OVERWORLD.camera.lookat.target[0],
-    SCENE_OVERWORLD.camera.lookat.target[1] + camOffset,
-    SCENE_OVERWORLD.camera.lookat.target[2] + pixelPerfectOffset
-  }, SCENE_OVERWORLD.camera.lookat.position);
-
-  cameraPushMatrix(&SCENE_OVERWORLD.camera);
-
-  if(RPG.map != NULL) sceneOverworldRenderMap(RPG.map);
-
-  spriteBatchFlush();
-  cameraPopMatrix();
-}
-
-void sceneOverworldRenderMap(const map_t *map) {
-  assertNotNull(map, "Map pointer cannot be NULL");
-
-  // Draw base layer
-  sceneOverworldRenderMapLayer(map, &map->base);
-  
-  // Draw entities
-  const entity_t *start = &map->entities[0];
-  const entity_t *end = &map->entities[map->entityCount];
-  while(start < end) {
-    // Render entity here.
-    sceneOverworldRenderEntity(start);
-    start++;
-  }
-  spriteBatchFlush();
-
-  // Draw overlay layer.
-  sceneOverworldRenderMapLayer(map, &map->overlay);
-}
-
-void sceneOverworldRenderEntity(const entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-  assertTrue(entity->type < ENTITY_TYPE_COUNT, "Invalid entity type");
-  assertTrue(entity->type != ENTITY_TYPE_NULL, "Cannot have NULL entity type");
-
-  vec4 uv;
-  tilesetPositionGetUV(&TILESET_ENTITIES, entity->direction, 0, uv);
-
-  // For now, just draw a placeholder quad.
-  spriteBatchPush(
-    &testAsset->paletteImage.texture,
-    entity->position[0], entity->position[1],
-    entity->position[0] + TILESET_ENTITIES.tileWidth,
-    entity->position[1] + TILESET_ENTITIES.tileHeight,
-    COLOR_WHITE,
-    uv[0], uv[1], uv[2], uv[3]
-  );
-}
-
-void sceneOverworldRenderMapLayer(const map_t *map, const maplayer_t *layer) {
-  assertNotNull(layer, "Map layer pointer cannot be NULL");
-
-  for(uint32_t y = 0; y < map->height; y++) {
-    for(uint32_t x = 0; x < map->width; x++) {
-      const tile_t *tile = &layer->tiles[y * map->width + x];
-      if(tile->id == 0) continue;
-
-      spriteBatchPush(
-        NULL,
-        x * TILESET_ENTITIES.tileWidth,
-        y * TILESET_ENTITIES.tileHeight,
-        (x + 1) * TILESET_ENTITIES.tileWidth,
-        (y + 1) * TILESET_ENTITIES.tileHeight,
-        COLOR_RED,
-        0, 0, 1, 1
-      );
-    }
-  }
-
-  spriteBatchFlush();
-}
-
-void sceneOverworldDispose(void) {
-  // Dispose of the overworld scene.
-  if(testAsset) assetUnlock(testAsset, testAssetRef);
-}

src/game/rpg/overworld/sceneoverworld.h

@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "display/camera.h"
-#include "rpg/rpg.h"
-#include "error/error.h"
-
-typedef struct {
-  camera_t camera;
-} sceneoverworld_t;
-
-extern sceneoverworld_t SCENE_OVERWORLD;
-
-/**
- * Initialize the overworld scene.
- */
-errorret_t sceneOverworldInit(void);
-
-/**
- * Update the overworld scene.
- */
-void sceneOverworldUpdate(void);
-
-/**
- * Render the overworld scene.
- */
-void sceneOverworldRender(void);
-
-/**
- * Render a map in the overworld scene.
- * 
- * @param map Pointer to the map to render.
- */
-void sceneOverworldRenderMap(const map_t *map);
-
-/**
- * Render an entity in the overworld scene.
- * 
- * @param entity Pointer to the entity to render.
- */
-void sceneOverworldRenderEntity(const entity_t *entity);
-
-/**
- * Render a map layer in the overworld scene.
- * 
- * @param map Pointer to the map the layer belongs to.
- * @param layer Pointer to the map layer to render.
- */
-void sceneOverworldRenderMapLayer(const map_t *map, const maplayer_t *layer);
-
-/**
- * Dispose of the overworld scene.
- */
-void sceneOverworldDispose(void);

src/game/rpg/rpg.c

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "rpg.h"
-#include "rpg/world/map.h"
-#include "util/memory.h"
-#include "asset/assetmanager.h"
-
-rpg_t RPG;
-
-asset_t *asset;
-ref_t assetRef;
-
-void rpgInit() {
-  memoryZero(&RPG, sizeof(RPG));
-
-  errorret_t ret = assetManagerLoadAsset("map/untitled.drm", &asset, &assetRef);
-  if(ret.code != ERROR_OK) {
-    errorPrint(ret);
-    errorCatch(ret);
-    return;
-  }
-  RPG.map = &asset->rpgMap.map;
-
-  // mapInit(&testMap);
-  // testMap.width = 2;
-  // testMap.height = 2;
-  // for(uint32_t i = 0; i < testMap.width * testMap.height; i++) {
-  //   testMap.base.tiles[i].id = 1;
-  // }
-
-  // entity_t *ent = mapEntityAdd(&testMap);
-  // entityInit(ent, ENTITY_TYPE_PLAYER, &testMap);
-
-  // entity_t *npc = mapEntityAdd(&testMap);
-  // entityInit(npc, ENTITY_TYPE_NPC, &testMap);
-  // npc->position[0] = 32.0f;
-  // npc->position[1] = 32.0f;
-}
-
-void rpgUpdate() {
-  if(RPG.map != NULL) {
-    mapUpdate(RPG.map);
-  }
-}

src/game/rpg/rpg.h

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "rpg/world/map.h"
-
-typedef struct {
-  map_t *map;
-} rpg_t;
-
-extern rpg_t RPG;
-
-/**
- * Initializes the RPG subsystem.
- */
-void rpgInit();
-
-/**
- * Updates the RPG subsystem.
- */
-void rpgUpdate();

src/game/rpg/screen.c

@@ -1,112 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "screen.h"
-#include "assert/assert.h"
-#include "display/spritebatch/spritebatch.h"
-
-screen_t SCREEN;
-
-void screenInit(void) {
-  // Virtual backbuffer for dynamic resolution scaling
-  #if DISPLAY_SIZE_DYNAMIC == 1
-    frameBufferInit(&SCREEN.frameBuffer, DISPLAY_WIDTH, DISPLAY_HEIGHT);
-    cameraInit(&SCREEN.frameBufferCamera);
-    SCREEN.frameBufferCamera.projType = CAMERA_PROJECTION_TYPE_ORTHOGRAPHIC;
-    SCREEN.frameBufferCamera.viewType = CAMERA_VIEW_TYPE_MATRIX;
-    glm_lookat(
-      (vec3){0.0f, 0.0f, 1.0f},
-      (vec3){0.0f, 0.0f, 0.0f},
-      (vec3){0.0f, 1.0f, 0.0f},
-      SCREEN.frameBufferCamera.view
-    );
-    SCREEN.frameBufferCamera.nearClip = -1.0f;
-    SCREEN.frameBufferCamera.farClip = 1.0f;
-  #endif
-}
-
-void screenBind(void) {
-  #if DISPLAY_SIZE_DYNAMIC == 1
-    frameBufferBind(&SCREEN.frameBuffer);
-  #else
-    frameBufferBind(NULL);
-  #endif
-
-  frameBufferClear(
-    FRAMEBUFFER_CLEAR_COLOR | FRAMEBUFFER_CLEAR_DEPTH,
-    COLOR_CORNFLOWER_BLUE
-  );
-}
-
-void screenUnbindAndRender(void) {
-  assertTrue(SPRITEBATCH.spriteCount == 0, "Sprite batch not flushed");
-
-  // Render to real backbuffer
-  #if DISPLAY_SIZE_DYNAMIC == 1
-    frameBufferBind(NULL);
-    frameBufferClear(
-      FRAMEBUFFER_CLEAR_COLOR | FRAMEBUFFER_CLEAR_DEPTH,
-      COLOR_BLACK
-    );
-    
-
-    SCREEN.frameBufferCamera.orthographic.left = 0;
-    SCREEN.frameBufferCamera.orthographic.right = frameBufferGetWidth(
-      FRAMEBUFFER_BOUND
-    );
-    SCREEN.frameBufferCamera.orthographic.bottom = frameBufferGetHeight(
-      FRAMEBUFFER_BOUND
-    );
-    SCREEN.frameBufferCamera.orthographic.top = 0;
-    cameraPushMatrix(&SCREEN.frameBufferCamera);
-
-    vec2 backbuffer = {
-      (float_t)frameBufferGetWidth(FRAMEBUFFER_BOUND),
-      (float_t)frameBufferGetHeight(FRAMEBUFFER_BOUND)
-    };
-    vec2 virtual = {
-      (float_t)frameBufferGetWidth(&SCREEN.frameBuffer),
-      (float_t)frameBufferGetHeight(&SCREEN.frameBuffer)
-    };
-
-    // Compare aspect ratios.
-    vec4 viewport;
-    float_t backbufferAspect = backbuffer[0] / backbuffer[1];
-    float_t virtualAspect = virtual[0] / virtual[1];
-    if (backbufferAspect > virtualAspect) {
-      // Backbuffer is wider: pillarbox
-      float_t scale = backbuffer[1] / virtual[1];
-      float_t width = virtual[0] * scale;
-      viewport[0] = (backbuffer[0] - width) * 0.5f;
-      viewport[1] = 0;
-      viewport[2] = width;
-      viewport[3] = backbuffer[1];
-    } else {
-      // Backbuffer is taller: letterbox
-      float_t scale = backbuffer[0] / virtual[0];
-      float_t height = virtual[1] * scale;
-      viewport[0] = 0;
-      viewport[1] = (backbuffer[1] - height) * 0.5f;
-      viewport[2] = backbuffer[0];
-      viewport[3] = height;
-    }
-
-    spriteBatchPush(
-      &SCREEN.frameBuffer.texture,
-      viewport[0], viewport[1],
-      viewport[0] + viewport[2], viewport[1] + viewport[3],
-      COLOR_WHITE,
-      0.0f, 1.0f, 1.0f, 0.0f
-    );
-    spriteBatchFlush();
-    cameraPopMatrix();
-  #endif
-}
-
-void screenDispose(void) {
-  frameBufferDispose(&SCREEN.frameBuffer);
-}

src/game/rpg/screen.h

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "display/camera.h"
-#include "display/framebuffer/framebuffer.h"
-
-typedef struct {
-  #if DISPLAY_SIZE_DYNAMIC == 1
-    framebuffer_t frameBuffer;
-    camera_t frameBufferCamera;
-  #else
-    void *empty;
-  #endif
-} screen_t;
-
-extern screen_t SCREEN;
-
-/**
- * Initializes the screen.
- */
-void screenInit(void);
-
-/**
- * Binds the screen for rendering.
- */
-void screenBind(void);
-
-/**
- * Unbinds the screen and renders it.
- */
-void screenUnbindAndRender(void);
-
-/**
- * Disposes of the screen.
- */
-void screenDispose(void);

src/game/rpg/test/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
-    scenetest.c
-)

src/game/rpg/test/scenetest.c

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "scenetest.h"
-#include "display/scene/scenemanager.h"
-#include "display/spritebatch/spritebatch.h"
-
-scenetest_t SCENE_TEST;
-
-errorret_t sceneTestInit(void) {
-  cameraInit(&SCENE_TEST.camera);
-  SCENE_TEST.camera.projType = CAMERA_PROJECTION_TYPE_ORTHOGRAPHIC;
-  SCENE_TEST.camera.nearClip = -1.0f;
-  SCENE_TEST.camera.farClip = 2.0f;
-
-  SCENE_TEST.camera.viewType = CAMERA_VIEW_TYPE_2D;
-  SCENE_TEST.camera._2d.zoom = 2.0f;
-  SCENE_TEST.camera._2d.position[0] = -150.0f;
-  SCENE_TEST.camera._2d.position[1] = -50.0f;
-
-  scene_t *scene = &SCENE_MANAGER_SCENES[SCENE_TYPE_TEST];
-  scene->flags |= SCENE_FLAG_ACTIVE | SCENE_FLAG_VISIBLE;
-
-  errorOk();
-}
-
-void sceneTestUpdate(void) {
-}
-
-void sceneTestRender(void) {
-  SCENE_TEST.camera.orthographic.left = 0.0f;
-  SCENE_TEST.camera.orthographic.right = frameBufferGetWidth(FRAMEBUFFER_BOUND);
-  SCENE_TEST.camera.orthographic.top = frameBufferGetHeight(FRAMEBUFFER_BOUND);
-  SCENE_TEST.camera.orthographic.bottom = 0.0f;
-
-  cameraPushMatrix(&SCENE_TEST.camera);
-  spriteBatchClear();
-
-  spriteBatchFlush();
-  cameraPopMatrix();
-}
-
-void sceneTestDispose(void) {
-}

src/game/rpg/test/scenetest.h

@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "display/camera.h"
-#include "error/error.h"
-
-typedef struct {
-  camera_t camera;
-} scenetest_t;
-
-extern scenetest_t SCENE_TEST;
-
-/**
- * Initialize the test scene.
- */
-errorret_t sceneTestInit(void);
-
-/**
- * Update the test scene.
- */
-void sceneTestUpdate(void);
-
-/**
- * Render the test scene.
- */
-void sceneTestRender(void);
-
-/**
- * Dispose of the test scene.
- */
-void sceneTestDispose(void);

src/game/rpg/world/map.c

@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "map.h"
-#include "util/memory.h"
-#include "assert/assert.h"
-
-void mapInit(map_t *map) {
-  assertNotNull(map, "Map cannot be NULL");
-  memoryZero(map, sizeof(map_t));
-}
-
-void mapUpdate(map_t *map) {
-  assertNotNull(map, "Map cannot be NULL");
-
-  entity_t *start = &map->entities[0];
-  entity_t *end = &map->entities[map->entityCount];
-  while(start < end) {
-    entityUpdate(start++);
-  }
-}
-
-entity_t * mapEntityAdd(map_t *map) {
-  assertNotNull(map, "Map cannot be NULL");
-  assertTrue(map->entityCount < MAP_ENTITY_COUNT_MAX, "Map entities full");
-
-  entity_t *entity = &map->entities[map->entityCount++];
-  return entity;
-}

src/game/rpg/world/map.h

@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "rpg/entity/entity.h"
-
-#define MAP_ENTITY_COUNT_MAX 32
-
-#define MAP_WIDTH_MAX 64
-#define MAP_HEIGHT_MAX 64
-#define MAP_TILE_COUNT_MAX (MAP_WIDTH_MAX * MAP_HEIGHT_MAX)
-#define MAP_LAYER_COUNT_MAX 2
-
-typedef struct {
-  uint8_t id;
-} tile_t;
-
-typedef struct {
-  tile_t tiles[MAP_TILE_COUNT_MAX];
-} maplayer_t;
-
-typedef struct map_s {
-  entity_t entities[MAP_ENTITY_COUNT_MAX];
-  uint8_t entityCount;
-
-  uint8_t width, height;
-  maplayer_t base;
-  maplayer_t overlay;
-} map_t;
-
-extern map_t testMap;
-
-/**
- * Initializes a map structure.
- * 
- * @param map Pointer to the map structure to initialize.
- */
-void mapInit(map_t *map);
-
-/**
- * Updates the map and its entities.
- * 
- * @param map Pointer to the map structure to update.
- */
-void mapUpdate(map_t *map);
-
-/**
- * Adds (but does not initialize) an entity on the map.
- * 
- * @param map Pointer to the map structure.
- * @return Pointer to the added entity.
- */
-entity_t * mapEntityAdd(map_t *map);

src/game/rpg/world/tile.h

@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2025 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-
-typedef enum {
-  TILE_TYPE_NULL,
-} tiletype_t;
-
-typedef struct {
-  tiletype_t type;
-} tile_t;

src/scene/scenemanager.c

@@ -9,7 +9,7 @@
 #include "util/memory.h"
 #include "assert/assert.h"
 #include "console/console.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 #include "util/string.h"
 
 scenemanager_t SCENE_MANAGER;

src/ui/uiconsole.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "display/tileset.h"
-#include "display/texture/texture.h"
+#include "display/tileset/tileset.h"
+#include "display/texture.h"
 
 /**
  * Renders the console UI.

src/ui/uifps.c

@@ -10,7 +10,7 @@
 #include "console/console.h"
 #include "util/string.h"
 #include "ui/uitext.h"
-#include "display/framebuffer/framebuffer.h"
+#include "display/framebuffer.h"
 
 void uiFPSRender(const tileset_t *tileset, texture_t *texture) {
   if(stringCompare(consoleVarGet("fps")->value, "0") == 0) {

src/ui/uifps.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "display/tileset.h"
-#include "display/texture/texture.h"
+#include "display/tileset/tileset.h"
+#include "display/texture.h"
 
 /**
  * Renders the FPS counter UI.

src/ui/uiframe.c

@@ -6,7 +6,7 @@
  */
 
 #include "uiframe.h"
-#include "display/spritebatch/spritebatch.h"
+#include "display/spritebatch.h"
 #include "assert/assert.h"
 #include <math.h>
 

src/ui/uiframe.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "display/tileset.h"
-#include "display/texture/texture.h"
+#include "display/tileset/tileset.h"
+#include "display/texture.h"
 
 /**
  * Draw a UI Frame (using the 9-slice technique).

src/ui/uitext.c

@@ -9,7 +9,7 @@
 #include "asset/assetmanager.h"
 #include "assert/assert.h"
 #include "util/memory.h"
-#include "display/spritebatch/spritebatch.h"
+#include "display/spritebatch.h"
 
 void uiTextDrawChar(
   const float_t x,