Prog on knulli

.github/workflows/build.yml

@@ -1,4 +1,5 @@
 name: Build Dusk
+
 on:
   push:
     branches:
@@ -6,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+
 jobs:
   run-tests:
     runs-on: ubuntu-latest
@@ -53,26 +55,6 @@ jobs:
           path: ./git-artifcats/Dusk
           if-no-files-found: error
 
-  build-knulli:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-      - name: Set up Docker
-        uses: docker/setup-docker-action@v5
-      - name: Build knulli
-        run: ./scripts/build-knulli-docker.sh
-      - name: Move output to Dusk subfolder
-        run: |
-          mkdir -p ./git-artifcats/Dusk
-          cp -r build-knulli/dusk ./git-artifcats/Dusk
-      - name: Upload knulli binary
-        uses: actions/upload-artifact@v6
-        with:
-          name: dusk-knulli
-          path: ./git-artifcats/Dusk
-          if-no-files-found: error
-
   build-gamecube:
     runs-on: ubuntu-latest
     steps:
@@ -92,7 +74,6 @@ jobs:
         with:
           name: dusk-gamecube
           path: ./git-artifcats/Dusk
-          if-no-files-found: error
 
   build-wii:
     runs-on: ubuntu-latest
@@ -106,7 +87,7 @@ jobs:
       - name: Copy output files.
         run: |
           mkdir -p ./git-artifcats/Dusk/apps/Dusk
-          cp build-wii/Dusk.dol ./git-artifcats/Dusk/apps/Dusk/boot.dol
+          cp build-wii/Dusk.dol ./git-artifcats/Dusk/apps/Dusk/Dusk.dol
           cp build-wii/dusk.dsk ./git-artifcats/Dusk/apps/Dusk/dusk.dsk
           cp docker/dolphin/meta.xml ./git-artifcats/Dusk/apps/Dusk/meta.xml
       - name: Upload Wii binary
@@ -114,4 +95,3 @@ jobs:
         with:
           name: dusk-wii
           path: ./git-artifcats/Dusk
-          if-no-files-found: error

CMakeLists.txt

@@ -42,7 +42,7 @@ file(MAKE_DIRECTORY ${DUSK_TEMP_DIR})
 file(MAKE_DIRECTORY ${DUSK_BUILT_ASSETS_DIR})
 
 # Required build packages
