New ramp types

Reviewed-on: #5

.github/actions/setup-devkitpro/action.yml

@@ -0,0 +1,49 @@
+name: Setup devkitPro
+description: Install devkitPro with GameCube/Wii packages on an Ubuntu runner
+
+runs:
+  using: composite
+  steps:
+    - name: Install apt dependencies
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          cmake \
+          python3 \
+          python3-pip \
+          python3-polib \
+          python3-pil \
+          python3-dotenv \
+          python3-pyqt5 \
+          python3-opengl \
+          xorriso
+    - name: Install devkitPro pacman
+      shell: bash
+      run: |
+        sudo ln -sf /proc/self/mounts /etc/mtab
+        wget https://apt.devkitpro.org/install-devkitpro-pacman \
+          -O /tmp/install-devkitpro-pacman
+        echo "=== installer script contents ==="
+        cat /tmp/install-devkitpro-pacman
+        echo "================================="
+        chmod +x /tmp/install-devkitpro-pacman
+        sudo /tmp/install-devkitpro-pacman
+        echo "DEVKITPRO=/opt/devkitpro" >> $GITHUB_ENV
+        echo "DEVKITPPC=/opt/devkitpro/devkitPPC" >> $GITHUB_ENV
+        echo "/opt/devkitpro/tools/bin" >> $GITHUB_PATH
+        echo "/opt/devkitpro/devkitPPC/bin" >> $GITHUB_PATH
+    - name: Install devkitPro GameCube/Wii packages
+      shell: bash
+      run: |
+        sudo dkp-pacman -S --needed --noconfirm \
+          gamecube-dev \
+          gamecube-sdl2 \
+          ppc-liblzma \
+          ppc-libzip \
+          libogc2 \
+          gamecube-tools \
+          ppc-libmad \
+          ppc-zlib-ng \
+          ppc-bzip2 \
+          ppc-zstd

.github/actions/setup-pspdev/action.yml

@@ -0,0 +1,20 @@
+name: Setup pspdev
+description: Install the pspdev PSP toolchain on an Ubuntu runner
+
+runs:
+  using: composite
+  steps:
+    - name: Install dependencies
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake python3 python3-pip python3-dotenv
+    - name: Install pspdev toolchain
+      shell: bash
+      run: |
+        wget -q \
+          https://github.com/pspdev/pspdev/releases/latest/download/pspdev-ubuntu-latest-x86_64.tar.gz \
+          -O /tmp/pspdev.tar.gz
+        sudo tar -xzf /tmp/pspdev.tar.gz -C /usr/local
+        echo "PSPDEV=/usr/local/pspdev" >> $GITHUB_ENV
+        echo "/usr/local/pspdev/bin" >> $GITHUB_PATH

.github/workflows/build.yml

@@ -8,23 +8,63 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
-      - name: Run tests in Docker
+          sudo apt-get update
-        run: ./scripts/test-linux-docker.sh
+          sudo apt-get install -y \
+            build-essential \
+            cmake \
+            python3 \
+            python3-pip \
+            python3-polib \
+            python3-pil \
+            libsdl2-dev \
+            libgl1-mesa-dev \
+            libzip-dev \
+            python3-dotenv \
+            python3-pyqt5 \
+            python3-opengl \
+            xz-utils \
+            liblzma-dev \
+            libbz2-dev \
+            zlib1g-dev \
+            git \
+            libssl-dev
+      - name: Run tests
+        run: ./scripts/test-linux.sh
 
   build-linux:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            build-essential \
+            cmake \
+            python3 \
+            python3-pip \
+            python3-polib \
+            python3-pil \
+            libsdl2-dev \
+            libgl1-mesa-dev \
+            libzip-dev \
+            python3-dotenv \
+            python3-pyqt5 \
+            python3-opengl \
+            xz-utils \
+            liblzma-dev \
+            libbz2-dev \
+            zlib1g-dev \
+            git \
+            libssl-dev
       - name: Build Linux
-        run: ./scripts/build-linux-docker.sh
+        run: ./scripts/build-linux.sh
       - name: Upload Linux binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-linux
           path: build-linux/Dusk
@@ -34,53 +74,72 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Setup pspdev
-        uses: docker/setup-docker-action@v5
+        uses: ./.github/actions/setup-pspdev
-      - name: Build psp
+      - name: Build PSP
-        run: ./scripts/build-psp-docker.sh
+        run: ./scripts/build-psp.sh
       - name: Move EBOOT.PBP to Dusk subfolder
         run: |
           mkdir -p ./git-artifcats/Dusk/PSP/GAME/Dusk
           cp build-psp/EBOOT.PBP ./git-artifcats/Dusk/PSP/GAME/Dusk/EBOOT.PBP
