diff --git a/.ci/dolphin/build-gamecube.sh b/.ci/dolphin/build-gamecube.sh index 508d267..21124b9 100755 --- a/.ci/dolphin/build-gamecube.sh +++ b/.ci/dolphin/build-gamecube.sh @@ -8,6 +8,6 @@ docker run -it -v ./:/workdir myapp:latest /bin/bash -c ' \ # cmake -S. -Bbuild2 -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" && \ cmake -S. -Bbuild2 -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" && \ cd build2 && \ - make VERBOSE=1 && \ + make -j$(nproc) VERBOSE=1 && \ cp ./Dusk.dol ./boot.dol ' \ No newline at end of file diff --git a/.ci/dolphin/build-wii.sh b/.ci/dolphin/build-wii.sh index 1754a18..8e33f68 100755 --- a/.ci/dolphin/build-wii.sh +++ b/.ci/dolphin/build-wii.sh @@ -7,7 +7,7 @@ docker run -v ./:/workdir myapp:latest /bin/bash -c ' \ mkdir -p build-wii && \ cmake -S. -Bbuild-wii -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" && \ cd build-wii && \ - make VERBOSE=1 && \ + make -j$(nproc) VERBOSE=1 && \ mv ./Dusk.dol ./boot.dol ' # docker run -it -v ./:/workdir myapp:latest /bin/bash \ No newline at end of file diff --git a/.ci/psp/build-psp.sh b/.ci/psp/build-psp.sh new file mode 100755 index 0000000..0c2ece1 --- /dev/null +++ b/.ci/psp/build-psp.sh @@ -0,0 +1,5 @@ +#!/bin/bash +mkdir -p build-psp +cd build-psp +cmake .. -DDUSK_TARGET_SYSTEM=psp +make -j$(nproc) \ No newline at end of file diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 3a13b06..3fa8700 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -118,7 +118,7 @@ jobs: mkdir -p build-gamecube cmake -S. -Bbuild-gamecube -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" cd build-gamecube - make VERBOSE=1 + make -j$(nproc) VERBOSE=1 - name: Copy GameCube run: | @@ -142,7 +142,7 @@ jobs: mkdir -p build-wii cmake -S. -Bbuild-wii -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" cd build-wii - make VERBOSE=1 + make -j$(nproc) VERBOSE=1 - name: Copy Wii run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 93c0dd7..35aefb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,8 +38,6 @@ file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR}) find_package(Python3 COMPONENTS Interpreter REQUIRED) # Set target system -# message(FATAL_ERROR "DISABLED FOR NOW2 ${DUSK_TARGET_SYSTEM}") - if(NOT DEFINED DUSK_TARGET_SYSTEM) set(DUSK_TARGET_SYSTEM "linux") # set(DUSK_TARGET_SYSTEM "psp") diff --git a/assets/ui/CMakeLists.txt b/assets/ui/CMakeLists.txt index a35c226..3456289 100644 --- a/assets/ui/CMakeLists.txt +++ b/assets/ui/CMakeLists.txt @@ -3,5 +3,5 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -add_asset(TILESET minogram.png type=ALPHA tileWidth=6 tileHeight=10 columns=16 rows=6)# Fixes PSP rendering -# add_asset(TILESET minogram.png type=PALETTIZED tileWidth=6 tileHeight=10 columns=16 rows=6)# Fixes PSP rendering \ No newline at end of file +# add_asset(TILESET minogram.png type=ALPHA tileWidth=6 tileHeight=10 columns=16 rows=6) +add_asset(TILESET minogram.png type=PALETTIZED tileWidth=6 tileHeight=10 columns=16 rows=6)# Fixes PSP rendering \ No newline at end of file diff --git a/src/display/texture.c b/src/display/texture.c index 7c923b3..61431d6 100644 --- a/src/display/texture.c +++ b/src/display/texture.c @@ -51,6 +51,14 @@ void textureInit( break; case TEXTURE_FORMAT_ALPHA: + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); + // RGB = vertex color + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); + glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR); + // A = texture alpha + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE); + glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE); + glTexImage2D( GL_TEXTURE_2D, 0, format, width, height, 0, format, GL_UNSIGNED_BYTE, (void*)data.alpha.data