-find_package(Python3 COMPONENTS Interpreter REQUIRED)
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
 # Init Project.
 project(${DUSK_LIBRARY_TARGET_NAME}

archive/dusk/map.py

@@ -156,7 +156,7 @@ class Map:
     newTopLeftChunkY = y // CHUNK_HEIGHT - (MAP_HEIGHT // 2)
     newTopLeftChunkZ = z // CHUNK_DEPTH - (MAP_DEPTH // 2)
 
-    if(newTopLeftChunkX != self.topLeftX or
+    if (newTopLeftChunkX != self.topLeftX or
         newTopLeftChunkY != self.topLeftY or
         newTopLeftChunkZ != self.topLeftZ):
       
@@ -166,7 +166,7 @@ class Map:
         chunkWorldX = chunk.x
         chunkWorldY = chunk.y
         chunkWorldZ = chunk.z
-        if(chunkWorldX < newTopLeftChunkX or
+        if (chunkWorldX < newTopLeftChunkX or
             chunkWorldX >= newTopLeftChunkX + MAP_WIDTH or
             chunkWorldY < newTopLeftChunkY or
             chunkWorldY >= newTopLeftChunkY + MAP_HEIGHT or

assets/init.lua

@@ -70,9 +70,8 @@ elseif LINUX then
     inputBind("mouse_x", INPUT_ACTION_POINTERX)
     inputBind("mouse_y", INPUT_ACTION_POINTERY)
   end
-
 else
   print("Unknown platform, no default input bindings set.")
 end
 
-sceneSet('scene/main_menu/main_menu.lua')
+sceneSet('scene/minesweeper.lua')

assets/locale/en_US.po

@@ -1,60 +1,9 @@
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: ExampleApp 1.0\n"
+"Language: en_US\n"
-"Language: en\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : (n<7 ? 2 : 3));\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/menu.c:10
+msgid "ui.test"
-msgid "ui.title"
+msgstr "Hello this is a test."
-msgstr ""
-"Welcome"
-
-#: ui/user.c:22
-msgid "ui.greeting"
-msgstr "Hello, %s!"
-
-#: ui/files.c:40
-msgid "ui.file_status"
-msgstr "%s has %d files."
-
-#: ui/cart.c:55
-msgid "cart.item_count"
-msgid_plural "cart.item_count"
-msgstr[0] "%d item"
-msgstr[1] "%d items (dual)"
-msgstr[2] "%d items (few)"
-msgstr[3] "%d items (many)"
-
-#: ui/notifications.c:71
-msgid ""
-"ui.multiline_help"
-msgstr ""
-"Line one of the help text.\n"
-"Line two continues here.\n"
-"Line three ends here."
-
-#: ui/errors.c:90
-msgid ""
-"error.upload_failed.long"
-msgstr ""
-"Upload failed for file \"%s\".\n"
-"Please try again later or contact support."
-
-#: ui/messages.c:110
-msgid ""
-"user.invite_status"
-msgid_plural ""
-"user.invite_status"
-msgstr[0] ""
-"%s invited %d user.\n"
-"Please review the request."
-msgstr[1] ""
-"%s invited %d users (dual).\n"
-"Please review the requests."
-msgstr[2] ""
-"%s invited %d users (few).\n"
-"Please review the requests."
-msgstr[3] ""
-"%s invited %d users (many).\n"
-"Please review the requests."

assets/scene/main_menu/main_menu.lua

@@ -1,46 +0,0 @@
-module('spritebatch')
-module('camera')
-module('color')
-module('ui')
-module('screen')
-module('time')
-module('text')
-module('tileset')
-module('texture')
-module('input')
-module('shader')
-module('locale')
-
-screenSetBackground(colorCornflowerBlue())
-camera = cameraCreate(CAMERA_PROJECTION_TYPE_ORTHOGRAPHIC)
-
-text = localeGetText('cart.item_count', 52, 2)
-
-function sceneDispose()
-end
-
-function sceneUpdate()
-end
-
-function sceneRender()
-  -- Update camera
-  camera.top = screenGetHeight()
-  camera.right = screenGetWidth()
-
-  shaderBind(SHADER_UNLIT)
-  proj = cameraGetProjectionMatrix(camera)
-  shaderSetMatrix(SHADER_UNLIT, SHADER_UNLIT_PROJECTION, proj)
-  view = cameraGetViewMatrix(camera)
-  shaderSetMatrix(SHADER_UNLIT, SHADER_UNLIT_VIEW, view)
-
-  -- shaderSetTexture(SHADER_UNLIT, SHADER_UNLIT_TEXTURE, nil)
-  -- spriteBatchPush(
-  --   32, 32,
-  --   64, 64,
-  --   colorWhite()
-  -- )
-  -- spriteBatchFlush()
-
-  textDraw(10, 10, text, colorWhite())
-  spriteBatchFlush()
-end

assets/scene/minesweeper.lua

@@ -0,0 +1,256 @@
+module('spritebatch')
+module('camera')
+module('color')
+module('ui')
+module('screen')
+module('time')
+module('glm')
+module('text')
+module('tileset')
+module('texture')
+module('input')
+
+CELL_STATE_DEFAULT = 0
+CELL_STATE_HOVER = 1
+CELL_STATE_DOWN = 2
+CELL_STATE_DISABLED = 3
+
+screenSetBackground(colorCornflowerBlue())
+camera = cameraCreate(CAMERA_PROJECTION_TYPE_ORTHOGRAPHIC)
+
+-- tilesetUi = tilesetGetByName("ui")
+-- textureUi = textureLoad(tilesetUi.texture)
+
+-- tilesetBorder = tilesetGetByName("border")
+-- textureBorder = textureLoad(tilesetBorder.texture)
+
+-- textureGrid = textureLoad("minesweeper/grid_bg.dpi")
+
+-- tilesetCell = tilesetGetByName("cell")
+-- textureCell = textureLoad(tilesetCell.texture)
+-- cellSliceDefault = tilesetPositionGetUV(tilesetCell, 3, 5)
+-- cellSliceHover = tilesetPositionGetUV(tilesetCell, 3, 4)
+-- cellSliceDown = tilesetPositionGetUV(tilesetCell, 3, 6)
+-- cellSliceDisabled = tilesetPositionGetUV(tilesetCell, 3, 7)
+
+-- sweepwerCols = 10
+-- sweeperRows = 14
+
+-- mouseX = -1
+-- mouseY = -1
+-- centerX = 0
+-- centerY = 0
+-- boardWidth = sweepwerCols * tilesetCell.tileWidth
+-- boardHeight = sweeperRows * tilesetCell.tileHeight
+
+-- i = 0
+-- cells = {}
+-- for y = 1, sweeperRows do
+--   for x = 1, sweepwerCols do
+--     cells[i] = CELL_STATE_DEFAULT
+--     i = i + 1
+--   end
+-- end
+
+function cellDraw(x, y, type)
+  local slice = cellSliceDefault
+  if type == CELL_STATE_HOVER then
+    slice = cellSliceHover
+  elseif type == CELL_STATE_DOWN then
+    slice = cellSliceDown
+  elseif type == CELL_STATE_DISABLED then
+    slice = cellSliceDisabled
+  end
+
+  spriteBatchPush(textureCell,
+    x, y,
+    x + tilesetCell.tileWidth, y + tilesetCell.tileHeight,
+    colorWhite(),
+    slice.u0, slice.v0,
+    slice.u1, slice.v1
+  )
+end
+
+function backgroundDraw()
+  local t = (TIME.time / 40) % 1
+  local scaleX = screenGetWidth() / textureGrid.width
+  local scaleY = screenGetHeight() / textureGrid.height
+  local u0 = t * scaleX
+  local v0 = t * scaleY
+  local u1 = scaleX + u0
+  local v1 = scaleY + v0
+
+  spriteBatchPush(textureGrid,
+    0, 0,
+    screenGetWidth(), screenGetHeight(),
+    colorWhite(),
+    u0, v0,
+    u1, v1
+  )
+end
+
+function borderDraw(x, y, innerWidth, innerHeight)
+  -- Top Left
+  local uv = tilesetPositionGetUV(tilesetBorder, 0, 0)
+  spriteBatchPush(textureBorder,
+    x - tilesetBorder.tileWidth, y  - tilesetBorder.tileWidth,
+    x, y,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Top Right
+  uv = tilesetPositionGetUV(tilesetBorder, 10, 0)
+  spriteBatchPush(textureBorder,
+    x + innerWidth, y - tilesetBorder.tileHeight,
+    x + innerWidth + tilesetBorder.tileWidth, y,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Bottom Left
+  uv = tilesetPositionGetUV(tilesetBorder, 0, 10)
+  spriteBatchPush(textureBorder,
+    x - tilesetBorder.tileWidth, y + innerHeight,
+    x, y + innerHeight + tilesetBorder.tileHeight,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Bottom Right
+  uv = tilesetPositionGetUV(tilesetBorder, 10, 10)
+  spriteBatchPush(textureBorder,
+    x + innerWidth, y + innerHeight,
+    x + innerWidth + tilesetBorder.tileWidth, y + innerHeight + tilesetBorder.tileHeight,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Top
+  uv = tilesetPositionGetUV(tilesetBorder, 1, 0)
+  spriteBatchPush(textureBorder,
+    x, y - tilesetBorder.tileHeight,
+    x + innerWidth, y,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Bottom
+  uv = tilesetPositionGetUV(tilesetBorder, 1, 10)
+  spriteBatchPush(textureBorder,
+    x, y + innerHeight,
+    x + innerWidth, y + innerHeight + tilesetBorder.tileHeight,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Left
+  uv = tilesetPositionGetUV(tilesetBorder, 0, 1)
+  spriteBatchPush(textureBorder,
+    x - tilesetBorder.tileWidth, y,
+    x, y + innerHeight,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+
+  -- Right
+  uv = tilesetPositionGetUV(tilesetBorder, 10, 1)
+  spriteBatchPush(textureBorder,
+    x + innerWidth, y,
+    x + innerWidth + tilesetBorder.tileWidth, y + innerHeight,
+    colorWhite(),
+    uv.u0, uv.v0,
+    uv.u1, uv.v1
+  )
+end
+
+x = 0
+y = 0
+
+function sceneDispose()
+end
+
+function sceneUpdate()
+  x = x + inputAxis(INPUT_ACTION_LEFT, INPUT_ACTION_RIGHT)
+  y = y + inputAxis(INPUT_ACTION_UP, INPUT_ACTION_DOWN)
+end
+
+
+function sceneRender()
+  -- Update camera
+  cameraPushMatrix(camera)
+  camera.bottom = screenGetHeight()
+  camera.right = screenGetWidth()
+
+  spriteBatchPush(
+    nil,
+    x, y, x + 32, y + 32,
+    colorBlue()
+  )
+
+  -- Update mouse position
+  -- if INPUT_POINTER then
+  --   mouseX = inputGetValue(INPUT_ACTION_POINTERX) * screenGetWidth()
+  --   mouseY = inputGetValue(INPUT_ACTION_POINTERY) * screenGetHeight()
+
+  --   -- Draw cursor
+  --   spriteBatchPush(
+  --     nil,
+  --     mouseX - 2, mouseY - 2,
+  --     mouseX + 2, mouseY + 2,
+  --     colorRed(),
+  --     0, 0,
+  --     1, 1
+  --   )
+  -- end
+
+
+  -- textDraw(10, 10, "Hello World")
+  
+  -- centerX = math.floor(screenGetWidth() / 2)
+  -- centerY = math.floor(screenGetHeight() / 2)
+
+  -- Draw elements
+  -- backgroundDraw()
+  -- borderDraw(
+  --   centerX - (boardWidth / 2), centerY - (boardHeight / 2),
+  --   boardWidth, boardHeight
+  -- )
+
+  -- i = 0
+  -- -- Foreach cell
+  -- local offX = centerX - (boardWidth / 2)
+  -- local offY = centerY - (boardHeight / 2)
+  -- for y = 0, sweeperRows - 1 do
+  --   for x = 0, sweepwerCols - 1 do
+  --     i = y * sweepwerCols + x
+      
+  --     -- Hovered
+  --     if
+  --       cells[i] == CELL_STATE_DEFAULT and
+  --       mouseX >= x * tilesetCell.tileWidth + offX and mouseX < (x + 1) * tilesetCell.tileWidth + offX and
+  --       mouseY >= y * tilesetCell.tileHeight + offY and mouseY < (y + 1) * tilesetCell.tileHeight + offY
+  --     then
+  --       cells[i] = CELL_STATE_HOVER
+  --     else
+  --       cells[i] = CELL_STATE_DEFAULT
+  --     end
+      
+  --     cellDraw(
+  --       x * tilesetCell.tileWidth + offX,
+  --       y * tilesetCell.tileHeight + offY,
+  --       cells[i]
+  --     )
+  --   end
+  -- end
+  spriteBatchFlush()
+
+  cameraPopMatrix()
+end

assets/test.json

@@ -1,19 +0,0 @@
-{
-  "name": "Dominic",
-  "age": 31,
-  "likes": [
-    "thing1",
-    "thing2"
-  ],
-  "options": {
-    "someParam": true,
-    "someSubObject": {
-      "someSubSubParam": 52
-    },
-    "someArray": [
-      1,
-      2,
-      3
-    ]
-  }
-}

cmake/modules/Findstb.cmake

@@ -1,31 +0,0 @@
-# Copyright (c) 2026 Dominic Masters
-# 
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-include(FetchContent)
-FetchContent_Declare(
-  stb
-  GIT_REPOSITORY https://github.com/nothings/stb.git
-)
-
-# Fetch stb if not already done
-FetchContent_MakeAvailable(stb)
-
-# Find the stb_image.h header
-set(STB_INCLUDE_DIR "${stb_SOURCE_DIR}")
-set(STB_IMAGE_HEADER "${stb_SOURCE_DIR}/stb_image.h")
-
-if(EXISTS "${STB_IMAGE_HEADER}")
-  add_library(stb_image INTERFACE)
-  target_include_directories(stb_image INTERFACE "${STB_INCLUDE_DIR}")
-  set(STB_IMAGE_FOUND TRUE)
-else()
-  set(STB_IMAGE_FOUND FALSE)
-endif()
-
-# Standard CMake variables
-set(STB_IMAGE_INCLUDE_DIRS "${STB_INCLUDE_DIR}")
-set(STB_IMAGE_LIBRARIES stb_image)
-
-mark_as_advanced(STB_IMAGE_INCLUDE_DIRS STB_IMAGE_LIBRARIES STB_IMAGE_FOUND)

cmake/modules/Findyyjson.cmake

@@ -1,18 +0,0 @@
-include(FetchContent)
-
-if(NOT TARGET yyjson)
-	FetchContent_Declare(
-		yyjson
-		GIT_REPOSITORY https://github.com/ibireme/yyjson.git
-		GIT_TAG        0.12.0
-	)
-	FetchContent_MakeAvailable(yyjson)
-endif()
-
-# Provide an imported target if not already available
-if(NOT TARGET yyjson::yyjson)
-	add_library(yyjson::yyjson ALIAS yyjson)
-endif()
-
-# Mark yyjson as found for find_package compatibility
-set(yyjson_FOUND TRUE)

cmake/targets/knulli.cmake

@@ -1,45 +0,0 @@
-# Find link platform-specific libraries
-set(OpenGL_GL_PREFERENCE LEGACY)
-find_package(SDL2 REQUIRED)
-find_library(EGL_LIB EGL REQUIRED)
-find_library(GL_LIB GL REQUIRED)
-find_package(OpenGL REQUIRED)
-
-# Setup endianess at compile time to optimize.
-include(TestBigEndian)
-test_big_endian(IS_BIG_ENDIAN)
-if(IS_BIG_ENDIAN)
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-    DUSK_PLATFORM_ENDIAN_BIG
-  )
-else()
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-    DUSK_PLATFORM_ENDIAN_LITTLE
-  )
-endif()
-
-# Link required libraries.
-target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE 
-  SDL2
-  pthread
-  OpenGL::GLES2
-  ${GL_LIB}
-  ${EGL_LIB}
-  m
-)
-
-# Define platform-specific macros.
-target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-  DUSK_SDL2
-  DUSK_OPENGL
-  DUSK_OPENGL_ES
-  DUSK_LINUX
-  DUSK_DISPLAY_SIZE_DYNAMIC
-  DUSK_DISPLAY_WIDTH_DEFAULT=640
-  DUSK_DISPLAY_HEIGHT_DEFAULT=480
-  DUSK_DISPLAY_SCREEN_HEIGHT=240
-  DUSK_INPUT_KEYBOARD
-  DUSK_INPUT_POINTER
-  DUSK_INPUT_GAMEPAD
-  DUSK_TIME_DYNAMIC
-)

cmake/targets/linux.cmake

@@ -28,7 +28,6 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
 target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
   DUSK_SDL2
   DUSK_OPENGL
-  # DUSK_OPENGL_LEGACY
   DUSK_LINUX
   DUSK_DISPLAY_SIZE_DYNAMIC
   DUSK_DISPLAY_WIDTH_DEFAULT=640

cmake/targets/psp.cmake

@@ -36,7 +36,6 @@ target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
   DUSK_PSP
   DUSK_INPUT_GAMEPAD
   DUSK_PLATFORM_ENDIAN_LITTLE
-  DUSK_OPENGL_LEGACY
   DUSK_DISPLAY_WIDTH=480
   DUSK_DISPLAY_HEIGHT=272
 )

cmake/toolchains/aarch64-linux-gnu.cmake

@@ -1,29 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR aarch64)
-
-set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
-set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
-set(CMAKE_ASM_COMPILER aarch64-linux-gnu-gcc)
-
-set(CMAKE_SYSROOT /)
-set(CMAKE_C_COMPILER_TARGET aarch64-linux-gnu)
-set(CMAKE_CXX_COMPILER_TARGET aarch64-linux-gnu)
-
-set(CMAKE_FIND_ROOT_PATH
-    /usr/aarch64-linux-gnu
-    /usr/lib/aarch64-linux-gnu
-    /usr/include/aarch64-linux-gnu
-)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-set(ENV{PKG_CONFIG_LIBDIR} "/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig")
-set(ENV{PKG_CONFIG_PATH} "/usr/lib/aarch64-linux-gnu/pkgconfig")
-
-set(CMAKE_PREFIX_PATH "/usr/aarch64-linux-gnu;/usr/lib/aarch64-linux-gnu")
-
-# Optional: helps some Find modules
-set(SDL2_DIR "/usr/lib/aarch64-linux-gnu/cmake/SDL2" CACHE PATH "")

cmake/toolchains/toolchain-aarch64-buildroot.cmake

@@ -0,0 +1,16 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(CMAKE_C_COMPILER aarch64-buildroot-linux-gnu-gcc)
+set(CMAKE_CXX_COMPILER aarch64-buildroot-linux-gnu-g++)
+
+set(CMAKE_SYSROOT /opt/aarch64-buildroot-linux-gnu_sdk-buildroot/aarch64-buildroot-linux-gnu/sysroot)
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT})
+set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/usr/lib/pkgconfig:${CMAKE_SYSROOT}/usr/share/pkgconfig")

docker/knulli/Dockerfile

@@ -1,35 +1,40 @@
-FROM debian:trixie
+FROM debian:bookworm-slim
 ENV DEBIAN_FRONTEND=noninteractive
 WORKDIR /workdir
-RUN dpkg --add-architecture arm64 && \
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-    apt-get update && \
+RUN apt-get -y update && apt-get -y install \
-    apt-get install -y --no-install-recommends \
+  python3-dotenv \
-        crossbuild-essential-arm64 \
+  bc \
-        ca-certificates \
+  bison \
-        pkg-config \
+  build-essential \
-        cmake \
+  bzip2 \
-        make \
+  bzr \
-        ninja-build \
+  cmake \
-        git \
+  cmake-curses-gui \
-        file \
+  cpio \
-        python3 \
+  device-tree-compiler \
-        python3-pip \
+  flex \
-        python3-polib \
+  git \
-        python3-pil \
+  imagemagick \
-        python3-dotenv \
+  libncurses5-dev \
-        python3-pyqt5 \
+  locales \
-        python3-opengl \
+  make \
-        liblua5.4-dev:arm64 \
+  nano \
-        xz-utils:arm64 \
+  p7zip-full \
-        libbz2-dev:arm64 \
+  rsync \
-        zlib1g-dev:arm64 \
+  sharutils \
-        libzip-dev:arm64 \
+  scons \
-        libssl-dev:arm64 \
+  tree \
-        libsdl2-dev:arm64 \
+  unzip \
-        liblzma-dev:arm64 \
+  vim \
-        libopengl0:arm64 \
+  wget \
-        libgl1:arm64 \
+  zip \
-        libegl1:arm64 \
+  python3 \
-        libgles2:arm64 \
+  python3-pip \
-        libgl1-mesa-dev:arm64 && \
+  python3-polib \
-    rm -rf /var/lib/apt/lists/*
+  python3-pil \
+  gcc-aarch64-linux-gnu \
+  g++-aarch64-linux-gnu \
+  && apt clean
+VOLUME ["/workdir"]
+CMD ["/bin/bash"]

scripts/build-knulli-docker.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-docker build -t dusk-knulli -f docker/knulli/Dockerfile .
+docker build --no-cache -t dusk-knulli -f docker/knulli/Dockerfile .
 docker run --rm -v $(pwd):/workdir dusk-knulli /bin/bash -c "./scripts/build-knulli.sh" 

scripts/build-knulli.sh

@@ -1,24 +1,15 @@
 #!/bin/bash
-cmake -S . -B build-knulli -G Ninja \
+git clone --depth 1 --branch SDL2 https://github.com/libsdl-org/SDL.git /tmp/SDL2 && \
-  -DDUSK_BUILD_TESTS=ON \
+  cmake -S /tmp/SDL2 -B /tmp/SDL2/build \
-  -DDUSK_TARGET_SYSTEM=knulli \
+    -DCMAKE_TOOLCHAIN_FILE=/workdir/toolchain-aarch64-buildroot.cmake \
-  -DCMAKE_TOOLCHAIN_FILE=./cmake/toolchains/aarch64-linux-gnu.cmake \
+    -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX="$SYSROOT/usr" && \
-cmake --build build-knulli -- -j$(nproc)
+  cmake --build /tmp/SDL2/build -j"$(nproc)" && \
+  cmake --install /tmp/SDL2/build
 
-# Copy necessary libs out
+cmake -S . \
-mkdir -p ./build-knulli/dusk
+  -B build-knulli \
-cp ./build-knulli/Dusk ./build-knulli/dusk/Dusk
+  -DDUSK_BUILD_TESTS=ON \
-cp ./build-knulli/dusk.dsk ./build-knulli/dusk/dusk.dsk
+  -DDUSK_TARGET_SYSTEM=linux \
-echo '#!/bin/bash' > build-knulli/dusk/Dusk.sh
+  -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/toolchain-aarch64-buildroot.cmake
-echo 'cd "$(dirname "$(readlink -f "$0")")"' >> build-knulli/dusk/Dusk.sh
+cmake --build build-knulli -- -j$(nproc)
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(dirname "$(readlink -f "$0")")' >> build-knulli/dusk/Dusk.sh
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/gl4es' >> build-knulli/dusk/Dusk.sh
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib' >> build-knulli/dusk/Dusk.sh
-echo '$(dirname "$(readlink -f "$0")")/Dusk' >> build-knulli/dusk/Dusk.sh
-chmod +x build-knulli/dusk/Dusk.sh
-cp /usr/lib/aarch64-linux-gnu/liblua5.4.so.0 build-knulli/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libSDL2-2.0.so.0 build-knulli/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libGL.so.1 build-knulli/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libEGL.so.1 build-knulli/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libGLESv2.so.2 build-knulli/dusk/

src/CMakeLists.txt

@@ -4,10 +4,8 @@
 # https://opensource.org/licenses/MIT
 
 add_subdirectory(dusk)
-# add_subdirectory(duskrpg)
-add_subdirectory(dusktrivia)
 
-if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
+if(DUSK_TARGET_SYSTEM STREQUAL "linux")
   add_subdirectory(dusklinux)
   add_subdirectory(dusksdl2)
   add_subdirectory(duskgl)

src/dusk/CMakeLists.txt

@@ -14,24 +14,6 @@ if(NOT libzip_FOUND)
   target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC zip)
 endif()
 
-if(NOT stb_image_FOUND)
-  find_package(stb REQUIRED)
-  if(STB_IMAGE_FOUND)
-    target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC stb_image)
-  else()
-    message(FATAL_ERROR "stb_image not found. Please ensure stb is correctly fetched.")
-  endif()
-endif()
-
-if(NOT yyjson_FOUND)
-  find_package(yyjson REQUIRED)
-  if(yyjson_FOUND)
-    target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC yyjson::yyjson)
-  else()
-    message(FATAL_ERROR "yyjson not found. Please ensure yyjson is correctly fetched.")
-  endif()
-endif()
-
 if(NOT Lua_FOUND)
   find_package(Lua REQUIRED)
   if(Lua_FOUND AND NOT TARGET Lua::Lua)
@@ -70,9 +52,12 @@ add_subdirectory(engine)
 add_subdirectory(error)
 add_subdirectory(event)
 add_subdirectory(input)
+add_subdirectory(item)
 add_subdirectory(locale)
+add_subdirectory(map)
 add_subdirectory(scene)
 add_subdirectory(script)
+add_subdirectory(story)
 add_subdirectory(time)
 add_subdirectory(ui)
 add_subdirectory(util)

src/dusk/assert/assert.c

@@ -7,7 +7,6 @@
 
 #include "assert.h"
 #include "log/log.h"
-#include "util/string.h"
 
 #ifndef DUSK_ASSERTIONS_FAKED
   #ifdef DUSK_TEST_ASSERT
@@ -99,14 +98,4 @@
   ) {
     assertUnreachableImpl(file, line, message);
   }
-
-  void assertStringEqualImpl(
-    const char *file,
-    const int32_t line,
-    const char *a,
-    const char *b,
-    const char *message
-  ) {
-    assertTrueImpl(file, line, stringCompare(a, b) == 0, message);
-  }
 #endif

src/dusk/assert/assert.h

@@ -104,23 +104,6 @@
     const char *message
   );
 
-  /**
-   * Asserts two strings to be equal.
-   * 
-   * @param file File that the assertion is being made from.
-   * @param line Line that the assertion is being made from.
-   * @param a First string to compare.
-   * @param b Second string to compare.
-   * @param message Message to throw against assertion failure.
-   */
-  void assertStringEqualImpl(
-    const char *file,
-    const int32_t line,
-    const char *a,
-    const char *b,
-    const char *message
-  );
-
   /**
    * Asserts a given value to be true.
    * 
@@ -195,16 +178,6 @@
   #define assertStrLenMin(str, len, message) \
     assertTrue(strlen(str) >= len, message)
 
-  /**
-   * Asserts two strings to be equal.
-   *
-   * @param a First string to compare.
-   * @param b Second string to compare.
-   * @param message Message to throw against assertion failure.
-   */
-  #define assertStringEqual(a, b, message) \
-    assertStringEqualImpl(__FILE__, __LINE__, a, b, message)
-
 #else
   // If assertions are faked, we define the macros to do nothing.
   #define assertTrue(x, message) ((void)0)

src/dusk/asset/CMakeLists.txt

@@ -7,8 +7,7 @@
 target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
     asset.c
-    assetfile.c
 )
 
 # Subdirs
-add_subdirectory(loader)
+add_subdirectory(type)

src/dusk/asset/asset.c

@@ -9,6 +9,7 @@
 #include "util/memory.h"
 #include "util/string.h"
 #include "assert/assert.h"
+#include "asset/assettype.h"
 #include "engine/engine.h"
 #include "util/string.h"
 
@@ -32,20 +33,107 @@ bool_t assetFileExists(const char_t *filename) {
   return true;
 }
 
-errorret_t assetLoad(
+errorret_t assetLoad(const char_t *filename, void *output) {
-  const char_t *filename,
-  assetfileloader_t loader,
-  void *params,
-  void *output
-) {
   assertStrLenMax(filename, FILENAME_MAX, "Filename too long.");
   assertNotNull(output, "Output pointer cannot be NULL.");
-  assertNotNull(loader, "Asset file loader cannot be NULL.");
 
-  assetfile_t file;
+  // Determine the asset type by reading the extension
-  errorChain(assetFileInit(&file, filename, params, output));
+  const assettypedef_t *def = NULL;
-  errorChain(loader(&file));
+  for(uint_fast8_t i = 0; i < ASSET_TYPE_COUNT; i++) {
-  errorChain(assetFileDispose(&file));
+    const assettypedef_t *cmp = &ASSET_TYPE_DEFINITIONS[i];
+    assertNotNull(cmp, "Asset type definition cannot be NULL.");
+    if(cmp->extension == NULL) continue;
+    if(!stringEndsWithCaseInsensitive(filename, cmp->extension)) continue;
+    def = cmp;
+    break;
+  }
+  if(def == NULL) {
+    errorThrow("Unknown asset type for file: %s", filename);
+  }
+
+  // Get file size of the asset.
+  zip_stat_t st;
+  zip_stat_init(&st);
+  if(!zip_stat(ASSET.zip, filename, 0, &st) == 0) {
+    errorThrow("Failed to stat asset file: %s", filename);
+  }
+
+  // Minimum file size.
+  zip_int64_t fileSize = (zip_int64_t)st.size;
+  if(fileSize <= 0) {
+    errorThrow("Asset file is empty: %s", filename);
+  }
+
+  // Try to open the file
+  zip_file_t *file = zip_fopen(ASSET.zip, filename, 0);
+  if(file == NULL) {
+    errorThrow("Failed to open asset file: %s", filename);
+  }
+
+  // Load the asset data
+  switch(def->loadStrategy) {
+    case ASSET_LOAD_STRAT_ENTIRE:
+      assertNotNull(def->entire, "Asset load function cannot be NULL.");
+
+      // Must have more to read
+      if(fileSize <= 0) {
+        zip_fclose(file);
+        errorThrow("No data remaining to read for asset: %s", filename);
+      }
+
+      if(fileSize > def->dataSize) {
+        zip_fclose(file);
+        errorThrow(
+          "Asset file has too much data remaining after header: %s",
+          filename
+        );
+      }
+
+      // Create space to read the entire asset data
+      void *data = memoryAllocate(fileSize);
+      if(!data) {
+        zip_fclose(file);
+        errorThrow(
+          "Failed to allocate memory for asset data of file: %s", filename
+        );
+      }
+
+      // Read in the asset data.
+      zip_int64_t bytesRead = zip_fread(file, data, fileSize);
+      if(bytesRead == 0 || bytesRead > fileSize) {
+        memoryFree(data);
+        zip_fclose(file);
+        errorThrow("Failed to read asset data for file: %s", filename);
+      }
+      fileSize -= bytesRead;
+      
+      // Close the file now we have the data
+      zip_fclose(file);
+
+      // Pass to the asset type loader
+      assetentire_t entire = {
+        .data = data,
+        .output = output
+      };
+      errorret_t ret = def->entire(entire);
+      memoryFree(data);
+
+      errorChain(ret);
+      break;
+
+    case ASSET_LOAD_STRAT_CUSTOM:
+      assertNotNull(def->custom, "Asset load function cannot be NULL.");
+      assetcustom_t customData = {
+        .zipFile = file,
+        .output = output
+      };
+      errorChain(def->custom(customData));
+      break;
+
+    default:
+      assertUnreachable("Unknown asset load strategy.");
+  }
+
   errorOk();
 }
 

src/dusk/asset/asset.h

@@ -7,8 +7,8 @@
 
 #pragma once
 #include "error/error.h"
+#include "assettype.h"
 #include "asset/assetplatform.h"
-#include "assetfile.h"
 
 #ifndef assetInitPlatform
   #error "Platform must define assetInitPlatform function."
@@ -20,7 +20,7 @@
 #define ASSET_FILE_NAME "dusk.dsk"
 #define ASSET_HEADER_SIZE 3
 
-typedef struct asset_s {
+typedef struct {
   zip_t *zip;
   assetplatform_t platform;
 } asset_t;
@@ -41,20 +41,13 @@ errorret_t assetInit(void);
 bool_t assetFileExists(const char_t *filename);
 
 /**
- * Loads an asset by its filename,
+ * Loads an asset by its filename, the output type depends on the asset type.
  * 
  * @param filename The filename of the asset to retrieve.
- * @param loader Loader to use for loading the asset file.
- * @param params Parameters to pass to the loader.
  * @param output The output pointer to store the loaded asset data.
  * @return An error code if the asset could not be loaded.
  */
-errorret_t assetLoad(
+errorret_t assetLoad(const char_t *filename, void *output);
-  const char_t *filename,
-  assetfileloader_t loader,
-  void *params,
-  void *output
-);
 
 /**
  * Disposes/cleans up the asset system.

src/dusk/asset/assetfile.c

@@ -1,309 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "asset/asset.h"
-#include "assert/assert.h"
-#include "util/memory.h"
-
-errorret_t assetFileInit(
-  assetfile_t *file,
-  const char_t *filename,
-  void *params,
-  void *output
-) {
-  memoryZero(file, sizeof(assetfile_t));
-
-  file->filename = filename;
-  file->params = params;
-  file->output = output;
-
-  // Stat the file
-  zip_stat_init(&file->stat);
-  if(!zip_stat(ASSET.zip, filename, 0, &file->stat) == 0) {
-    errorThrow("Failed to stat asset file: %s", filename);
-  }
-
-  // Minimum file size.
-  file->size = (zip_int64_t)file->stat.size;
-  if(file->size <= 0) {
-    errorThrow("Invalid asset file size: %s", filename);
-  }
-
-  errorOk();
-}
-
-errorret_t assetFileRewind(assetfile_t *file) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(file->zipFile, "Asset file must be opened before rewinding.");
-
-  if(file->position == 0) {
-    errorOk();
-  }
-
-  errorChain(assetFileClose(file));
-  errorChain(assetFileOpen(file));
-  errorOk();
-}
-
-errorret_t assetFileOpen(assetfile_t *file) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(file->filename, "Asset file filename cannot be NULL.");
-  assertNotNull(ASSET.zip, "Asset zip cannot be NULL.");
-  assertNull(file->zipFile, "Asset file already open.");
-
-  file->zipFile = zip_fopen(ASSET.zip, file->filename, 0);
-  if(file->zipFile == NULL) {
-    errorThrow("Failed to open asset file: %s", file->filename);
-  }
-  file->position = 0;
-  errorOk();
-}
-
-errorret_t assetFileRead(
-  assetfile_t *file,
-  void *buffer,
-  const size_t bufferSize
-) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(file->zipFile, "Asset file must be opened before reading.");
-
-  // I assume zip_fread takes buffer NULL for skipping?
-  zip_int64_t bytesRead = zip_fread(file->zipFile, buffer, bufferSize);
-  if(bytesRead < 0) {
-    errorThrow("Failed to read from asset file: %s", file->filename);
-  }
-  file->position += bytesRead;
-  file->lastRead = bytesRead;
-  errorOk();
-}
-
-errorret_t assetFileClose(assetfile_t *file) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(file->zipFile, "Asset file must be opened before closing.");
-
-  if(zip_fclose(file->zipFile) != 0) {
-    errorThrow("Failed to close asset file: %s", file->filename);
-  }
-  file->zipFile = NULL;
-  file->position = 0;
-  errorOk();
-}
-
-errorret_t assetFileDispose(assetfile_t *file) {
-  if(file->zipFile != NULL) {
-    errorChain(assetFileClose(file));
-  }
-  memoryZero(file, sizeof(assetfile_t));
-  errorOk();
-}
-
-// Line Reader;
-void assetFileLineReaderInit(
-  assetfilelinereader_t *reader,
-  assetfile_t *file,
-  uint8_t *readBuffer,
-  const size_t readBufferSize,
-  uint8_t *outBuffer,
-  const size_t outBufferSize
-) {
-  assertNotNull(reader, "Line reader cannot be NULL.");
-  assertNotNull(file, " File cannot be NULL.");
-  assertNotNull(readBuffer, "Read buffer cannot be NULL.");
-  assertNotNull(outBuffer, "Output buffer cannot be NULL.");
-  assertTrue(readBufferSize > 0, "Read buffer size must be greater than 0.");
-  assertTrue(outBufferSize > 0, "Output buffer size must be greater than 0.");
-  
-  memoryZero(reader, sizeof(assetfilelinereader_t));
-
-  reader->file = file;
-  reader->readBuffer = readBuffer;
-  reader->readBufferSize = readBufferSize;
-  reader->outBuffer = outBuffer;
-  reader->outBufferSize = outBufferSize;
-}
-
-size_t assetFileLineReaderUnreadBytes(const assetfilelinereader_t *reader) {
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertTrue(reader->bufferEnd >= reader->bufferStart, "Invalid buffer state.");
-  return reader->bufferEnd - reader->bufferStart;
-}
-
-const uint8_t *assetFileLineReaderUnreadPtr(const assetfilelinereader_t *reader) {
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertNotNull(reader->readBuffer, "Read buffer cannot be NULL.");
-  return reader->readBuffer + reader->bufferStart;
-}
-
-static errorret_t assetFileLineReaderAppend(
-  assetfilelinereader_t *reader,
-  const uint8_t *src,
-  size_t srcLength
-) {
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertNotNull(reader->outBuffer, "Out buffer cannot be NULL.");
-
-  if(srcLength == 0) {
-    errorOk();
-  }
-
-  /* reserve room for optional NUL terminator */
-  if (reader->lineLength + srcLength >= reader->outBufferSize) {
-    errorThrow("Line length exceeds output buffer size.");
-  }
-
-  memoryCopy(reader->outBuffer + reader->lineLength, src, srcLength);
-  reader->lineLength += srcLength;
-  errorOk();
-}
-
-static void assetFileLineReaderTerminate(assetfilelinereader_t *reader) {
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertNotNull(reader->outBuffer, "Out buffer cannot be NULL.");
-  assertTrue(reader->lineLength < reader->outBufferSize, "Line length exceeds out buffer.");
-  reader->outBuffer[reader->lineLength] = '\0';
-}
-
-static ssize_t assetFileLineReaderFindNewline(const assetfilelinereader_t *reader) {
-  size_t i;
-
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertNotNull(reader->readBuffer, "Read buffer cannot be NULL.");
-
-  for (i = reader->bufferStart; i < reader->bufferEnd; ++i) {
-    if (reader->readBuffer[i] == '\n') {
-      return (ssize_t)i;
-    }
-  }
-
-  return -1;
-}
-
-errorret_t assetFileLineReaderFill(assetfilelinereader_t *reader) {
-
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertNotNull(reader->file, "File cannot be NULL.");
-  assertNotNull(reader->readBuffer, "Read buffer cannot be NULL.");
-
-  if(reader->eof) errorOk();
-
-  errorret_t ret;
-
-  size_t unreadBytes = assetFileLineReaderUnreadBytes(reader);
-
-  /* If buffer is fully consumed, refill from start. */
-  if (unreadBytes == 0) {
-    reader->bufferStart = 0;
-    reader->bufferEnd = 0;
-
-    errorChain(assetFileRead(
-      reader->file,
-      reader->readBuffer,
-      reader->readBufferSize
-    ));
-
-    if(reader->file->lastRead == 0) {
-      reader->eof = true;
-      errorOk();
-    }
-
-    reader->bufferStart = 0;
-    reader->bufferEnd = reader->file->lastRead;
-    errorOk();
-  }
-
-  /*
-   * There are unread bytes left but no newline in them.
-   * If bufferStart > 0, slide unread bytes to front so we can read more.
-   * This only happens when necessary to make space.
-   */
-  if(reader->bufferEnd == reader->readBufferSize) {
-    if(reader->bufferStart == 0) {
-      /*
-       * Entire read buffer is unread and contains no newline.
-       * Caller must have a large enough outBuffer to accumulate across fills,
-       * so we consume these bytes into outBuffer before refilling.
-       */
-      errorOk();
-    }
-
-    memoryMove(
-      reader->readBuffer,
-      reader->readBuffer + reader->bufferStart,
-      unreadBytes
-    );
-    reader->bufferStart = 0;
-    reader->bufferEnd = unreadBytes;
-  }
-
-  errorChain(assetFileRead(
-    reader->file,
-    reader->readBuffer + reader->bufferEnd,
-    reader->readBufferSize - reader->bufferEnd
-  ));
-
-  if(reader->file->lastRead == 0) {
-    reader->eof = true;
-    errorOk();
-  }
-
-  reader->bufferEnd += reader->file->lastRead;
-  errorOk();
-}
-
-errorret_t assetFileLineReaderNext(assetfilelinereader_t *reader) {
-  assertNotNull(reader, "Reader cannot be NULL.");
-  assertNotNull(reader->file, "File cannot be NULL.");
-  assertNotNull(reader->readBuffer, "Read buffer cannot be NULL.");
-  assertNotNull(reader->outBuffer, "Out buffer cannot be NULL.");
-
-  reader->lineLength = 0;
-
-  for (;;) {
-    ssize_t newlineIndex = assetFileLineReaderFindNewline(reader);
-
-    if (newlineIndex >= 0) {
-      size_t chunkLength = (size_t)newlineIndex - reader->bufferStart;
-      errorret_t ret;
-
-      /* strip CR in CRLF */
-      if (chunkLength > 0 && reader->readBuffer[(size_t)newlineIndex - 1] == '\r') {
-        chunkLength--;
-      }
-
-      errorChain(assetFileLineReaderAppend(
-        reader,
-        reader->readBuffer + reader->bufferStart,
-        chunkLength
-      ));
-      
-      reader->bufferStart = (size_t)newlineIndex + 1;
-      assetFileLineReaderTerminate(reader);
-      errorOk();
-    }
-
-    if (assetFileLineReaderUnreadBytes(reader) > 0) {
-      errorChain(assetFileLineReaderAppend(
-        reader,
-        assetFileLineReaderUnreadPtr(reader),
-        assetFileLineReaderUnreadBytes(reader)
-      ));
-
-      reader->bufferStart = reader->bufferEnd;
-    }
-
-    if(reader->eof) {
-      if(reader->lineLength > 0) {
-        assetFileLineReaderTerminate(reader);
-        errorOk();
-      }
-
-      errorThrow("End of file reached.");
-    }
-
-    errorChain(assetFileLineReaderFill(reader));
-  }
-}

src/dusk/asset/assetfile.h

@@ -1,138 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "error/error.h"
-#include <zip.h>
-
-typedef struct assetfile_s assetfile_t;
-
-typedef errorret_t (*assetfileloader_t)(assetfile_t *file);
-
-typedef struct assetfile_s {
-  const char_t *filename;
-  void *params;
-  void *output;
-
-  zip_stat_t stat;
-  zip_int64_t size;
-  zip_int64_t position;
-  zip_int64_t lastRead;
-  zip_file_t *zipFile;
-} assetfile_t;
-
-/**
- * Initializes the asset file structure in preparation for loading. This will
- * stat the file but not open the handle.
- * 
- * @param file The asset file structure to initialize.
- * @param filename The name of the asset file to load.
- * @param params Optional loader params.
- * @param output Output pointer for the loader.
- * @return Error indicating success or failure.
- */
-errorret_t assetFileInit(
-  assetfile_t *file,
-  const char_t *filename,
-  void *params,
-  void *output
-);
-
-/**
- * Opens the asset file for reading. After opening the loader is responsible
- * for closing the file.
- * 
- * @param file The asset file to open.
- * @return An error code if the file could not be opened.
- */
-errorret_t assetFileOpen(assetfile_t *file);
-
-/**
- * Rewind the file to the initial position.
- * 
- * @param file The asset file to rewind.
- */
-errorret_t assetFileRewind(assetfile_t *file);
-
-/**
- * Read bytes from the asset file. Assumes the file has already been opened
- * prior to trying to read anything.
- * 
- * @param file File to read from.
- * @param buffer Buffer to read the file data into., or NULL to skip bytes.
- * @param size Size of the buffer to read into.
- */
-errorret_t assetFileRead(
-  assetfile_t *file,
-  void *buffer,
-  const size_t bufferSize
-);
-
-/**
- * Closes the asset file and releases any resources associated with it.
- * 
- * @param file The asset file to close.
- * @return An error code if the file could not be closed properly.
- */
-errorret_t assetFileClose(assetfile_t *file);
-
-/**
- * Disposes the asset file structure, closing any open handles and zeroing
- * out the structure.
- * 
- * @param file The asset file to dispose.
- * @return An error code if the file could not be disposed properly.
- */
-errorret_t assetFileDispose(assetfile_t *file);
-
-typedef struct {
-  assetfile_t *file;
-  uint8_t *readBuffer;
-  size_t readBufferSize;
-  uint8_t *outBuffer;
-  size_t outBufferSize;
-
-  // A
-  size_t bufferStart;
-  size_t bufferEnd;
-  bool_t eof;//?
-
-  // Updated each reach:
-  size_t lineLength;
-} assetfilelinereader_t;
-
-/**
- * Initializes a line reader for the given asset file. The line reader will read
- * lines from the file into the provided line buffer, using the provided buffer
- * for reading chunks of the file.
- * 
- * @param file The asset file to read from. Must already be opened.
- * @param readBuffer Buffer to use for reading chunks of the file.
- * @param readBufferSize Size of the read buffer.
- * @param outBuffer Buffer to read lines into. Lines will be null-terminated.
- * @param outBufferSize Size of the output buffer.
- * @return An initialized line reader structure.
- */
-void assetFileLineReaderInit(
-  assetfilelinereader_t *reader,
-  assetfile_t *file,
-  uint8_t *readBuffer,
-  const size_t readBufferSize,
-  uint8_t *outBuffer,
-  const size_t outBufferSize
-);
-
-/**
- * Reads the next line from the asset file into the line buffer. The line
- * buffer is null-terminated and does not include the newline character.
- * 
- * @param reader The line reader to read from.
- * @return An error code if a failure occurs, or errorOk() if a line was read
- *         successfully. If the end of the file is reached, errorEndOfFile() is
- *         returned.
- */
-errorret_t assetFileLineReaderNext(assetfilelinereader_t *reader);

src/dusk/asset/assettype.h

@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "type/assettexture.h"
+// #include "type/assetpalette.h"
+#include "type/assettileset.h"
+#include "type/assetlanguage.h"
+#include "type/assetscript.h"
+#include "type/assetmap.h"
+#include "type/assetmapchunk.h"
+#include <zip.h>
+
+typedef enum {
+  ASSET_TYPE_NULL,
+  
+  ASSET_TYPE_TEXTURE,
+  // ASSET_TYPE_PALETTE,
+  ASSET_TYPE_TILESET,
+  ASSET_TYPE_LANGUAGE,
+  ASSET_TYPE_SCRIPT,
+  ASSET_TYPE_MAP,
+  ASSET_TYPE_MAP_CHUNK,
+
+  ASSET_TYPE_COUNT,
+} assettype_t;
+
+typedef enum {
+  ASSET_LOAD_STRAT_ENTIRE,
+  ASSET_LOAD_STRAT_CUSTOM
+} assetloadstrat_t;
+
+typedef struct assetentire_s {
+  void *data;
+  void *output;
+} assetentire_t;
+
+typedef struct assetcustom_s {
+  zip_file_t *zipFile;
+  void *output;
+} assetcustom_t;
+
+typedef struct {
+  const char_t *extension;
+  const size_t dataSize;
+  const assetloadstrat_t loadStrategy;
+  union {
+    errorret_t (*entire)(assetentire_t entire);
+    errorret_t (*custom)(assetcustom_t custom);
+  };
+} assettypedef_t;
+
+static const assettypedef_t ASSET_TYPE_DEFINITIONS[ASSET_TYPE_COUNT] = {
+  [ASSET_TYPE_NULL] = {
+    0
+  },
+
+  [ASSET_TYPE_TEXTURE] = {
+    .extension = "dpt",
+    .loadStrategy = ASSET_LOAD_STRAT_ENTIRE,
+    .dataSize = sizeof(assettexture_t),
+    .entire = assetTextureLoad
+  },
+
+  // [ASSET_TYPE_PALETTE] = {
+  //   .extension = "dpf",
+  //   .loadStrategy = ASSET_LOAD_STRAT_ENTIRE,
+  //   .dataSize = sizeof(palette_t),
+  //   .entire = assetPaletteLoad
+  // },
+
+  [ASSET_TYPE_TILESET] = {
+    .extension = "dtf",
+    .loadStrategy = ASSET_LOAD_STRAT_ENTIRE,
+    .dataSize = sizeof(assettileset_t),
+    .entire = assetTilesetLoad
+  },
+
+  [ASSET_TYPE_LANGUAGE] = {
+    .extension = "DLF",
+    .loadStrategy = ASSET_LOAD_STRAT_CUSTOM,
+    .custom = assetLanguageHandler
+  },
+
+  [ASSET_TYPE_SCRIPT] = {
+    .extension = "lua",
+    .loadStrategy = ASSET_LOAD_STRAT_CUSTOM,
+    .custom = assetScriptHandler
+  },
+
+  // [ASSET_TYPE_MAP] = {
+  //   .extension = "DMF",
+  //   .loadStrategy = ASSET_LOAD_STRAT_CUSTOM,
+  //   .custom = assetMapHandler
+  // },
+
+  // [ASSET_TYPE_MAP_CHUNK] = {
+  //   .extension = "DMC",
+  //   .loadStrategy = ASSET_LOAD_STRAT_CUSTOM,
+  //   .custom = assetMapChunkHandler
+  // },
+};

src/dusk/asset/loader/CMakeLists.txt

@@ -1,12 +0,0 @@
-# Copyright (c) 2026 Dominic Masters
-# 
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-# Sources
-
-# Subdirs
-add_subdirectory(display)
-add_subdirectory(locale)
-add_subdirectory(script)
-add_subdirectory(json)

src/dusk/asset/loader/display/CMakeLists.txt

@@ -1,11 +0,0 @@
-# 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
-    assettextureloader.c
-    assettilesetloader.c
-)

src/dusk/asset/loader/display/assettextureloader.c

@@ -1,115 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "assettextureloader.h"
-#include "assert/assert.h"
-#define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
-#include "log/log.h"
-#include "util/endian.h"
-
-stbi_io_callbacks ASSET_TEXTURE_STB_CALLBACKS = {
-  .read = assetTextureReader,
-  .skip = assetTextureSkipper,
-  .eof = assetTextureEOF
-};
-
-int assetTextureReader(void *user, char *data, int size) {
-  assertNotNull(data, "Data buffer for stb_image callbacks cannot be NULL.");
-
-  assetfile_t *file = (assetfile_t*)user;
-  assertNotNull(file, "Asset file in stb_image callbacks cannot be NULL.");
-  
-  errorret_t ret = assetFileRead(file, data, (size_t)size);
-  if(ret.code != ERROR_OK) {
-    errorCatch(errorPrint(ret));
-    return -1;
-  }
-
-  return file->lastRead;
-}
-
-void assetTextureSkipper(void *user, int n) {
-  assetfile_t *file = (assetfile_t*)user;
-  assertNotNull(file, "Asset file in stb_image callbacks cannot be NULL.");
-
-  errorret_t ret = assetFileRead(file, NULL, (size_t)n);
-  if(ret.code != ERROR_OK) {
-    errorCatch(errorPrint(ret));
-  }
-}
-
-int assetTextureEOF(void *user) {
-  assetfile_t *file = (assetfile_t*)user;
-  assertNotNull(file, "Asset file in stb_image callbacks cannot be NULL.");
-
-  return file->position >= file->size;
-}
-
-errorret_t assetTextureLoader(assetfile_t *file) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(file->params, "Asset file parameters cannot be NULL.");
-  assertNotNull(file->output, "Asset file output cannot be NULL.");
-
-  assettextureloaderparams_t *p = (assettextureloaderparams_t*)file->params;
-  assertNotNull(p, "Asset texture loader parameters cannot be NULL.");
-
-  int channelsDesired;
-  switch(p->format) {
-    case TEXTURE_FORMAT_RGBA:
-      channelsDesired = 4;
-      break;
-
-    default:
-      errorThrow("Bad texture format.");
-  }
-
-  int width, height, channels;
-  errorChain(assetFileOpen(file));
-  uint8_t *data = stbi_load_from_callbacks(
-    &ASSET_TEXTURE_STB_CALLBACKS,
-    file,
-    &width,
-    &height,
-    &channels,
-    channelsDesired
-  );
-  errorChain(assetFileClose(file));
-
-  if(data == NULL) {
-    const char_t *errorStr = stbi_failure_reason();
-    errorThrow("Failed to load texture from file %s.", errorStr);
-  }
-
-  // Fixes a specific bug probably with Dolphin but for now just assuming endian
-  if(!isHostLittleEndian()) {
-    stbi__vertical_flip(data, width, height, channelsDesired);
-  }
-
-  errorChain(textureInit(
-    (texture_t*)file->output,
-    (int32_t)width, (int32_t)height,
-    p->format,
-    (texturedata_t){
-      .rgbaColors = (color_t*)data
-    }
-  ));
-
-  stbi_image_free(data);
-  errorOk();
-}
-
-errorret_t assetTextureLoad(
-  const char_t *path,
-  texture_t *out,
-  const textureformat_t format
-) {
-  assettextureloaderparams_t params = {
-    .format = format
-  };
-  return assetLoad(path, assetTextureLoader, &params, out);
-}

src/dusk/asset/loader/display/assettextureloader.h

@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "asset/asset.h"
-#include "display/texture/texture.h"
-
-typedef struct {
-  textureformat_t format;
-} assettextureloaderparams_t;
-
-/**
- * STB image read callback for asset files.
- * 
- * @param user User data passed to the callback, should be an assetfile_t*.
- * @param data Buffer to read the file data into.
- * @param size Size of the buffer to read into.
- * @return Number of bytes read, or -1 on error.
- */
-int assetTextureReader(void *user, char *data, int size);
-
-void assetTextureSkipper(void *user, int n);
-
-int assetTextureEOF(void *user);
-
-/**
- * Handler for texture assets.
- * 
- * @param file Asset file to load the texture from.
- * @return Any error that occurs during loading.
- */
-errorret_t assetTextureLoader(assetfile_t *file);
-
-/**
- * Loads a texture from the specified path.
- * 
- * @param path Path to the texture asset.
- * @param out Output texture to load into.
- * @param format Format of the texture to load.
- * @return Any error that occurs during loading.
- */
-errorret_t assetTextureLoad(
-  const char_t *path,
-  texture_t *out,
-  const textureformat_t format
-);

src/dusk/asset/loader/display/assettilesetloader.c

@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "assettilesetloader.h"
-#include "assert/assert.h"
-#include "util/memory.h"
-#include "util/endian.h"
-
-errorret_t assetTilesetLoader(assetfile_t *file) {
-  assertNotNull(file, "Asset file pointer for tileset loader is null.");
-
-  tileset_t *out = (tileset_t *)file->output;
-  assertNotNull(out, "Output pointer for tileset loader is null.");
-
-  uint8_t *entire = memoryAllocate(file->size);
-  errorChain(assetFileOpen(file));
-  errorChain(assetFileRead(file, entire, file->size));
-  errorChain(assetFileClose(file));
-  assertTrue(file->lastRead == file->size, "Failed to read entire file.");
-
-
-  if(
-    entire[0] != 'D' || 
-    entire[1] != 'T' ||
-    entire[2] != 'F'
-  ) {
-    errorThrow("Invalid tileset header");
-  }
-
-  if(entire[3] != 0x00) {
-    errorThrow("Unsupported tileset version");
-  }
-
-  // Fix endianness
-
-  out->tileWidth = endianLittleToHost16(*(uint16_t *)(entire + 4));
-  out->tileHeight = endianLittleToHost16(*(uint16_t *)(entire + 6));
-  out->columns = endianLittleToHost16(*(uint16_t *)(entire + 8));
-  out->rows = endianLittleToHost16(*(uint16_t *)(entire + 10));
-  // out->right = endianLittleToHost16(*(uint16_t *)(entire + 12));
-  // out->bottom = endianLittleToHost16(*(uint16_t *)(entire + 14));
-
-  if(out->tileWidth == 0) {
-    errorThrow("Tile width cannot be 0");
-  }
-  if(out->tileHeight == 0) {
-    errorThrow("Tile height cannot be 0");
-  }
-  if(out->columns == 0) {
-    errorThrow("Column count cannot be 0");
-  }
-  if(out->rows == 0) {
-    errorThrow("Row count cannot be 0");
-  }
-
-  out->uv[0] = endianLittleToHostFloat(*(float *)(entire + 16));
-  out->uv[1] = endianLittleToHostFloat(*(float *)(entire + 20));
-
-  if(out->uv[1] < 0.0f || out->uv[1] > 1.0f) {
-    errorThrow("Invalid v0 value in tileset");
-  }
-
-  // Setup tileset
-  out->tileCount = out->columns * out->rows;
-
-  memoryFree(entire);
-
-  errorOk();
-}
-
-errorret_t assetTilesetLoad(
-  const char_t *path,
-  tileset_t *out
-) {
-  return assetLoad(path, assetTilesetLoader, NULL, out);
-}

src/dusk/asset/loader/display/assettilesetloader.h

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "asset/asset.h"
-#include "display/texture/tileset.h"
-
-/**
- * Handler for tileset assets.
- * 
- * @param file Asset file to load the tileset from.
- * @return Any error that occurs during loading.
- */
-errorret_t assetTilesetLoader(assetfile_t *file);
-
-/**
- * Loads a tileset from the specified path.
- * 
- * @param path Path to the tileset asset.
- * @param out Output tileset to load into.
- * @return Any error that occurs during loading.
- */
-errorret_t assetTilesetLoad(
-  const char_t *path,
-  tileset_t *out
-);

src/dusk/asset/loader/json/CMakeLists.txt

@@ -1,10 +0,0 @@
-# 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
-    assetjsonloader.c
-)