-      - name: Upload psp binary
+      - name: Upload PSP binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-psp
           path: ./git-artifcats/Dusk
           if-no-files-found: error
 
-  # build-vita:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v6
-  #     - name: Set up Docker
-  #       uses: docker/setup-docker-action@v5
-  #     - name: Build Vita
-  #       run: ./scripts/build-vita-docker.sh
-  #     - name: Upload Vita binary
-  #       uses: actions/upload-artifact@v6
-  #       with:
-  #         name: dusk-vita
-  #         path: build-vita/Dusk.vpk
-  #         if-no-files-found: error
-
   build-knulli:
     runs-on: ubuntu-latest
+    container:
+      image: debian:trixie
     steps:
+      - name: Install Node.js
+        run: apt-get update && apt-get install -y nodejs
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
-      - name: Build knulli
+          dpkg --add-architecture arm64
-        run: ./scripts/build-knulli-docker.sh
+          apt-get update
+          apt-get install -y --no-install-recommends \
+            crossbuild-essential-arm64 \
+            ca-certificates \
+            pkg-config \
+            cmake \
+            make \
+            ninja-build \
+            git \
+            file \
+            python3 \
+            python3-pip \
+            python3-polib \
+            python3-pil \
+            python3-dotenv \
+            python3-pyqt5 \
+            python3-opengl \
+            liblua5.4-dev:arm64 \
+            xz-utils:arm64 \
+            libbz2-dev:arm64 \
+            zlib1g-dev:arm64 \
+            libzip-dev:arm64 \
+            libssl-dev:arm64 \
+            libsdl2-dev:arm64 \
+            liblzma-dev:arm64 \
+            libopengl0:arm64 \
+            libgl1:arm64 \
+            libegl1:arm64 \
+            libgles2:arm64 \
+            libgl1-mesa-dev:arm64
+      - name: Build Knulli
+        run: ./scripts/build-knulli.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
+      - name: Upload Knulli binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-knulli
           path: ./git-artifcats/Dusk
@@ -88,20 +147,31 @@ jobs:
 
   build-gamecube:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/extremscorner/libogc2:latest
     steps:
+      - name: Install Node.js
+        run: apt-get update && apt-get install -y nodejs
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install additional dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
+          apt-get install -y \
+            python3-pip python3-polib python3-pil \
+            python3-dotenv python3-pyqt5 python3-opengl
+          dkp-pacman -Syu --noconfirm
+          dkp-pacman -S --needed --noconfirm \
+            gamecube-sdl2 ppc-liblzma ppc-libzip \
+            gamecube-tools ppc-libmad ppc-zlib-ng ppc-bzip2 ppc-zstd
       - name: Build GameCube
-        run: ./scripts/build-gamecube-docker.sh
+        run: ./scripts/build-gamecube.sh
-      - name: Copy output files.
+      - name: Copy output files
         run: |
           mkdir -p ./git-artifcats/Dusk
           cp build-gamecube/Dusk.dol ./git-artifcats/Dusk/Dusk.dol
           cp build-gamecube/dusk.dsk ./git-artifcats/Dusk/dusk.dsk
       - name: Upload GameCube binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-gamecube
           path: ./git-artifcats/Dusk
@@ -109,21 +179,32 @@ jobs:
 
   build-gamecube-iso:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/extremscorner/libogc2:latest
     steps:
+      - name: Install Node.js
+        run: apt-get update && apt-get install -y nodejs
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install additional dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
+          apt-get install -y \
+            python3-pip python3-polib python3-pil \
+            python3-dotenv python3-pyqt5 python3-opengl xorriso
+          dkp-pacman -Syu --noconfirm
+          dkp-pacman -S --needed --noconfirm \
+            gamecube-sdl2 ppc-liblzma ppc-libzip \
+            gamecube-tools ppc-libmad ppc-zlib-ng ppc-bzip2 ppc-zstd
       - name: Build GameCube ISO
-        run: ./scripts/build-gamecube-iso-docker.sh
+        run: ./scripts/build-gamecube-iso.sh
-      - name: Copy output files.
+      - name: Copy output files
         run: |
           mkdir -p ./git-artifcats/Dusk
           cp build-gamecube-iso/Dusk-NTSC-J.iso ./git-artifcats/Dusk/Dusk-NTSC-J.iso
           cp build-gamecube-iso/Dusk-NTSC-U.iso ./git-artifcats/Dusk/Dusk-NTSC-U.iso
           cp build-gamecube-iso/Dusk-PAL.iso    ./git-artifcats/Dusk/Dusk-PAL.iso
       - name: Upload GameCube ISO
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-gamecube-iso
           path: ./git-artifcats/Dusk