src/dusk/asset/loader/json/assetjsonloader.c

@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "assetjsonloader.h"
-#include "util/memory.h"
-#include "assert/assert.h"
-
-errorret_t assetJsonLoadFileToDoc(assetfile_t *file, yyjson_doc **outDoc) {
-  assertNotNull(file, "Asset file pointer for JSON loader is null.");
-  assertNotNull(outDoc, "Output pointer for JSON loader is null.");
-
-  if(file->size > ASSET_JSON_FILE_SIZE_MAX) {
-    errorThrow("JSON exceeds maximum allowed size");
-  }
-
-  // Create buffer
-  uint8_t *buffer = memoryAllocate(file->size);
-
-  errorChain(assetFileOpen(file));
-
-  // Read entire file
-  errorChain(assetFileRead(file, buffer, file->size));
-  assertTrue(file->lastRead == file->size, "Failed to read entire JSON file.");
-
-  errorChain(assetFileClose(file));
-
-  *outDoc = yyjson_read(
-    buffer,
-    file->size,
-    YYJSON_READ_ALLOW_COMMENTS | YYJSON_READ_ALLOW_TRAILING_COMMAS
-  );
-  memoryFree(buffer);
-
-  if(!*outDoc) errorThrow("Failed to parse JSON");
-  errorOk();
-}
-
-errorret_t assetJsonLoader(assetfile_t *file) {
-  yyjson_doc **outDoc = (yyjson_doc **)file->output;
-  assertNotNull(outDoc, "Output pointer for JSON loader is null.");
-  return assetJsonLoadFileToDoc(file, outDoc);
-}
-
-errorret_t assetJsonLoad(
-  const char_t *path,
-  yyjson_doc **outDoc
-) {
-  return assetLoad(path, assetJsonLoader, NULL, outDoc);
-}