@@ -131,21 +212,32 @@ jobs:
 
   build-wii:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/extremscorner/libogc2:latest
     steps:
+      - name: Install Node.js
+        run: apt-get update && apt-get install -y nodejs
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install additional dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
+          apt-get install -y \
+            python3-pip python3-polib python3-pil \
+            python3-dotenv python3-pyqt5 python3-opengl
+          dkp-pacman -Syu --noconfirm
+          dkp-pacman -S --needed --noconfirm \
+            gamecube-sdl2 ppc-liblzma ppc-libzip \
+            gamecube-tools ppc-libmad ppc-zlib-ng ppc-bzip2 ppc-zstd
       - name: Build Wii
-        run: ./scripts/build-wii-docker.sh
+        run: ./scripts/build-wii.sh
-      - name: Copy output files.
+      - name: Copy output files
         run: |
           mkdir -p ./git-artifcats/Dusk/apps/Dusk
           cp build-wii/boot.dol ./git-artifcats/Dusk/apps/Dusk/boot.dol
           cp build-wii/dusk.dsk ./git-artifcats/Dusk/apps/Dusk/dusk.dsk
           cp build-wii/meta.xml ./git-artifcats/Dusk/apps/Dusk/meta.xml
       - name: Upload Wii binary
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-wii
           path: ./git-artifcats/Dusk
@@ -153,21 +245,32 @@ jobs:
 
   build-wii-iso:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/extremscorner/libogc2:latest
     steps:
+      - name: Install Node.js
+        run: apt-get update && apt-get install -y nodejs
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-      - name: Set up Docker
+      - name: Install additional dependencies
-        uses: docker/setup-docker-action@v5
+        run: |
+          apt-get install -y \
+            python3-pip python3-polib python3-pil \
+            python3-dotenv python3-pyqt5 python3-opengl xorriso
+          dkp-pacman -Syu --noconfirm
+          dkp-pacman -S --needed --noconfirm \
+            gamecube-sdl2 ppc-liblzma ppc-libzip \
+            gamecube-tools ppc-libmad ppc-zlib-ng ppc-bzip2 ppc-zstd
       - name: Build Wii ISO
-        run: ./scripts/build-wii-iso-docker.sh
+        run: ./scripts/build-wii-iso.sh
-      - name: Copy output files.
+      - name: Copy output files
         run: |
           mkdir -p ./git-artifcats/Dusk
           cp build-wii-iso/Dusk-NTSC-J.iso ./git-artifcats/Dusk/Dusk-NTSC-J.iso
           cp build-wii-iso/Dusk-NTSC-U.iso ./git-artifcats/Dusk/Dusk-NTSC-U.iso
           cp build-wii-iso/Dusk-PAL.iso    ./git-artifcats/Dusk/Dusk-PAL.iso
       - name: Upload Wii ISO
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v3
         with:
           name: dusk-wii-iso
           path: ./git-artifcats/Dusk

CLAUDE.md

@@ -423,6 +423,29 @@ above the declaration with no blank line in between.
 
 ---
 
+## Color system
+
+Colors are defined in `src/dusk/display/color.csv` and code-generated
+into a `color.h` header by `tools/color/csv/__main__.py`.
+
+Each row in the CSV has `name,r,g,b,a` with channel values in `[0.0, 1.0]`.
+The script emits four `#define` variants per color plus a bare alias:
+
+```
+COLOR_<NAME>_4B   color4b(r8, g8, b8, a8)   // default alias target
+COLOR_<NAME>_3B   color3b(r8, g8, b8)
+COLOR_<NAME>_3F   color3f(rf, gf, bf)
+COLOR_<NAME>_4F   color4f(rf, gf, bf, af)
+COLOR_<NAME>      COLOR_<NAME>_4B
+```
+
+`color_t` is `color4b_t` (four `uint8_t` channels).
+
+To add a new color, append a row to `color.csv` and rebuild — do not
+hand-edit the generated header.
+
+---
+
 ## Tests
 - Tests live in `test/` mirroring `src/dusk/` structure.
 - Use cmocka; include `dusktest.h`.

assets/models/buildings/house_1_1.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_1.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_2.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_2.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_3.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_3.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_4.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_4.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_5.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_5.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_6.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_6.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_7.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_7.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_8.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_8.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_1.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_1.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_2.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_2.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_3.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_3.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_4.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_4.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_5.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_5.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_6.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_6.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_7.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_7.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_8.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_8.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_3_1.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_3_1.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_3_2.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_3_2.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_3_3.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_3_3.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_3_4.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_3_4.dmf",
+  "color": [255, 0, 255, 255]
+}