src/dusk/asset/loader/json/assetjsonloader.h

@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "asset/asset.h"
-#include "yyjson.h"
-
-#define ASSET_JSON_FILE_SIZE_MAX 1024*256
-
-typedef struct {
-  void *nothing;
-} assetjsonloaderparams_t;
-
-/**
- * Loads a JSON document from the specified asset file.
- * 
- * @param file Asset file to load the JSON document from.
- * @param outDoc Pointer to store the loaded JSON document.
- * @return Any error that occurs during loading.
- */
-errorret_t assetJsonLoadFileToDoc(assetfile_t *file, yyjson_doc **outDoc);
-
-/**
- * Handler for locale assets.
- * 
- * @param file Asset file to load the locale from.
- * @return Any error that occurs during loading.
- */
-errorret_t assetJsonLoader(assetfile_t *file);
-
-/**
- * Loads a locale from the specified path.
- * 
- * @param path Path to the locale asset.
- * @param outDoc Pointer to store the loaded JSON document.
- * @return Any error that occurs during loading.
- */
-errorret_t assetJsonLoad(
-  const char_t *path,
-  yyjson_doc **outDoc
-);

src/dusk/asset/loader/locale/CMakeLists.txt

@@ -1,10 +0,0 @@
-# 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
-    assetlocaleloader.c
-)

src/dusk/asset/loader/locale/assetlocaleloader.c

@@ -1,807 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "assetlocaleloader.h"
-#include "util/memory.h"
-#include "util/math.h"
-#include "util/string.h"
-#include "assert/assert.h"
-
-errorret_t assetLocaleFileInit(
-  assetlocalefile_t *localeFile,
-  const char_t *path
-) {
-  assertNotNull(localeFile, "Locale file cannot be NULL.");
-  assertNotNull(path, "Locale file path cannot be NULL.");
-  
-  memoryZero(localeFile, sizeof(assetlocalefile_t));
-
-  // Init the asset file.
-  errorChain(assetFileInit(&localeFile->file, path, NULL, NULL));
-
-  // Open the file handle
-  errorChain(assetFileOpen(&localeFile->file));
-
-  // Get the blank key, this is basically the header info for po files
-  char_t buffer[1024];
-  errorChain(assetLocaleGetString(localeFile, "", 0, buffer, sizeof(buffer)));
-  errorChain(assetLocaleParseHeader(localeFile, buffer, sizeof(buffer)));
-
-  errorOk();
-}
-
-errorret_t assetLocaleFileDispose(assetlocalefile_t *localeFile) {
-  assertNotNull(localeFile, "Locale file cannot be NULL.");
-
-  errorChain(assetFileClose(&localeFile->file));
-  errorChain(assetFileDispose(&localeFile->file));
-
-  errorOk();
-}
-
-errorret_t assetLocaleParseHeader(
-  assetlocalefile_t *localeFile,
-  char_t *headerBuffer,
-  const size_t headerBufferSize
-) {
-  assertNotNull(localeFile, "Locale file cannot be NULL.");
-  assertNotNull(headerBuffer, "Header buffer cannot be NULL.");
-  assertTrue(headerBufferSize > 0, "Header buffer size must be > 0.");
-
-  // Find "Plural-Forms: " line and parse out plural form info
-  char_t *pluralFormsLine = strstr(headerBuffer, "Plural-Forms:");
-  if(!pluralFormsLine) {
-    errorOk();
-  }
-
-  pluralFormsLine += strlen("Plural-Forms:");
-
-  // Expect nplurals
-  char_t *npluralsStr = strstr(pluralFormsLine, "nplurals=");
-  if(!npluralsStr) {
-    errorThrow("Failed to find nplurals in Plural-Forms header.");
-  }
-  npluralsStr += strlen("nplurals=");
-  localeFile->pluralStateCount = (uint8_t)atoi(npluralsStr);
-
-  if(localeFile->pluralStateCount == 0) {
-    errorThrow("nplurals must be greater than 0.");
-  }
-  if(localeFile->pluralStateCount > ASSET_LOCALE_FILE_PLURAL_FORM_COUNT) {
-    errorThrow(
-      "nplurals exceeds maximum supported plural forms: %d > %d",
-      localeFile->pluralStateCount,
-      ASSET_LOCALE_FILE_PLURAL_FORM_COUNT
-    );
-  }
-
-  // Expect plural=
-  char_t *pluralStr = strstr(pluralFormsLine, "plural=");
-  if(!pluralStr) {
-    errorThrow("Failed to find plural in Plural-Forms header.");
-  }
-  pluralStr += strlen("plural=");
-
-  // Expect ( [expressions] )
-  char_t *openParen = strchr(pluralStr, '(');
-  char_t *closeParen = strrchr(pluralStr, ')');
-  if(!openParen || !closeParen || closeParen < openParen) {
-    errorThrow("Failed to find plural expression in Plural-Forms header.");
-  }
-
-  // Parse:
-  // n [op] value ? index : n [op] value ? index : ... : final_index
-  char_t *ptr = openParen + 1;
-  uint8_t pluralIndex = 0;
-  uint8_t definedCount = 0;
-
-  while(1) {
-    while(*ptr == ' ') ptr++;
-
-    // Allow grouped subexpressions like:
-    //   (n<7 ? 2 : 3)
-    // or
-    //   (((3)))
-    uint8_t parenDepth = 0;
-    while(*ptr == '(') {
-      parenDepth++;
-      ptr++;
-      while(*ptr == ' ') ptr++;
-    }
-
-    // Final fallback: just an integer
-    if(*ptr != 'n') {
-      char_t *endPtr = NULL;
-      int32_t finalIndex = (int32_t)strtol(ptr, &endPtr, 10);
-      if(endPtr == ptr) {
-        errorThrow("Expected final plural index.");
-      }
-      ptr = endPtr;
-
-      while(*ptr == ' ') ptr++;
-      while(parenDepth > 0) {
-        if(*ptr != ')') {
-          errorThrow("Expected ')' after final plural index.");
-        }
-        ptr++;
-        parenDepth--;
-
-        while(*ptr == ' ') ptr++;
-      }
-
-      if(*ptr != ')') {
-        errorThrow("Expected ')' at end of plural expression.");
-      }
-
-      if(finalIndex < 0 || finalIndex >= localeFile->pluralStateCount) {
-        errorThrow(
-          "Final plural expression index out of bounds: %d (nplurals: %d)",
-          finalIndex,
-          localeFile->pluralStateCount
-        );
-      }
-
-      localeFile->pluralDefaultIndex = (uint8_t)finalIndex;
-      definedCount++;
-      break;
-    }
-
-    if(pluralIndex >= localeFile->pluralStateCount - 1) {
-      errorThrow(
-        "Too many plural conditions. Expected %d conditional clauses for nplurals=%d.",
-        localeFile->pluralStateCount - 1,
-        localeFile->pluralStateCount
-      );
-    }
-
-    ptr++; // skip 'n'
-
-    while(*ptr == ' ') ptr++;
-
-    // Determine operator
-    assetlocalepluraloperation_t op;
-    if(strncmp(ptr, "==", 2) == 0) {
-      op = ASSET_LOCALE_PLURAL_OP_EQUAL;
-      ptr += 2;
-    } else if(strncmp(ptr, "!=", 2) == 0) {
-      op = ASSET_LOCALE_PLURAL_OP_NOT_EQUAL;
-      ptr += 2;
-    } else if(strncmp(ptr, "<=", 2) == 0) {
-      op = ASSET_LOCALE_PLURAL_OP_LESS_EQUAL;
-      ptr += 2;
-    } else if(strncmp(ptr, ">=", 2) == 0) {
-      op = ASSET_LOCALE_PLURAL_OP_GREATER_EQUAL;
-      ptr += 2;
-    } else if(*ptr == '<') {
-      op = ASSET_LOCALE_PLURAL_OP_LESS;
-      ptr++;
-    } else if(*ptr == '>') {
-      op = ASSET_LOCALE_PLURAL_OP_GREATER;
-      ptr++;
-    } else {
-      errorThrow("Unsupported plural operator.");
-    }
-
-    while(*ptr == ' ') ptr++;
-
-    // Parse the comparitor value
-    char_t *endPtr = NULL;
-    int32_t value = (int32_t)strtol(ptr, &endPtr, 10);
-    if(endPtr == ptr) {
-      errorThrow("Expected value for plural expression.");
-    }
-    ptr = endPtr;
-
-    while(*ptr == ' ') ptr++;
-
-    // Parse ternary operator
-    if(*ptr != '?') {
-      errorThrow("Expected '?' after plural expression.");
-    }
-    ptr++;
-
-    while(*ptr == ' ') ptr++;
-
-    // Parse the indice
-    endPtr = NULL;
-    int32_t index = (int32_t)strtol(ptr, &endPtr, 10);
-    if(endPtr == ptr) {
-      errorThrow("Expected index for plural expression.");
-    }
-    ptr = endPtr;
-
-    if(index < 0 || index >= localeFile->pluralStateCount) {
-      errorThrow(
-        "Plural expression index out of bounds: %d (nplurals: %d)",
-        index,
-        localeFile->pluralStateCount
-      );
-    }
-
-    // Store plural expression.
-    localeFile->pluralIndices[pluralIndex] = (uint8_t)index;
-    localeFile->pluralOps[pluralIndex] = op;
-    localeFile->pluralValues[pluralIndex] = value;
-    pluralIndex++;
-    definedCount++;
-
-    while(*ptr == ' ') ptr++;
-
-    // Close any grouping parens that wrapped this conditional branch
-    while(parenDepth > 0) {
-      if(*ptr != ')') {
-        break;
-      }
-      ptr++;
-      parenDepth--;
-
-      while(*ptr == ' ') ptr++;
-    }
-
-    if(*ptr != ':') {
-      errorThrow("Expected ':' after plural expression.");
-    }
-    ptr++;
-  }
-
-  // Must define exactly nplurals outcomes:
-  //   (nplurals - 1) conditional results + 1 final fallback result
-  if(
-    pluralIndex != localeFile->pluralStateCount - 1 || 
-    definedCount != localeFile->pluralStateCount
-  ) {
-    errorThrow("Plural expression count does not match nplurals.");
-  }
-
-  errorOk();
-}
-
-
-uint8_t assetLocaleEvaluatePlural(
-  assetlocalefile_t *file,
-  const int32_t pluralCount
-) {
-  assertNotNull(file, "Locale file cannot be NULL.");
-  assertTrue(pluralCount >= 0, "Plural count cannot be negative.");
-
-  for(uint8_t i = 0; i < file->pluralStateCount - 1; i++) {
-    int32_t value = file->pluralValues[i];
-    switch(file->pluralOps[i]) {
-      case ASSET_LOCALE_PLURAL_OP_EQUAL:
-        if(pluralCount == value) return file->pluralIndices[i];
-        break;
-
-      case ASSET_LOCALE_PLURAL_OP_NOT_EQUAL:
-        if(pluralCount != value) return file->pluralIndices[i];
-        break;
-
-      case ASSET_LOCALE_PLURAL_OP_LESS:
-        if(pluralCount < value) return file->pluralIndices[i];
-        break;
-
-      case ASSET_LOCALE_PLURAL_OP_LESS_EQUAL:
-        if(pluralCount <= value) return file->pluralIndices[i];
-        break;
-
-      case ASSET_LOCALE_PLURAL_OP_GREATER:
-        if(pluralCount > value) return file->pluralIndices[i];
-        break;
-
-      case ASSET_LOCALE_PLURAL_OP_GREATER_EQUAL:
-        if(pluralCount >= value) return file->pluralIndices[i];
-        break;
-    }
-  }
-
-  return file->pluralDefaultIndex;
-}
-
-errorret_t assetLocaleLineSkipBlanks(
-  assetfilelinereader_t *reader,
-  uint8_t *lineBuffer
-) {
-  while(!reader->eof) {
-    // Skip blank lines
-    if(lineBuffer[0] == '\0') {
-      errorChain(assetFileLineReaderNext(reader));
-      continue;
-    }
-
-    // Skip comment lines
-    if(lineBuffer[0] == '#') {
-      errorChain(assetFileLineReaderNext(reader));
-      continue;
-    }
-    
-    // Is line only spaces?
-    size_t lineLength = strlen((char_t *)lineBuffer);
-    size_t i;
-    bool_t onlySpaces = true;
-    for(i = 0; i < lineLength; i++) {
-      if(lineBuffer[i] != ' ') {
-        onlySpaces = false;
-        break;
-      }
-    }
-
-    if(onlySpaces) {
-      errorChain(assetFileLineReaderNext(reader));
-      continue;
-    }
-    break;
-  }
-
-  errorOk();
-}
-
-errorret_t assetLocaleLineUnbuffer(
-  assetfilelinereader_t *reader,
-  uint8_t *lineBuffer,
-  uint8_t *stringBuffer,
-  const size_t stringBufferSize
-) {
-  stringBuffer[0] = '\0';
-
-  // At the point this funciton is called, we are looking for an opening quote.
-  char_t *start = strchr((char_t *)lineBuffer, '"');
-  if(!start) {
-    errorThrow("Expected open (0) \"");
-  }
-
-  char *end = strchr(start + 1, '"');
-  if(!end) {
-    errorThrow("Expected close (0) \"");
-  }
-  *end = '\0';
-
-  if(strlen(start) >= stringBufferSize) {
-    errorThrow("String buffer overflow");
-  }
-  memoryCopy(stringBuffer, start + 1, strlen(start));
-
-  // Now start buffering lines out
-  while(!reader->eof) {
-    errorChain(assetFileLineReaderNext(reader));
-
-    // Skip blank lines
-    errorChain(assetLocaleLineSkipBlanks(reader, lineBuffer));
-    
-    // Skip starting spaces
-    char_t *ptr = (char_t *)lineBuffer;
-    while(*ptr == ' ') {
-      ptr++;
-    }
-
-    // Only consider lines starting with quote
-    if(*ptr != '"') {
-      break;
-    }
-
-    ptr++; // move past first quote
-    
-    bool_t escaping = false;
-    char_t *dest = (char_t *)stringBuffer + strlen((char_t *)stringBuffer);
-    while(*ptr) {
-      if(escaping) {
-        // Handle escape sequences
-        switch(*ptr) {
-          case 'n': *dest++ = '\n'; break;
-          case 't': *dest++ = '\t'; break;
-          case '\\': *dest++ = '\\'; break;
-          case '"': *dest++ = '"'; break;
-          default:
-            errorThrow("Unknown escape sequence: \\%c", *ptr);
-        }
-        escaping = false;
-      } else if(*ptr == '\\') {
-        escaping = true;
-      } else if(*ptr == '"') {
-        // End of string
-        break;
-      } else {
-        // Regular character
-        *dest++ = *ptr;
-      }
-      if((size_t)(dest - (char_t *)stringBuffer) >= stringBufferSize) {
-        errorThrow("String buffer overflow");
-      }
-      ptr++;
-    }
-    *dest = '\0';
-  }
-
-  errorOk();
-}
-
-errorret_t assetLocaleGetString(
-  assetlocalefile_t *file,
-  const char_t *messageId,
-  const int32_t pluralCount,
-  char_t *stringBuffer,
-  const size_t stringBufferSize
-) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(messageId, "Message ID cannot be NULL.");
-  assertTrue(pluralCount >= 0, "Plural index cannot be negative.");
-  assertNotNull(stringBuffer, "String buffer cannot be NULL.");
-  assertTrue(stringBufferSize > 0, "String buffer size must be > 0");
-  assetfilelinereader_t reader;
-
-  bool_t msgidFound = false, msgidPluralFound = false, msgstrFound = false;
-  uint8_t msgidBuffer[256];
-  uint8_t msgidPluralBuffer[256];
-  uint8_t readBuffer[1024];
-  uint8_t lineBuffer[1024];
-  uint8_t pluralIndex = 0xFF;
-
-  msgidBuffer[0] = '\0';
-  msgidPluralBuffer[0] = '\0';
-  stringBuffer[0] = '\0';
-
-  // Rewind and start reading lines.
-  errorChain(assetFileRewind(&file->file));
-  assetFileLineReaderInit(
-    &reader,
-    &file->file,
-    readBuffer,
-    sizeof(readBuffer),
-    lineBuffer,
-    sizeof(lineBuffer)
-  );
-
-  // Skip blanks, comments, etc and start looking for msgid's
-  errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
-
-  while(!reader.eof) {
-    // Is this msgid?
-    if(memoryCompare(lineBuffer, "msgid", 5) != 0) {
-      errorChain(assetFileLineReaderNext(&reader));
-      msgidBuffer[0] = '\0';
-      continue;
-    }
-
-    // Unbuffer the msgid
-    assetLocaleLineUnbuffer(
-      &reader, lineBuffer, (uint8_t *)msgidBuffer, sizeof(msgidBuffer)
-    );
-
-    // Is this the needle?
-    if(memoryCompare(msgidBuffer, messageId, strlen(messageId)) != 0) {
-      continue;
-    }
-
-    msgidFound = true;
-    break;
-  }
-  if(!msgidFound) {
-    errorThrow("Failed to find message ID: %s", messageId);
-  }
-  
-  // We are either going to see a msgstr or a msgid_plural
-  while(!reader.eof) {
-    errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
-
-    // Is msgid_plural?
-    if(
-      !msgidPluralFound &&
-      memoryCompare(lineBuffer, "msgid_plural", 12) == 0
-    ) {
-      // Yes, start reading plural ID
-      assetLocaleLineUnbuffer(
-        &reader,
-        lineBuffer,
-        (uint8_t *)msgidPluralBuffer,
-        sizeof(msgidPluralBuffer)
-      );
-      msgidPluralFound = true;
-
-      // At this point we determine the plural index to use by running the
-      // plural formula
-      pluralIndex = assetLocaleEvaluatePlural(
-        file,
-        pluralCount
-      );
-      continue;
-    }
-
-    // Should be msgstr if not plural.
-    if(memoryCompare(lineBuffer, "msgstr", 6) != 0) {
-      errorThrow("Expected msgstr after msgid, found: %s", lineBuffer);
-      continue;
-    }
-
-    // If plural we need an index
-    if(msgidPluralFound) {
-      // Skip blank chars
-      char_t *ptr = (char_t *)lineBuffer + 6;
-      while(*ptr == ' ') {
-        ptr++;
-      }
-
-      if(*ptr != '[') {
-        errorThrow("Expected [ for plural form, found: %s", lineBuffer);
-      }
-
-      ptr++; // move past [
-
-      // Parse until ]
-      char *end = strchr(ptr, ']');
-      if(!end) {
-        errorThrow("Expected ] for plural form, found: %s", lineBuffer);
-      }
-      *end = '\0';
-
-      int32_t index = atoi(ptr);
-      if(index != pluralIndex) {
-        // Not the plural form we want, skip to the next useable line
-        while(!reader.eof) {
-          errorChain(assetFileLineReaderNext(&reader));
-          errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
-          if(
-            lineBuffer[0] == '\"' ||
-            lineBuffer[0] == '\0' ||
-            lineBuffer[0] == '#'
-          ) continue;
-          break;
-        }
-        continue;
-      }
-
-      // Undo damage to line buffer from unbuffering.
-      *end = ']';
-    }
-
-    // Parse out msgstr
-    errorChain(assetLocaleLineUnbuffer(
-      &reader, lineBuffer, (uint8_t *)stringBuffer, stringBufferSize
-    ));
-    msgstrFound = true;
-    break;
-  };
-
-  if(!msgstrFound) {
-    errorThrow("Failed to find msgstr for message ID: %s", messageId);
-  }
-
-  errorOk();
-}
-
-errorret_t assetLocaleGetStringWithVA(
-  assetlocalefile_t *file,
-  const char_t *messageId,
-  const int32_t pluralIndex,
-  char_t *buffer,
-  const size_t bufferSize,
-  ...
-) {
-  assertNotNull(file, "Asset file cannot be NULL.");
-  assertNotNull(messageId, "Message ID cannot be NULL.");
-  assertNotNull(buffer, "Buffer cannot be NULL.");
-  assertTrue(bufferSize > 0, "Buffer size must be > 0.");
-  assertTrue(pluralIndex >= 0, "Plural cannot be negative.");
-
-  char_t *tempBuffer;
-  tempBuffer = memoryAllocate(bufferSize);
-  errorret_t ret = assetLocaleGetString(
-    file,
-    messageId,
-    pluralIndex,
-    tempBuffer,
-    bufferSize
-  );
-  if(ret.code != ERROR_OK) {
-    memoryFree(tempBuffer);
-    return ret;
-  }
-
-  va_list args;
-  va_start(args, bufferSize);
-  int result = vsnprintf(buffer, bufferSize, tempBuffer, args);
-  va_end(args);
-  memoryFree(tempBuffer);
-
-  if(result < 0) {
-    errorThrow("Failed to format locale string for ID: %s", messageId);
-  }
-
-  return ret;
-}
-
-errorret_t assetLocaleGetStringWithArgs(
-  assetlocalefile_t *file,
-  const char_t *id,
-  const int32_t plural,
-  char_t *buffer,
-  const size_t bufferSize,
-  const assetlocalearg_t *args,
-  const size_t argCount
-) {
-  assertNotNull(id, "Message ID cannot be NULL.");
-  assertNotNull(buffer, "Buffer cannot be NULL.");
-  assertTrue(bufferSize > 0, "Buffer size must be > 0.");
-  assertTrue(plural >= 0, "Plural cannot be negative.");
-  assertTrue(
-    argCount == 0 || args != NULL,
-    "Args cannot be NULL when argCount > 0."
-  );
-
-  char_t *format = memoryAllocate(bufferSize);
-  if(format == NULL) {
-    errorThrow("Failed to allocate format buffer.");
-  }
-
-  errorret_t ret = assetLocaleGetString(
-    file,
-    id,
-    plural,
-    format,
-    bufferSize
-  );
-  if(ret.code != ERROR_OK) {
-    memoryFree(format);
-    return ret;
-  }
-
-  size_t inIndex = 0;
-  size_t outIndex = 0;
-  size_t nextArg = 0;
-
-  buffer[0] = '\0';
-
-  while(format[inIndex] != '\0') {
-    if(format[inIndex] != '%') {
-      if(outIndex + 1 >= bufferSize) {
-        memoryFree(format);
-        errorThrow("Formatted locale string buffer overflow for ID: %s", id);
-      }
-
-      buffer[outIndex++] = format[inIndex++];
-      continue;
-    }
-
-    inIndex++;
-
-    /* Escaped percent */
-    if(format[inIndex] == '%') {
-      if(outIndex + 1 >= bufferSize) {
-        memoryFree(format);
-        errorThrow("Formatted locale string buffer overflow for ID: %s", id);
-      }
-
-      buffer[outIndex++] = '%';
-      inIndex++;
-      continue;
-    }
-
-    if(nextArg >= argCount) {
-      memoryFree(format);
-      errorThrow("Not enough locale arguments for ID: %s", id);
-    }
-
-    {
-      char_t specBuffer[32];
-      char_t valueBuffer[256];
-      size_t specLength = 0;
-      int written = 0;
-      char_t specifier;
-
-      specBuffer[specLength++] = '%';
-
-      /* Allow flags / width / precision */
-      while(format[inIndex] != '\0') {
-        char_t ch = format[inIndex];
-
-        if(
-          ch == '-' || ch == '+' || ch == ' ' || ch == '#' || ch == '0' ||
-          ch == '.' || (ch >= '0' && ch <= '9')
-        ) {
-          if(specLength + 1 >= sizeof(specBuffer)) {
-            memoryFree(format);
-            errorThrow("Format specifier too long for ID: %s", id);
-          }
-
-          specBuffer[specLength++] = ch;
-          inIndex++;
-          continue;
-        }
-
-        break;
-      }
-
-      if(format[inIndex] == '\0') {
-        memoryFree(format);
-        errorThrow("Incomplete format specifier for ID: %s", id);
-      }
-
-      specifier = format[inIndex++];
-
-      if(specifier != 's' && specifier != 'd' && specifier != 'f') {
-        memoryFree(format);
-        errorThrow(
-          "Unsupported format specifier '%%%c' for ID: %s",
-          specifier,
-          id
-        );
-      }
-
-      specBuffer[specLength++] = specifier;
-      specBuffer[specLength] = '\0';
-
-      switch(specifier) {
-        case 's':
-          if(args[nextArg].type != ASSET_LOCALE_ARG_STRING) {
-            memoryFree(format);
-            errorThrow("Expected string locale argument for ID: %s", id);
-          }
-
-          written = snprintf(
-            valueBuffer,
-            sizeof(valueBuffer),
-            specBuffer,
-            args[nextArg].stringValue ? args[nextArg].stringValue : ""
-          );
-          break;
-
-        case 'd':
-          if(args[nextArg].type != ASSET_LOCALE_ARG_INT) {
-            memoryFree(format);
-            errorThrow("Expected int locale argument for ID: %s", id);
-          }
-
-          written = snprintf(
-            valueBuffer,
-            sizeof(valueBuffer),
-            specBuffer,
-            args[nextArg].intValue
-          );
-          break;
-
-        case 'f':
-          if(
-            args[nextArg].type != ASSET_LOCALE_ARG_FLOAT &&
-            args[nextArg].type != ASSET_LOCALE_ARG_INT
-          ) {
-            memoryFree(format);
-            errorThrow("Expected float or int locale argument for ID: %s", id);
-          }
-
-          float_t floatValue = (
-            args[nextArg].type == ASSET_LOCALE_ARG_FLOAT ?
-            args[nextArg].floatValue :
-            (float_t)args[nextArg].intValue
-          );
-
-          written = snprintf(
-            valueBuffer,
-            sizeof(valueBuffer),
-            specBuffer,
-            floatValue
-          );
-          break;
-      }
-
-      nextArg++;
-
-      if(written < 0) {
-        memoryFree(format);
-        errorThrow("Failed to format locale string for ID: %s", id);
-      }
-
-      if(outIndex + (size_t)written >= bufferSize) {
-        memoryFree(format);
-        errorThrow("Formatted locale string buffer overflow for ID: %s", id);
-      }
-
-      memoryCopy(buffer + outIndex, valueBuffer, (size_t)written);
-      outIndex += (size_t)written;
-    }
-  }
-
-  buffer[outIndex] = '\0';
-  memoryFree(format);
-  errorOk();
-}

src/dusk/asset/loader/locale/assetlocaleloader.h

@@ -1,161 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "asset/asset.h"
-
-#define ASSET_LOCALE_FILE_PLURAL_FORM_COUNT 6
-
-typedef enum {
-  ASSET_LOCALE_PLURAL_OP_EQUAL,
-  ASSET_LOCALE_PLURAL_OP_NOT_EQUAL,
-  ASSET_LOCALE_PLURAL_OP_LESS,
-  ASSET_LOCALE_PLURAL_OP_LESS_EQUAL,
-  ASSET_LOCALE_PLURAL_OP_GREATER,
-  ASSET_LOCALE_PLURAL_OP_GREATER_EQUAL
-} assetlocalepluraloperation_t;
-
-typedef enum {
-  ASSET_LOCALE_ARG_STRING,
-  ASSET_LOCALE_ARG_INT,
-  ASSET_LOCALE_ARG_FLOAT
-} assetlocaleargtype_t;
-
-typedef struct {
-  assetlocaleargtype_t type;
-  union {
-    const char_t *stringValue;
-    int32_t intValue;
-    float_t floatValue;
-  };
-} assetlocalearg_t;
-
-typedef struct {
-  assetfile_t file;
-  assetlocalepluraloperation_t pluralOps[ASSET_LOCALE_FILE_PLURAL_FORM_COUNT];
-  int32_t pluralValues[ASSET_LOCALE_FILE_PLURAL_FORM_COUNT];
-  int32_t pluralIndices[ASSET_LOCALE_FILE_PLURAL_FORM_COUNT];
-  uint8_t pluralStateCount;
-  uint8_t pluralDefaultIndex;
-} assetlocalefile_t;
-
-/**
- * Initialize a locale asset file.
- * 
- * @param localeFile The locale file to initialize.
- * @param path The path to the locale file.
- * @return An error code if a failure occurs.
- */
-errorret_t assetLocaleFileInit(
-  assetlocalefile_t *localeFile,
-  const char_t *path
-);
-
-/**
- * Dispose of a locale asset file.
- * 
- * @param localeFile The locale file to dispose of.
- * @return An error code if a failure occurs.
- */
-errorret_t assetLocaleFileDispose(assetlocalefile_t *localeFile);
-
-errorret_t assetLocaleParseHeader(
-  assetlocalefile_t *localeFile,
-  char_t *headerBuffer,
-  const size_t headerBufferSize
-);
-
-/**
- * Skips blank lines and comment lines in the line reader.
- * 
- * @param reader Line reader to read from.
- * @param lineBuffer Buffer to use for reading lines.
- * @return Any error that occurs during skipping.
- */
-errorret_t assetLocaleLineSkipBlanks(
-  assetfilelinereader_t *reader,
-  uint8_t *lineBuffer
-);
-
-/**
- * Unbuffers a potentially multi-line quoted string from the line reader.
- * 
- * This will read lines until it finds a line that starts with a quote, then
- * read until the closing quote.
- * 
- * @param reader Line reader to read from.
- * @param lineBuffer Buffer to use for reading lines.
- * @param stringBuffer Buffer to write the unbuffered string to.
- * @param stringBufferSize Size of the string buffer.
- * @return Any error that occurs during unbuffering.
- */
-errorret_t assetLocaleLineUnbuffer(
-  assetfilelinereader_t *reader,
-  uint8_t *lineBuffer,
-  uint8_t *stringBuffer,
-  const size_t stringBufferSize
-);
-
-/**
- * Test function for locale asset loading.
- * 
- * @param file Asset file to test loading from.
- * @param messageId The message ID to retrieve.
- * @param pluralCount Count for formulating the plural variant.
- * @param stringBuffer Buffer to write the retrieved string to.
- * @param stringBufferSize Size of the string buffer.
- * @return Any error that occurs during testing.
- */
-errorret_t assetLocaleGetString(
-  assetlocalefile_t *file,
-  const char_t *messageId,
-  const int32_t pluralCount,
-  char_t *stringBuffer,
-  const size_t stringBufferSize
-);
-
-/**
- * Test function for locale asset loading with a variable argument list.
- * 
- * @param file Asset file to test loading from.
- * @param messageId The message ID to retrieve.
- * @param pluralCount Count for formulating the plural variant.
- * @param buffer Buffer to write the retrieved string to.
- * @param bufferSize Size of the buffer.
- * @param ... Additional arguments for formatting the string.
- * @return Any error that occurs during testing.
- */
-errorret_t assetLocaleGetStringWithVA(
-  assetlocalefile_t *file,
-  const char_t *messageId,
-  const int32_t pluralCount,
-  char_t *buffer,
-  const size_t bufferSize,
-  ...
-);
-
-/**
- * Test function for locale asset loading with a list of arguments.
- * 
- * @param file Asset file to test loading from.
- * @param messageId The message ID to retrieve.
- * @param pluralCount Count for formulating the plural variant.
- * @param buffer Buffer to write the retrieved string to.
- * @param bufferSize Size of the buffer.
- * @param args List of arguments for formatting the string.
- * @param argCount Number of arguments in the list.
- * @return Any error that occurs during testing.
- */
-errorret_t assetLocaleGetStringWithArgs(
-  assetlocalefile_t *file,
-  const char_t *messageId,
-  const int32_t pluralCount,
-  char_t *buffer,
-  const size_t bufferSize,
-  const assetlocalearg_t *args,
-  const size_t argCount
-);

src/dusk/asset/loader/script/CMakeLists.txt

@@ -1,10 +0,0 @@
-# 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
-    assetscriptloader.c
-)

src/dusk/asset/loader/script/assetscriptloader.c

@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "assetscriptloader.h"
-#include "assert/assert.h"
-
-errorret_t assetScriptLoader(assetfile_t *file) {
-  assertNotNull(file, "Asset file cannot be NULL");
-  assertNull(file->zipFile, "Asset file zip handle must be NULL");
-  assertNotNull(file->output, "Asset file output cannot be NULL");
-
-  assetscript_t *script = (assetscript_t *)file->output;
-
-  // Open the asset for buffering
-  errorChain(assetFileOpen(file));
-
-  // Request loading
-  if(!lua_load(
-    script->ctx->luaState,
-    assetScriptReader,
-    file,
-    file->filename,
-    NULL
-  ) == LUA_OK) {
-    const char_t *strErr = lua_tostring(script->ctx->luaState, -1);
-    lua_pop(script->ctx->luaState, 1);
-    errorThrow("Failed to load Lua script: %s", strErr);
-  }
-
-  // Now loaded, exec
-  if(lua_pcall(script->ctx->luaState, 0, LUA_MULTRET, 0) != LUA_OK) {
-    const char_t *strErr = lua_tostring(script->ctx->luaState, -1);
-    lua_pop(script->ctx->luaState, 1);
-    errorThrow("Failed to execute Lua script: %s", strErr);
-  }
-
-  // Close the file
-  return assetFileClose(file);
-}
-
-errorret_t assetScriptLoad(const char_t *path, scriptcontext_t *ctx) {
-  assertNotNull(path, "Script path cannot be NULL");
-  assertNotNull(ctx, "Script context cannot be NULL");
-  
-  assetscript_t script;
-  script.ctx = ctx;
-
-  return assetLoad(
-    path,
-    assetScriptLoader,
-    NULL,
-    &script
-  );
-}
-
-const char_t * assetScriptReader(lua_State* L, void* data, size_t* size) {
-  assetfile_t *file = (assetfile_t*)data;
-  assertNotNull(file, "Script asset file cannot be NULL");
-  assertNotNull(file->zipFile, "Script asset zip handle cannot be NULL");
-  assertNotNull(file->output, "Script asset output cannot be NULL");
-
-  assetscript_t *script = (assetscript_t *)file->output;
-  assertNotNull(script, "Script asset output cannot be NULL");
-
-  zip_int64_t read = zip_fread(
-    file->zipFile,
-    script->buffer,
-    sizeof(script->buffer)
-  );
-
-  if(read < 0) {
-    *size = 0;
-    return NULL;
-  }
-
-  *size = (size_t)read;
-  return script->buffer;
-}

src/dusk/asset/loader/script/assetscriptloader.h

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "asset/asset.h"
-#include "script/scriptcontext.h"
-
-#define ASSET_SCRIPT_BUFFER_SIZE 1024
-
-typedef struct {
-  void *nothing;
-} assetscriptloaderparams_t;
-
-typedef struct {
-  scriptcontext_t *ctx;
-  char_t buffer[ASSET_SCRIPT_BUFFER_SIZE];
-} assetscript_t;
-
-/**
- * Handler for script assets.
- * 
- * @param file Asset file to load the script from.
- * @return Any error that occurs during loading.
- */
-errorret_t assetScriptLoader(assetfile_t *file);
-
-/**
- * Loads a script from the specified path.
- * 
- * @param path Path to the script asset.
- * @param ctx Script context to load the script into.
- * @return Any error that occurs during loading.
- */
-errorret_t assetScriptLoad(const char_t *path, scriptcontext_t *ctx);
-
-/**
- * Reader function for Lua to read script data from the asset.
- * 
- * @param L Lua state.
- * @param data Pointer to the scriptcontext_t structure.
- * @param size Pointer to store the size of the read data.
- * @return Pointer to the read data buffer.
- */
-const char_t * assetScriptReader(lua_State* L, void* data, size_t* size);

src/dusk/asset/type/CMakeLists.txt

@@ -10,4 +10,6 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
     assettileset.c
     assetlanguage.c
     assetscript.c
+    assetmap.c
+    assetmapchunk.c
 )

src/dusk/asset/type/assetmap.c

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "asset/asset.h"
+#include "assert/assert.h"
+#include "util/memory.h"
+
+errorret_t assetMapHandler(assetcustom_t custom) {
+  printf("Map Loaded from asset!\n");
+  errorOk();
+}

src/dusk/asset/type/assetmap.h

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "error/error.h"
+
+typedef struct assetcustom_s assetcustom_t;
+
+/**
+ * Loads a map asset from the given data pointer into the output map structure.
+ *
+ * @param data Pointer to the raw assetmap_t data.
+ * @param output Pointer to the map_t to load the map into.
+ * @return An error code.
+ */
+errorret_t assetMapHandler(assetcustom_t custom);

src/dusk/asset/type/assetmapchunk.c

@@ -0,0 +1,185 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "asset/asset.h"
+#include "assert/assert.h"
+#include "map/mapchunk.h"
+#include "util/endian.h"
+
+#pragma pack(push, 1)
+typedef struct {
+  uint32_t tileCount;
+  uint8_t modelCount;
+  uint8_t entityCount;
+} assetchunkheader_t;
+#pragma pack(pop)
+
+#pragma pack(push, 1)
+typedef struct {
+  maptile_t tile;
+} assetchunktiledata_t;
+#pragma pack(pop)
+
+#pragma pack(push, 1)
+typedef struct {
+  uint32_t vertexCount;
+} assetchunkmodelheader_t;
+#pragma pack(pop)
+
+#pragma pack(push, 1)
+typedef struct {
+  uint8_t entityType;
+  uint8_t localX;
+  uint8_t localY;
+  uint8_t localZ;
+} assetchunkentityheader_t;
+#pragma pack(pop)
+
+errorret_t assetMapChunkHandler(assetcustom_t custom) {
+  assertNotNull(custom.output, "Output pointer cannot be NULL");
+  assertNotNull(custom.zipFile, "Zip file pointer cannot be NULL");
+
+  mapchunk_t *chunk = (mapchunk_t *)custom.output;
+  assertTrue(chunk->meshCount == 0, "Chunk is not in a good state");
+
+  // Read header
+  assetchunkheader_t header;
+  size_t bytesRead = zip_fread(
+    custom.zipFile, &header, sizeof(assetchunkheader_t)
+  );
+  if(bytesRead != sizeof(assetchunkheader_t)) {
+    zip_fclose(custom.zipFile);
+    errorThrow("Failed to read chunk asset header.");
+  }
+
+  // Fix endianess if necessary
+  header.tileCount = endianLittleToHost32(header.tileCount);
+
+  if(header.tileCount != CHUNK_TILE_COUNT) {
+    zip_fclose(custom.zipFile);
+    errorThrow(
+      "Chunk asset has invalid tile count: %d (expected %d).",
+      header.tileCount,
+      CHUNK_TILE_COUNT
+    );
+  }
+
+  if(header.modelCount > CHUNK_MESH_COUNT_MAX) {
+    zip_fclose(custom.zipFile);
+    errorThrow(
+      "Chunk asset has too many models: %d (max %d).",
+      header.modelCount,
+      CHUNK_MESH_COUNT_MAX
+    );
+  }
+
+  if(header.entityCount > CHUNK_ENTITY_COUNT_MAX) {
+    zip_fclose(custom.zipFile);
+    errorThrow(
+      "Chunk asset has too many entities: %d (max %d).",
+      header.entityCount,
+      CHUNK_ENTITY_COUNT_MAX
+    );
+  }
+
+  chunk->meshCount = header.modelCount;
+
+  // Read tile data
+  bytesRead = zip_fread(
+    custom.zipFile,
+    chunk->tiles,
+    sizeof(assetchunktiledata_t) * header.tileCount
+  );
+  if(bytesRead != sizeof(assetchunktiledata_t) * header.tileCount) {
+    zip_fclose(custom.zipFile);
+    errorThrow("Failed to read chunk tile data.");
+  }
+
+  // For each model...
+  uint32_t vertexIndex = 0;
+  for(uint8_t i = 0; i < header.modelCount; i++) {
+    assetchunkmodelheader_t modelHeader;
+    bytesRead = zip_fread(
+      custom.zipFile, &modelHeader, sizeof(assetchunkmodelheader_t)
+    );
+    if(bytesRead != sizeof(assetchunkmodelheader_t)) {
+      zip_fclose(custom.zipFile);
+      errorThrow("Failed to read chunk model header.");
+    }
+
+    // Fix endianess if necessary
+    modelHeader.vertexCount = endianLittleToHost32(modelHeader.vertexCount);
+
+    if(
+      vertexIndex + modelHeader.vertexCount >
+      CHUNK_VERTEX_COUNT_MAX
+    ) {
+      zip_fclose(custom.zipFile);
+      errorThrow("Chunk model vertex count exceeds maximum.");
+    }
+    
+    // Read vertex data.
+    bytesRead = zip_fread(
+      custom.zipFile,
+      &chunk->vertices[vertexIndex],
+      sizeof(meshvertex_t) * modelHeader.vertexCount
+    );
+    if(bytesRead != sizeof(meshvertex_t) * modelHeader.vertexCount) {
+      zip_fclose(custom.zipFile);
+      errorThrow("Failed to read chunk model vertex data.");
+    }
+
+    // Init the mesh
+    if(modelHeader.vertexCount > 0) {
+      mesh_t *mesh = &chunk->meshes[i];
+      meshInit(
+        mesh,
+        MESH_PRIMITIVE_TYPE_TRIANGLES,
+        modelHeader.vertexCount,
+        &chunk->vertices[vertexIndex]
+      );
+
+      vertexIndex += modelHeader.vertexCount;
+    } else {
+      // chunk->meshes[i].vertexCount = 0;
+    }
+  }
+
+  // Read entity data
+  // for(uint8_t i = 0; i < header.entityCount; i++) {
+  //   assetchunkentityheader_t entityHeader;
+  //   bytesRead = zip_fread(
+  //     custom.zipFile, &entityHeader, sizeof(assetchunkentityheader_t)
+  //   );
+  //   if(bytesRead != sizeof(assetchunkentityheader_t)) {
+  //     zip_fclose(custom.zipFile);
+  //     errorThrow("Failed to read chunk entity header.");
+  //   }
+
+  //   uint8_t entityIndex = entityGetAvailable();
+  //   if(entityIndex == 0xFF) {
+  //     zip_fclose(custom.zipFile);
+  //     errorThrow("No available entity slots.");
+  //   }
+
+  //   entity_t *entity = &ENTITIES[entityIndex];
+  //   entityInit(entity, (entitytype_t)entityHeader.entityType);
+  //   entity->position.x = (
+  //     (chunk->position.x * CHUNK_WIDTH) + entityHeader.localX
+  //   );
+  //   entity->position.y = (
+  //     (chunk->position.y * CHUNK_HEIGHT) + entityHeader.localY
+  //   );
+  //   entity->position.z = (
+  //     (chunk->position.z * CHUNK_DEPTH) + entityHeader.localZ
+  //   );
+
+  //   chunk->entities[i] = entityIndex;
+  // }
+
+  errorOk();
+}

src/dusk/asset/type/assetmapchunk.h

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "error/error.h"
+
+typedef struct assetcustom_s assetcustom_t;
+
+/**
+ * Handles loading of map chunk data from a map chunk asset file.
+ * 
+ * @param custom The custom asset loading parameters.
+ * @return An error code.
+ */
+errorret_t assetMapChunkHandler(assetcustom_t custom);

src/dusk/asset/type/assettexture.c

@@ -21,8 +21,8 @@ errorret_t assetTextureLoad(assetentire_t entire) {
   // Read header and version (first 4 bytes)
   if(
     assetData->header[0] != 'D' || 
-    assetData->header[1] != 'T' ||
+    assetData->header[1] != 'P' ||
-    assetData->header[2] != 'X'
+    assetData->header[2] != 'T'
   ) {
     errorThrow("Invalid texture header");
   }
@@ -44,35 +44,15 @@ errorret_t assetTextureLoad(assetentire_t entire) {
     errorThrow("Invalid texture dimensions");
   }
   
-  // Validate format
+  textureInit(
-  textureformat_t format;
+    texture,
-  texturedata_t data;
+    assetData->width,
-
+    assetData->height,
-  switch(assetData->type) {
+    TEXTURE_FORMAT_PALETTE,
-    case 0x00: // RGBA8888
+    (texturedata_t){
-      format = TEXTURE_FORMAT_RGBA;
+      .paletteData = assetData->palette
-      data.rgbaColors = (color_t *)assetData->data;
+    }
-      break;
+  );
-
-    // case 0x01:
-    //   format = TEXTURE_FORMAT_RGB;
-    //   break;
-    
-    // case 0x02:
-    //   format = TEXTURE_FORMAT_RGB565;
-    //   break;
-
-    // case 0x03:
-    //   format = TEXTURE_FORMAT_RGB5A3;
-    //   break;
-
-    default:
-      errorThrow("Unsupported texture format");
-  }
-
-  errorChain(textureInit(
-    texture, assetData->width, assetData->height, format, data
-  ));
 
   errorOk();
 }

src/dusk/asset/type/assettexture.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "error/error.h"
-#include "display/color.h"
 
 #define ASSET_TEXTURE_WIDTH_MAX 2048
 #define ASSET_TEXTURE_HEIGHT_MAX 2048
@@ -21,10 +20,9 @@ typedef struct assetentire_s assetentire_t;
 typedef struct {
   char_t header[3];
   uint8_t version;
-  uint8_t type;
   uint32_t width;
   uint32_t height;
-  uint8_t data[ASSET_TEXTURE_SIZE_MAX * sizeof(color4b_t)];
+  uint8_t palette[ASSET_TEXTURE_SIZE_MAX];
 } assettexture_t;
 #pragma pack(pop)
 

src/dusk/display/CMakeLists.txt

@@ -14,7 +14,6 @@ add_subdirectory(camera)
 add_subdirectory(framebuffer)
 add_subdirectory(mesh)
 add_subdirectory(screen)
-add_subdirectory(shader)
 add_subdirectory(spritebatch)
 add_subdirectory(text)
 add_subdirectory(texture)

src/dusk/display/camera/camera.c

@@ -35,9 +35,9 @@ void cameraInitOrthographic(camera_t *camera) {
   camera->projType = CAMERA_PROJECTION_TYPE_ORTHOGRAPHIC;
   camera->orthographic.left = 0.0f;
   camera->orthographic.right = SCREEN.width;
-  camera->orthographic.top = SCREEN.height;
+  camera->orthographic.top = 0.0f;
-  camera->orthographic.bottom = 0.0f;
+  camera->orthographic.bottom = SCREEN.height;
-  camera->nearClip = 0.1f;
+  camera->nearClip = -1.0f;
   camera->farClip = 1.0f;
 
   camera->viewType = CAMERA_VIEW_TYPE_2D;
@@ -45,63 +45,13 @@ void cameraInitOrthographic(camera_t *camera) {
   camera->_2d.zoom = 1.0f;
 }
 
-void cameraGetProjectionMatrix(camera_t *camera, mat4 dest) {
+void cameraPushMatrix(camera_t *camera) {
-  assertNotNull(camera, "Not a camera component");
+  assertNotNull(camera, "Invalid camera");
-  assertNotNull(dest, "Destination matrix must not be null");
+  cameraPushMatrixPlatform(camera);
-
-  if(
-    camera->projType == CAMERA_PROJECTION_TYPE_PERSPECTIVE ||
-    camera->projType == CAMERA_PROJECTION_TYPE_PERSPECTIVE_FLIPPED
-  ) {
-    glm_mat4_identity(dest);
-    glm_perspective(
-      camera->perspective.fov,
-      SCREEN.aspect,
-      camera->nearClip,
-      camera->farClip,
-      dest
-    );
-
-    if(camera->projType == CAMERA_PROJECTION_TYPE_PERSPECTIVE_FLIPPED) {
-      dest[1][1] *= -1.0f;
-    }
-  } else if(camera->projType == CAMERA_PROJECTION_TYPE_ORTHOGRAPHIC) {
-    glm_mat4_identity(dest);
-    glm_ortho(
-      camera->orthographic.left,
-      camera->orthographic.right,
-      camera->orthographic.top,
-      camera->orthographic.bottom,
-      camera->nearClip,
-      camera->farClip,
-      dest
-    );
-  }
 }
 
-void cameraGetViewMatrix(camera_t *camera, mat4 dest) {
+void cameraPopMatrix(void) {
-  assertNotNull(camera, "Not a camera component");
+  #ifdef cameraPopMatrixPlatform
-  assertNotNull(dest, "Destination matrix must not be null");
+    cameraPopMatrixPlatform();
-
+  #endif
-  if(camera->viewType == CAMERA_VIEW_TYPE_MATRIX) {
-    glm_mat4_ucopy(camera->view, dest);
-  } else if(camera->viewType == CAMERA_VIEW_TYPE_LOOKAT) {
-    glm_mat4_identity(dest);
-    glm_lookat(
-      camera->lookat.position,
-      camera->lookat.target,
-      camera->lookat.up,
-      dest
-    );
-  } else if(camera->viewType == CAMERA_VIEW_TYPE_2D) {
-    glm_mat4_identity(dest);
-    glm_lookat(
-      (vec3){ camera->_2d.position[0], camera->_2d.position[1], 0.5f },
-      (vec3){ camera->_2d.position[0], camera->_2d.position[1], 0.0f },
-      (vec3){ 0.0f, 1.0f, 0.0f },
-      dest
-    );
-  } else if(camera->viewType == CAMERA_VIEW_TYPE_LOOKAT_PIXEL_PERFECT) {
-    assertUnreachable("LOOKAT_PIXEL_PERFECT view type is not implemented yet");
-  }
 }

src/dusk/display/camera/camera.h

@@ -86,17 +86,13 @@ void cameraInitPerspective(camera_t *camera);
 void cameraInitOrthographic(camera_t *camera);
 
 /**
- * Gets the projection matrix for a camera.
+ * Pushes the camera's view matrix onto the matrix stack.
  * 
- * @param camera Camera to get the projection matrix for
+ * @param id The ID of the camera entity to use.
- * @param dest Matrix to store the projection matrix in
  */
-void cameraGetProjectionMatrix(camera_t *camera, mat4 dest);
+void cameraPushMatrix(camera_t *camera);
 
 /**
- * Gets the view matrix for a camera.
+ * Pops the camera's view matrix off the matrix stack.
- * 
- * @param camera Camera to get the view matrix for
- * @param dest Matrix to store the view matrix in
  */
-void cameraGetViewMatrix(camera_t *camera, mat4 dest);
+void cameraPopMatrix(void);

src/dusk/display/display.c

@@ -17,30 +17,8 @@
 #include "util/memory.h"
 #include "util/string.h"
 #include "asset/asset.h"
-#include "display/shader/shaderunlit.h"
-#include "time/time.h"
-
-#include "script/module/display/moduleshader.h"
 
 display_t DISPLAY = { 0 };
-  mesh_t mesh;
-  meshvertex_t vertices[3] = {
-    {
-      .color = { 255, 0, 0, 255 },
-      .uv = { 0.0f, 0.0f },
-      .pos = { 0.0f, 0.5f, 0.0f }
-    },
-    {
-      .color = { 0, 255, 0, 255 },
-      .uv = { 0.5f, 1.0f },
-      .pos = { -0.5f, -0.5f, 0.0f }
-    },
-    {
-      .color = { 0, 0, 255, 255 },
-      .uv = { 1.0f, 0.0f },
-      .pos = { 0.5f, -0.5f, 0.0f }
-    }
-  };
 
 errorret_t displayInit(void) {
   memoryZero(&DISPLAY, sizeof(DISPLAY));
@@ -48,28 +26,13 @@ errorret_t displayInit(void) {
   #ifdef displayPlatformInit
     errorChain(displayPlatformInit());
   #endif
+
   errorChain(quadInit());
   errorChain(frameBufferInitBackBuffer());
   errorChain(spriteBatchInit());
   errorChain(textInit());
   errorChain(screenInit());
 
-  // Setup initial shader with default values
-  errorChain(shaderInit(&SHADER_UNLIT, &SHADER_UNLIT_DEFINITION));
-  camera_t cam;
-  cameraInit(&cam);
-  mat4 mat;
-  cameraGetProjectionMatrix(&cam, mat);
-  errorChain(shaderBind(&SHADER_UNLIT));
-  errorChain(shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_PROJECTION, mat));
-  cameraGetViewMatrix(&cam, mat);
-  errorChain(shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_VIEW, mat));
-  glm_mat4_identity(mat);
-  errorChain(shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_MODEL, mat));
-  errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, NULL));
-
-  errorChain(meshInit(&mesh, MESH_PRIMITIVE_TYPE_TRIANGLES, 3, vertices));
-
   errorOk();
 }
 
@@ -83,7 +46,7 @@ errorret_t displayUpdate(void) {
   errorChain(frameBufferBind(NULL));
   
   // Bind screen and render scene
-  errorChain(screenBind());
+  screenBind();
   frameBufferClear(
     FRAMEBUFFER_CLEAR_COLOR | FRAMEBUFFER_CLEAR_DEPTH,
     SCREEN.background
@@ -92,7 +55,7 @@ errorret_t displayUpdate(void) {
   errorChain(sceneRender());
 
   // Render UI
-  // uiRender();
+  uiRender();
 
   // Finish up
   screenUnbind();
@@ -106,7 +69,6 @@ errorret_t displayUpdate(void) {
 }
 
 errorret_t displayDispose(void) {
-  errorChain(shaderDispose(&SHADER_UNLIT));
   errorChain(spriteBatchDispose());
   screenDispose();
   errorChain(textDispose());

src/dusk/display/mesh/mesh.c

@@ -25,29 +25,6 @@ errorret_t meshInit(
   errorOk();
 }
 
-errorret_t meshFlush(
-  mesh_t *mesh,
-  const int32_t vertexOffset,
-  const int32_t vertexCount
-) {
-  #ifdef meshFlushPlatform
-    assertNotNull(mesh, "Mesh cannot be NULL");
-    assertTrue(vertexOffset >= 0, "Vertex offset must be non-negative.");
-    assertTrue(vertexCount == -1 || vertexCount > 0, "Vertex count incorrect.");
-
-    int32_t vertCount = meshGetVertexCount(mesh);
-    assertTrue(vertexOffset < (vertCount - 1), "Need at least one vert to draw");
-
-    int32_t drawCount = vertexCount;
-    if(vertexCount == -1) {
-      drawCount = vertCount - vertexOffset;
-    }
-
-    errorChain(meshFlushPlatform(mesh, vertexOffset, vertexCount));
-  #endif
-  errorOk();
-}
-
 errorret_t meshDraw(
   const mesh_t *mesh,
   const int32_t vertexOffset,
@@ -55,7 +32,7 @@ errorret_t meshDraw(
 ) {
   assertNotNull(mesh, "Mesh cannot be NULL");
   assertTrue(vertexOffset >= 0, "Vertex offset must be non-negative");
-  assertTrue(vertexCount == -1 || vertexCount > 0, "Incorrect vert count");
+  assertTrue(vertexCount >= -1, "Vertex count must be -1 or non-negative");
 
   int32_t vertDrawCount = vertexCount;
   if(vertexCount == -1) {

src/dusk/display/mesh/mesh.h

@@ -40,22 +40,6 @@ errorret_t meshInit(
   const meshvertex_t *vertices
 );
 
-/**
- * Instructs the mesh to flush the vertices to the GPU. This is surprisingly 
- * only really necessary on modern devices, as we tend to let older devices
- * read the vertices from the main memory directly.
- * 
- * @param mesh Mesh to flush the vertices for.
- * @param vertexOffset Start vertex to flush.
- * @param vertexCount Count of vertices to flush, set to -1 for all.
- * @return Error state.
- */
-errorret_t meshFlush(
-  mesh_t *mesh,
-  const int32_t vertexOffset,
-  const int32_t vertexCount
-);
-
 /**
  * Draws a mesh.
  * 

src/dusk/display/screen/screen.c

@@ -9,7 +9,6 @@
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "display/mesh/quad.h"
-#include "display/shader/shaderunlit.h"
 
 screen_t SCREEN;
 
@@ -45,23 +44,22 @@ errorret_t screenInit() {
   #endif
 
   // Init screen to backbuffer mode by default
-  errorChain(screenBind());
+  screenBind();
   errorOk();
 }
 
-errorret_t screenBind() {
+void screenBind() {
   // Assume backbuffer is currently bound.
   switch(SCREEN.mode) {
     case SCREEN_MODE_BACKBUFFER: {
       // Screen mode backbuffer uses the full display size
       SCREEN.width = frameBufferGetWidth(FRAMEBUFFER_BOUND);
       SCREEN.height = frameBufferGetHeight(FRAMEBUFFER_BOUND);
-      SCREEN.aspect = (float_t)SCREEN.width / (float_t)SCREEN.height;
 
       // No needd for a framebuffer.
       #ifdef DUSK_DISPLAY_SIZE_DYNAMIC
         if(SCREEN.framebufferReady) {
-          errorChain(frameBufferDispose(&SCREEN.framebuffer));
+          frameBufferDispose(&SCREEN.framebuffer);
           SCREEN.framebufferReady = false;
         }
       #endif
@@ -81,21 +79,19 @@ errorret_t screenBind() {
           curFbHeight = frameBufferGetHeight(&SCREEN.framebuffer);
           if(curFbWidth == SCREEN.width && curFbHeight == SCREEN.height) {
             // Correct size, nothing to do.
-            errorChain(frameBufferBind(&SCREEN.framebuffer));
+            frameBufferBind(&SCREEN.framebuffer);
-            errorOk();
+            return;
           }
 
           // Need a new framebuffer.
-          errorChain(frameBufferDispose(&SCREEN.framebuffer));
+          frameBufferDispose(&SCREEN.framebuffer);
           SCREEN.framebufferReady = false;
         }
 
         // Create new framebuffer
-        errorChain(frameBufferInit(
+        frameBufferInit(&SCREEN.framebuffer, SCREEN.width, SCREEN.height);
-          &SCREEN.framebuffer, SCREEN.width, SCREEN.height
-        ));
         SCREEN.framebufferReady = true;
-        errorChain(frameBufferBind(&SCREEN.framebuffer));
+        frameBufferBind(&SCREEN.framebuffer);
         break;
       }
 
@@ -113,10 +109,10 @@ errorret_t screenBind() {
           SCREEN.aspect = (float_t)SCREEN.width / (float_t)SCREEN.height;
 
           if(SCREEN.framebufferReady) {
-            errorChain(frameBufferDispose(&SCREEN.framebuffer));
+            frameBufferDispose(&SCREEN.framebuffer);
             SCREEN.framebufferReady = false;
           }
-          errorOk();
+          return;
         }
 
         int32_t newFbWidth, newFbHeight;
@@ -140,26 +136,24 @@ errorret_t screenBind() {
             SCREEN.width = newFbWidth;
             SCREEN.height = newFbHeight;
             SCREEN.aspect = (float_t)SCREEN.width / (float_t)SCREEN.height;
-            errorChain(frameBufferBind(&SCREEN.framebuffer));
+            frameBufferBind(&SCREEN.framebuffer);
-            errorOk();
+            return;
           }
 
           // Need a new framebuffer.
-          errorChain(frameBufferDispose(&SCREEN.framebuffer));
+          frameBufferDispose(&SCREEN.framebuffer);
           SCREEN.framebufferReady = false;
         }
 
         // Create new framebuffer
-        errorChain(frameBufferInit(
+        frameBufferInit(&SCREEN.framebuffer, newFbWidth, newFbHeight);
-          &SCREEN.framebuffer, newFbWidth, newFbHeight
-        ));
         SCREEN.width = newFbWidth;
         SCREEN.height = newFbHeight;
         SCREEN.aspect = (float_t)SCREEN.width / (float_t)SCREEN.height;
         SCREEN.framebufferReady = true;
 
         // Bind FB
-        errorChain(frameBufferBind(&SCREEN.framebuffer));
+        frameBufferBind(&SCREEN.framebuffer);
         break;
       }
 
@@ -179,10 +173,10 @@ errorret_t screenBind() {
         if(fbWidth == newFbWidth && fbHeight == newFbHeight) {
           // No need to use framebuffer.
           if(SCREEN.framebufferReady) {
-            errorChain(frameBufferDispose(&SCREEN.framebuffer));
+            frameBufferDispose(&SCREEN.framebuffer);
             SCREEN.framebufferReady = false;
           }
-          errorOk();
+          return;
         }
 
         if(SCREEN.framebufferReady) {
@@ -191,21 +185,19 @@ errorret_t screenBind() {
           curFbWidth = frameBufferGetWidth(&SCREEN.framebuffer);
           curFbHeight = frameBufferGetHeight(&SCREEN.framebuffer);
           if(curFbWidth == newFbWidth && curFbHeight == newFbHeight) {
-            errorChain(frameBufferBind(&SCREEN.framebuffer));
+            frameBufferBind(&SCREEN.framebuffer);
-            errorOk();
+            return;
           }
 
           // Need a new framebuffer.
-          errorChain(frameBufferDispose(&SCREEN.framebuffer));
+          frameBufferDispose(&SCREEN.framebuffer);
           SCREEN.framebufferReady = false;
         }
 
         // Create a new framebuffer.
-        errorChain(frameBufferInit(
+        frameBufferInit(&SCREEN.framebuffer, newFbWidth, newFbHeight);
-          &SCREEN.framebuffer, newFbWidth, newFbHeight
-        ));
         SCREEN.framebufferReady = true;
-        errorChain(frameBufferBind(&SCREEN.framebuffer));
+        frameBufferBind(&SCREEN.framebuffer);
         break;
       }
 
@@ -225,10 +217,10 @@ errorret_t screenBind() {
         if(fbWidth == newFbWidth && fbHeight == newFbHeight) {
           // No need to use framebuffer.
           if(SCREEN.framebufferReady) {
-            errorChain(frameBufferDispose(&SCREEN.framebuffer));
+            frameBufferDispose(&SCREEN.framebuffer);
             SCREEN.framebufferReady = false;
           }
-          errorOk();
+          return;
         }
 
         if(SCREEN.framebufferReady) {
@@ -237,21 +229,19 @@ errorret_t screenBind() {
           curFbWidth = frameBufferGetWidth(&SCREEN.framebuffer);
           curFbHeight = frameBufferGetHeight(&SCREEN.framebuffer);
           if(curFbWidth == newFbWidth && curFbHeight == newFbHeight) {
-            errorChain(frameBufferBind(&SCREEN.framebuffer));
+            frameBufferBind(&SCREEN.framebuffer);
-            errorOk();
+            return;
           }
 
           // Need a new framebuffer.
-          errorChain(frameBufferDispose(&SCREEN.framebuffer));
+          frameBufferDispose(&SCREEN.framebuffer);
           SCREEN.framebufferReady = false;
         }
 
         // Create a new framebuffer.
-        errorChain(frameBufferInit(
+        frameBufferInit(&SCREEN.framebuffer, newFbWidth, newFbHeight);
-          &SCREEN.framebuffer, newFbWidth, newFbHeight
-        ));
         SCREEN.framebufferReady = true;
-        errorChain(frameBufferBind(&SCREEN.framebuffer));
+        frameBufferBind(&SCREEN.framebuffer);
         break;
       }
 
@@ -272,11 +262,9 @@ errorret_t screenBind() {
       break;
     }
   }
-
-  errorOk();
 }
 
-errorret_t screenUnbind() {
+void screenUnbind() {
   switch(SCREEN.mode) {
     // Nothing to do here.
     case SCREEN_MODE_BACKBUFFER:
@@ -287,9 +275,7 @@ errorret_t screenUnbind() {
       case SCREEN_MODE_FIXED_HEIGHT:
       case SCREEN_MODE_FIXED_SIZE:
       case SCREEN_MODE_FIXED_WIDTH:
-        if(SCREEN.framebufferReady) {
+        if(SCREEN.framebufferReady) frameBufferBind(NULL);
-          errorChain(frameBufferBind(NULL));
-        }
         break;
 
       case SCREEN_MODE_FIXED_VIEWPORT_HEIGHT:
@@ -300,19 +286,17 @@ errorret_t screenUnbind() {
       assertUnreachable("Invalid screen mode.");
       break;
   }
-
-  errorOk();
 }
 
-errorret_t screenRender() {
+void screenRender() {
   if(SCREEN.mode == SCREEN_MODE_BACKBUFFER) {
-    errorOk();
+    return;
   }
 
   #ifdef DUSK_DISPLAY_SIZE_DYNAMIC
     if(SCREEN.mode == SCREEN_MODE_FIXED_VIEWPORT_HEIGHT) {
       glViewport(0, 0, SCREEN.width, SCREEN.height);
-      errorOk();
+      return;
     }
 
     if(
@@ -323,7 +307,7 @@ errorret_t screenRender() {
     ) {
       if(!SCREEN.framebufferReady) {
         // Nothing to do here.
-        errorOk();
+        return;
       }
 
       float_t bbWidth, bbHeight;
@@ -372,34 +356,23 @@ errorret_t screenRender() {
         FRAMEBUFFER_CLEAR_COLOR | FRAMEBUFFER_CLEAR_DEPTH,
         COLOR_BLACK
       );
+      cameraPushMatrix(&SCREEN.framebufferCamera);
+      textureBind(&SCREEN.framebuffer.texture);
+      meshDraw(&SCREEN.frameBufferMesh, 0, -1);
+      cameraPopMatrix();
 
-      shaderBind(&SHADER_UNLIT);
+      return;
-      mat4 proj, view, model;
-      cameraGetProjectionMatrix(&SCREEN.framebufferCamera, proj);
-      cameraGetViewMatrix(&SCREEN.framebufferCamera, view);
-      glm_mat4_identity(model);
-      shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_PROJECTION, proj);
-      shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_VIEW, view);
-      shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_MODEL, model);
-
-      // errorChain(textureBind(&SCREEN.framebuffer.texture));
-      errorChain(meshDraw(&SCREEN.frameBufferMesh, 0, -1));
-
-      errorOk();
     };
   #endif
 
   assertUnreachable("Invalid screen mode.");
-  errorThrow("Invalid screen mode.");
 }
 
-errorret_t screenDispose() {
+void screenDispose() {
   #ifdef DUSK_DISPLAY_SIZE_DYNAMIC
     if(SCREEN.framebufferReady) {
-      errorChain(frameBufferDispose(&SCREEN.framebuffer));
+      frameBufferDispose(&SCREEN.framebuffer);
       SCREEN.framebufferReady = false;
     }
   #endif
-
-  errorOk();
 }

src/dusk/display/screen/screen.h

@@ -90,28 +90,20 @@ errorret_t screenInit();
 
 /**
  * Binds the screen, this is done before rendering game content.
- * 
- * @return Error code and state, if error occurs.
  */
-errorret_t screenBind();
+void screenBind();
 
 /**
  * Unbinds the screen, does nothing for now.
- * 
- * @return Error code and state, if error occurs.
  */
-errorret_t screenUnbind();
+void screenUnbind();
 
 /**
  * Renders the screen to the current framebuffer.
- * 
- * @return Error code and state, if error occurs.
  */
-errorret_t screenRender();
+void screenRender();
 
 /**
  * Disposes the screen system.
- * 
- * @return Error code and state, if error occurs.
  */
-errorret_t screenDispose();
+void screenDispose();

src/dusk/display/shader/CMakeLists.txt

@@ -1,11 +0,0 @@
-# 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
-    shader.c
-    shaderunlit.c
-)

src/dusk/display/shader/shader.c

@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "shader.h"
-#include "assert/assert.h"
-
-shader_t *bound = NULL;
-
-errorret_t shaderInit(shader_t *shader, const shaderdefinition_t *def) {
-  assertNotNull(shader, "Shader cannot be null");
-  errorChain(shaderInitPlatform(shader, def));
-  bound = NULL;
-  errorOk();
-}
-
-errorret_t shaderBind(shader_t *shader) {
-  assertNotNull(shader, "Shader cannot be null");
-  errorChain(shaderBindPlatform(shader));
-  bound = shader;
-  errorOk();
-}
-
-errorret_t shaderSetMatrix(
-  shader_t *shader,
-  const char_t *name,
-  mat4 matrix
-) {
-  assertNotNull(shader, "Shader cannot be null");
-  assertStrLenMin(name, 1, "Uniform name cannot be empty");
-  assertNotNull(matrix, "Matrix cannot be null");
-  assertTrue(bound == shader, "Shader must be bound.");
-  errorChain(shaderSetMatrixPlatform(shader, name, matrix));
-  errorOk();
-}
-
-errorret_t shaderSetTexture(
-  shader_t *shader,
-  const char_t *name,
-  texture_t *texture
-) {
-  assertNotNull(shader, "Shader cannot be null");
-  assertStrLenMin(name, 1, "Uniform name cannot be empty");
-  assertTrue(bound == shader, "Shader must be bound.");
-  errorChain(shaderSetTexturePlatform(shader, name, texture));
-  errorOk();
-}
-
-// errorret_t shaderSetColor(
-//   shader_t *shader,
-//   const char_t *name,
-//   color_t color
-// ) {
-//   assertNotNull(shader, "Shader cannot be null");
-//   assertStrLenMin(name, 1, "Uniform name cannot be empty");
-//   errorChain(shaderSetColorPlatform(shader, name, color));
-//   errorOk();
-// }
-
-errorret_t shaderDispose(shader_t *shader) {
-  assertNotNull(shader, "Shader cannot be null");
-  bound = NULL;
-  errorChain(shaderDisposePlatform(shader));
-  errorOk();
-}

src/dusk/display/shader/shader.h

@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "error/error.h"
-#include "display/texture/texture.h"
-#include "display/shader/shaderplatform.h"
-
-#ifndef shaderInitPlatform
-  #error "shaderInitPlatform must be defined to use shader.h"
-#endif
-#ifndef shaderBindPlatform
-  #error "shaderBindPlatform must be defined to use shader.h"
-#endif
-#ifndef shaderSetMatrixPlatform
-  #error "shaderSetMatrixPlatform must be defined to use shader.h"
-#endif
-#ifndef shaderDisposePlatform
-  #error "shaderDisposePlatform must be defined to use shader.h"
-#endif
-
-typedef shaderplatform_t shader_t;
-typedef shaderdefinitionplatform_t shaderdefinition_t;
-
-/**
- * Initializes a shader. This is platform dependant.
- * 
- * @param shader Shader to initialize
- * @param def Definition of the shader to initialize with.
- * @return Error if failure, otherwise errorOk
- */
-errorret_t shaderInit(shader_t *shader, const shaderdefinition_t *def);
-
-/**
- * Binds a shader. This is platform dependant.
- * 
- * @param shader Shader to bind
- * @return Error if failure, otherwise errorOk
- */
-errorret_t shaderBind(shader_t *shader);
-
-/**
- * Sets a matrix uniform in the shader. This is platform dependant.
- * 
- * @param shader Shader to set the matrix in
- * @param name Name of the uniform to set
- * @param matrix Matrix to set
- * @return Error if failure, otherwise errorOk
- */
-errorret_t shaderSetMatrix(
-  shader_t *shader,
-  const char_t *name,
-  mat4 matrix
-);
-
-/**
- * Sets a texture uniform in the shader. This is platform dependant.
- * 
- * @param shader Shader to set the texture in
- * @param name Name of the uniform to set
- * @param texture Texture to set
- * @return Error if failure, otherwise errorOk
- */
-errorret_t shaderSetTexture(
-  shader_t *shader,
-  const char_t *name,
-  texture_t *texture
-);
-
-/**
- * Sets a color uniform in the shader. This is platform dependant.
- * 
- * @param shader Shader to set the color in
- * @param name Name of the uniform to set
- * @param color Color to set
- * @return Error if failure, otherwise errorOk
- */
-// errorret_t shaderSetColor(
-//   shader_t *shader,
-//   const char_t *name,
-//   color_t color
-// );
-
-/**
- * Disposes of a shader. This is platform dependant.
- * 
- * @param shader Shader to dispose
- * @return Error if failure, otherwise errorOk
- */
-errorret_t shaderDispose(shader_t *shader);

src/dusk/display/shader/shaderunlit.h

@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "shader.h"
-
-#define SHADER_UNLIT_PROJECTION "u_Proj"
-#define SHADER_UNLIT_VIEW "u_View"
-#define SHADER_UNLIT_MODEL "u_Model"
-#define SHADER_UNLIT_TEXTURE "u_Texture"
-// #define SHADER_UNLIT_COLOR "u_Color"
-
-extern shaderdefinition_t SHADER_UNLIT_DEFINITION;
-extern shader_t SHADER_UNLIT;

src/dusk/display/spritebatch/spritebatch.c

@@ -19,12 +19,13 @@ errorret_t spriteBatchInit() {
     &SPRITEBATCH.mesh,
     QUAD_PRIMITIVE_TYPE,
     SPRITEBATCH_VERTEX_COUNT,
-    SPRITEBATCH_VERTICES
+    &SPRITEBATCH_VERTICES[0]
   ));
   errorOk();
 }
 
 errorret_t spriteBatchPush(
+  texture_t *texture,
   const float_t minX,
   const float_t minY,
   const float_t maxX,
@@ -35,16 +36,19 @@ errorret_t spriteBatchPush(
   const float_t u1,
   const float_t v1
 ) {
-  return spriteBatchPush3D(
+  errorChain(spriteBatchPush3D(
+    texture,
     (vec3){ minX, minY, 0 },
     (vec3){ maxX, maxY, 0 },
     color,
     (vec2){ u0, v0 },
     (vec2){ u1, v1 }
-  );
+  ));
+  errorOk();
 }
 
 errorret_t spriteBatchPush3D(
+  texture_t *texture,
   const vec3 min,
   const vec3 max,
   const color_t color,
@@ -52,14 +56,15 @@ errorret_t spriteBatchPush3D(
   const vec2 uv1
 ) {
   // Need to flush?
-  if(SPRITEBATCH.spriteCount >= SPRITEBATCH_SPRITES_MAX_PER_FLUSH) {
+  if(
+    SPRITEBATCH.currentTexture != texture ||
+    SPRITEBATCH.spriteCount >= SPRITEBATCH_SPRITES_MAX
+  ) {
     errorChain(spriteBatchFlush());
+    SPRITEBATCH.currentTexture = texture;
   }
 
-  size_t vertexOffset = (
+  size_t vertexOffset = SPRITEBATCH.spriteCount * QUAD_VERTEX_COUNT;
-    SPRITEBATCH.spriteCount +
-    (SPRITEBATCH.spriteFlush * SPRITEBATCH_SPRITES_MAX_PER_FLUSH)
-  ) * QUAD_VERTEX_COUNT;
   quadBuffer3D(
     &SPRITEBATCH_VERTICES[vertexOffset],
     min, max, color, uv0, uv1
@@ -70,7 +75,7 @@ errorret_t spriteBatchPush3D(
 
 void spriteBatchClear() {
   SPRITEBATCH.spriteCount = 0;
-  SPRITEBATCH.spriteFlush = 0;
+  SPRITEBATCH.currentTexture = NULL;
 }
 
 errorret_t spriteBatchFlush() {
@@ -78,20 +83,11 @@ errorret_t spriteBatchFlush() {
     errorOk();
   }
   
-  size_t vertexCount = QUAD_VERTEX_COUNT * SPRITEBATCH.spriteCount;
+  errorChain(textureBind(SPRITEBATCH.currentTexture));
-  size_t vertexOffset = (
+  errorChain(meshDraw(
-    SPRITEBATCH.spriteFlush * SPRITEBATCH_SPRITES_MAX_PER_FLUSH *
+    &SPRITEBATCH.mesh, 0, QUAD_VERTEX_COUNT * SPRITEBATCH.spriteCount
-    QUAD_VERTEX_COUNT
+  ));
-  );
+  spriteBatchClear();
-  errorChain(meshFlush(&SPRITEBATCH.mesh, vertexOffset, vertexCount));
-  errorChain(meshDraw(&SPRITEBATCH.mesh, vertexOffset, vertexCount));
-
-  SPRITEBATCH.spriteFlush++;
-  if(SPRITEBATCH.spriteFlush >= SPRITEBATCH_FLUSH_COUNT) {
-    SPRITEBATCH.spriteFlush = 0;
-  }
-  SPRITEBATCH.spriteCount = 0;
-
   errorOk();
 }
 

src/dusk/display/spritebatch/spritebatch.h

@@ -7,18 +7,16 @@
 
 #pragma once
 #include "display/mesh/quad.h"
+#include "display/texture/texture.h"
 
-#define SPRITEBATCH_SPRITES_MAX 32
+#define SPRITEBATCH_SPRITES_MAX 16
 #define SPRITEBATCH_VERTEX_COUNT (SPRITEBATCH_SPRITES_MAX * QUAD_VERTEX_COUNT) 
-#define SPRITEBATCH_FLUSH_COUNT 4
+
-#define SPRITEBATCH_SPRITES_MAX_PER_FLUSH (\
-  SPRITEBATCH_SPRITES_MAX / SPRITEBATCH_FLUSH_COUNT \
-)
 
 typedef struct {
   mesh_t mesh;
   int32_t spriteCount;
-  int32_t spriteFlush;
+  texture_t *currentTexture;
 } spritebatch_t;
 
 // Have to define these seperately because of alignment in certain platforms.
@@ -41,6 +39,7 @@ errorret_t spriteBatchInit();
  * Currently changing texture pointer will cause the buffer to flush but this is
  * also likely to change in the future.
  * 
+ * @param texture The texture to use for the sprite.
  * @param minX The minimum x coordinate of the sprite.
  * @param minY The minimum y coordinate of the sprite.
  * @param maxX The maximum x coordinate of the sprite.
@@ -53,6 +52,7 @@ errorret_t spriteBatchInit();
  * @return An error code indicating success or failure.
  */
 errorret_t spriteBatchPush(
+  texture_t *texture,
   const float_t minX,
   const float_t minY,
   const float_t maxX,
@@ -68,6 +68,7 @@ errorret_t spriteBatchPush(
  * Pushes a 3D sprite to the batch. This is like spriteBatchPush but takes
  * 3D coordinates instead of 2D.
  * 
+ * @param texture The texture to use for the sprite.
  * @param min The minimum (x,y,z) coordinate of the sprite.
  * @param max The maximum (x,y,z) coordinate of the sprite.
  * @param color The color to tint the sprite with.
@@ -76,6 +77,7 @@ errorret_t spriteBatchPush(
  * @return An error code indicating success or failure.
  */
 errorret_t spriteBatchPush3D(
+  texture_t *texture,
   const vec3 min,
   const vec3 max,
   const color_t color,

src/dusk/display/text/text.c

@@ -9,23 +9,19 @@
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "display/spritebatch/spritebatch.h"
-#include "asset/loader/display/assettextureloader.h"
+#include "asset/asset.h"
-#include "asset/loader/display/assettilesetloader.h"
-#include "display/shader/shaderunlit.h"
 
 texture_t DEFAULT_FONT_TEXTURE;
 tileset_t DEFAULT_FONT_TILESET;
 
 errorret_t textInit(void) {
-  errorChain(assetTextureLoad(
+  // errorChain(assetLoad("ui/minogram.dpt", &DEFAULT_FONT_TEXTURE));
-    "ui/minogram.png", &DEFAULT_FONT_TEXTURE, TEXTURE_FORMAT_RGBA
+  // errorChain(assetLoad("ui/minogram.dtf", &DEFAULT_FONT_TILESET));
-  ));
-  errorChain(assetTilesetLoad("ui/minogram.dtf", &DEFAULT_FONT_TILESET));
   errorOk();
 }
 
 errorret_t textDispose(void) {
-  errorChain(textureDispose(&DEFAULT_FONT_TEXTURE));
+  // errorChain(textureDispose(&DEFAULT_FONT_TEXTURE));
   errorOk();
 }
 
@@ -49,9 +45,8 @@ errorret_t textDrawChar(
   vec4 uv;
   tilesetTileGetUV(tileset, tileIndex, uv);
 
-
   errorChain(spriteBatchPush(
-    // texture,
+    texture,
     x, y,
     x + tileset->tileWidth,
     y + tileset->tileHeight,
@@ -75,17 +70,6 @@ errorret_t textDraw(
   float_t posX = x;
   float_t posY = y;
 
-  errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture));
-
-  // errorChain(spriteBatchPush(
-  //   // texture,
-  //   posX, posY,
-  //   posX + texture->width * 1, posY + texture->height * 1,
-  //   color,
-  //   0.0f, 0.0f, 1.0f, 1.0f
-  // ));
-  // errorOk();
-
   char_t c;
   int32_t i = 0;
   while((c = text[i++]) != '\0') {

src/dusk/display/texture/CMakeLists.txt

@@ -8,5 +8,4 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
     tileset.c
     texture.c
-    palette.c
 )

src/dusk/display/texture/palette.c

@@ -1,10 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "palette.h"
-
-palette_t PALETTES[PALETTE_COUNT];

src/dusk/display/texture/palette.h

@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "display/color.h"
-
-#define PALETTE_COLOR_COUNT 0xFF
-#define PALETTE_COUNT 6
-
-typedef struct {
-  color_t colors[PALETTE_COLOR_COUNT];
-  uint8_t count;
-} palette_t;
-
-extern palette_t PALETTES[PALETTE_COUNT];

src/dusk/display/texture/texture.c

@@ -11,6 +11,8 @@
 #include "util/math.h"
 #include "display/display.h"
 
+texture_t *TEXTURE_BOUND = NULL;
+
 errorret_t textureInit(
   texture_t *texture,
   const int32_t width,
@@ -23,18 +25,6 @@ errorret_t textureInit(
   assertTrue(width == mathNextPowTwo(width), "Width must be a power of 2.");
   assertTrue(height == mathNextPowTwo(height), "Height must be a power of 2.");
 
-  if(texture->format == TEXTURE_FORMAT_RGBA) {
-    assertNotNull(data.rgbaColors, "RGBA color data cannot be NULL");
-  } else if(texture->format == TEXTURE_FORMAT_PALETTE) {
-    assertNotNull(data.paletted.indices, "Palette indices cannot be NULL");
-    assertNotNull(data.paletted.palette, "Palette colors cannot be NULL");
-    assertTrue(
-      data.paletted.palette->count ==
-      mathNextPowTwo(data.paletted.palette->count),
-      "Palette color count must be a power of 2"
-    );
-  }
-
   memoryZero(texture, sizeof(texture_t));
   texture->width = width;
   texture->height = height;
@@ -44,9 +34,18 @@ errorret_t textureInit(
   errorOk();
 }
 
+errorret_t textureBind(texture_t *texture) {
+  errorChain(textureBindPlatform(texture));
+  errorOk();
+}
+
 errorret_t textureDispose(texture_t *texture) {
   assertNotNull(texture, "Texture cannot be NULL");
 
+  if(TEXTURE_BOUND == texture) {
+    textureBind(NULL);
+  }
+
   errorChain(textureDisposePlatform(texture));
   errorOk();
 }

src/dusk/display/texture/texture.h

@@ -7,12 +7,15 @@
 
 #pragma once
 #include "error/error.h"
-#include "display/texture/palette.h"
+#include "display/color.h"
 #include "display/texture/textureplatform.h"
 
 #ifndef textureInitPlatform
   #error "textureInitPlatform should not be defined."
 #endif
+#ifndef textureBindPlatform
+  #error "textureBindPlatform should not be defined."
+#endif
 #ifndef textureDisposePlatform
   #error "textureDisposePlatform should not be defined."
 #endif
@@ -21,13 +24,12 @@ typedef textureformatplatform_t textureformat_t;
 typedef textureplatform_t texture_t;
 
 typedef union texturedata_u {
-  struct {
+  uint8_t *paletteData;
-    uint8_t *indices;
-    palette_t *palette;
-  } paletted;
   color_t *rgbaColors;
 } texturedata_t;
 
+extern texture_t *TEXTURE_BOUND;
+
 /**
  * Initializes a texture.
  * 
@@ -45,6 +47,13 @@ errorret_t textureInit(
   const texturedata_t data
 );
 
+/**
+ * Binds a texture for rendering. Providing NULL will unbind any texture.
+ * 
+ * @param texture The texture to bind.
+ */
+errorret_t textureBind(texture_t *texture);
+
 /**
  * Disposes a texture.
  * 

src/dusk/engine/engine.c

@@ -14,11 +14,10 @@
 #include "scene/scene.h"
 #include "asset/asset.h"
 #include "ui/ui.h"
+#include "map/map.h"
 #include "script/scriptmanager.h"
+#include "item/backpack.h"
 #include "assert/assert.h"
-#include "game/game.h"
-
-#include "asset/loader/json/assetjsonloader.h"
 
 engine_t ENGINE;
 
@@ -36,8 +35,9 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) {
   errorChain(scriptManagerInit());
   errorChain(displayInit());
   errorChain(uiInit());
+  errorChain(mapInit());
   errorChain(sceneInit());
-  errorChain(gameInit());
+  backpackInit();
   
   // Run the initial script.
   scriptcontext_t ctx;
@@ -54,7 +54,7 @@ errorret_t engineUpdate(void) {
 
   uiUpdate();
   errorChain(sceneUpdate());
-  errorChain(gameUpdate());
+  mapUpdate();
   errorChain(displayUpdate());
 
   if(inputPressed(INPUT_ACTION_RAGEQUIT)) ENGINE.running = false;
@@ -68,7 +68,7 @@ void engineExit(void) {
 
 errorret_t engineDispose(void) {
   sceneDispose();
-  errorChain(gameDispose());
+  mapDispose();
   localeManagerDispose();
   uiDispose();
   errorChain(displayDispose());

src/dusk/locale/locale.h

@@ -5,6 +5,9 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "shaderunlit.h"
+#pragma once
+#include "dusk.h"
 
-shader_t SHADER_UNLIT = { 0 };
+typedef struct {
+  void *nothing;
+} dusklocale_t;

src/dusk/locale/localeinfo.h

@@ -9,11 +9,5 @@
 #include "dusk.h"
 
 typedef struct {
-  const char_t *name;
   const char_t *file;
 } localeinfo_t;
-
-static const localeinfo_t LOCALE_EN_US = {
-  .name = "en-US",
-  .file = "locale/en_US.po",
-};

src/dusk/locale/localemanager.c

@@ -7,34 +7,32 @@
 
 #include "localemanager.h"
 #include "util/memory.h"
+#include "asset/asset.h"
 #include "assert/assert.h"
 
 localemanager_t LOCALE;
 
 errorret_t localeManagerInit() {
   memoryZero(&LOCALE, sizeof(localemanager_t));
-
-  errorChain(localeManagerSetLocale(&LOCALE_EN_US));
-
   errorOk();
 }
 
-errorret_t localeManagerSetLocale(const localeinfo_t *locale) {
+errorret_t localeManagerSetLocale(const dusklocale_t locale) {
-  if(LOCALE.fileOpen) {
+  errorThrow("Locale setting is not yet implemented.");
-    errorChain(assetLocaleFileDispose(&LOCALE.file));
+  // assertTrue(locale < DUSK_LOCALE_COUNT, "Invalid locale.");
-    LOCALE.fileOpen = false;
+  // assertTrue(locale != DUSK_LOCALE_NULL, "Cannot set locale to NULL.");
-  }
 
-  // Init the asset file
+  // LOCALE.locale = locale;
-  errorChain(assetLocaleFileInit(&LOCALE.file, locale->file));
+  // char_t languageFile[FILENAME_MAX];
-  LOCALE.fileOpen = true;
+  // snprintf(
-
+  //   languageFile, FILENAME_MAX, "language/%s.dlf", LOCALE_INFOS[locale].file
-  errorOk();
+  // );
+  // assetLanguageDispose(&LOCALE.language);
+  // memoryZero(&LOCALE.language, sizeof(assetlanguage_t));
+  // errorChain(assetLoad(languageFile, &LOCALE.language));
+  // errorOk();
 }
 
 void localeManagerDispose() {
-  if(LOCALE.fileOpen) {
+  assetLanguageDispose(&LOCALE.language);
-    errorCatch(errorPrint(assetLocaleFileDispose(&LOCALE.file)));
-    LOCALE.fileOpen = false;
-  }
 }

src/dusk/locale/localemanager.h

@@ -6,15 +6,13 @@
  */
 
 #pragma once
-#include "error/error.h"
+#include "asset/asset.h"
 #include "localemanager.h"
-#include "locale/localeinfo.h"
+#include "locale/locale.h"
-#include "asset/loader/locale/assetlocaleloader.h"
 
 typedef struct {
-  const localeinfo_t *locale;
+  dusklocale_t locale;
-  assetlocalefile_t file;
+  assetlanguage_t language;
-  bool_t fileOpen;
 } localemanager_t;
 
 extern localemanager_t LOCALE;
@@ -32,51 +30,7 @@ errorret_t localeManagerInit();
  * @param locale The locale to set.
  * @return An error code if a failure occurs.
  */
-errorret_t localeManagerSetLocale(const localeinfo_t *locale);
+errorret_t localeManagerSetLocale(const dusklocale_t locale);
-
-/**
- * Get a localized string for the given message ID.
- * 
- * @param id The message ID to retrieve.
- * @param buffer Buffer to write the retrieved string to.
- * @param bufferSize Size of the buffer.
- * @param plural Plural index to retrieve.
- * @param ... Additional arguments for formatting the string.
- * @return An error code if a failure occurs.
- */
-#define localeManagerGetText(id, buffer, bufferSize, plural, ...) \
-  assetLocaleGetStringWithVA( \
-    &LOCALE.file, \
-    id, \
-    plural, \
-    buffer, \
-    bufferSize, \
-    __VA_ARGS__ \
-  )
-
-/**
- * Get a localized string for the given message ID with a list of arguments.
- * 
- * @param id The message ID to retrieve.
- * @param buffer Buffer to write the retrieved string to.
- * @param bufferSize Size of the buffer.
- * @param plural Plural index to retrieve.
- * @param args List of arguments for formatting the string.
- * @param argCount Number of arguments in the list.
- * @return An error code if a failure occurs.
- */
-#define localeManagerGetTextArgs( \
-  id, buffer, bufferSize, plural, args, argCount \
-) \
-  assetLocaleGetStringWithArgs( \
-    &LOCALE.file, \
-    id, \
-    plural, \
-    buffer, \
-    bufferSize, \
-    args, \
-    argCount \
-  )
 
 /**
  * Dispose of the locale system.

src/dusk/map/map.c

@@ -176,7 +176,7 @@ void mapUpdate() {
 void mapRender() {
   if(!mapIsLoaded()) return;
 
-  // textureBind(NULL);
+  textureBind(NULL);
   for(chunkindex_t i = 0; i < MAP_CHUNK_COUNT; i++) {
     mapChunkRender(&MAP.chunks[i]);
   }