diff --git a/examples/PoolBox/application/src/main.cpp b/examples/PoolBox/application/src/main.cpp index 3ed8043a..a3d61dc3 100644 --- a/examples/PoolBox/application/src/main.cpp +++ b/examples/PoolBox/application/src/main.cpp @@ -7,12 +7,14 @@ enum LBA { __jabyengine_start_lba_request __jabyengine_request_lba_for(FONT, "ASSETS/FONT.BIN"), + __jabyengine_request_lba_for(ICON, "ASSETS/ICON.BIN"), __jabyengine_end_lba_request }; static void load_assets() { static const JabyEngine::CDFile Assets[] = { - JabyEngine::CDFileBuilder::simple_tim(LBA::FONT, JabyEngine::SimpleTIM(320, 0, 320, 256)), + JabyEngine::CDFileBuilder::simple_tim(LBA::FONT, JabyEngine::SimpleTIM(320, 0, 320, 510)), + JabyEngine::CDFileBuilder::simple_tim(LBA::ICON, JabyEngine::SimpleTIM(320, 256, 320, 511)), }; const auto buffer_cfg = JabyEngine::CDFileProcessor::BufferConfiguration::new_default(); @@ -44,7 +46,7 @@ void main() { const JabyEngine::GPU::POLY_FT3 triangle2( {{0, 0}, {64, 0}, {64, 64}}, {{0, 0}, {64, 0}, {64, 64}}, JabyEngine::GPU::TPage(320, 0, JabyEngine::GPU::SemiTransparency::B_Half_add_F_Half, JabyEngine::GPU::TexturePageColor::$4bit), - JabyEngine::GPU::PageClut(320, 256), + JabyEngine::GPU::PageClut(320, 510), JabyEngine::GPU::Color24(0xFF, 0xFF, 0xFF)); const JabyEngine::GPU::POLY_G3 triangle3({ {{0 + FirstOffsetX, 0}, {0xFF, 0x0, 0x0}}, @@ -55,7 +57,7 @@ void main() { {{64 + FirstOffsetX, 64}, {64, 64}, {0x0, 0x0, 0xFF}}, {{64 + FirstOffsetX, 0}, {64, 0}, {0x0, 0xFF, 0x0}}}, JabyEngine::GPU::TPage(320, 0, JabyEngine::GPU::SemiTransparency::B_Half_add_F_Half, JabyEngine::GPU::TexturePageColor::$4bit), - JabyEngine::GPU::PageClut(320, 256)); + JabyEngine::GPU::PageClut(320, 510)); load_assets(); diff --git a/examples/PoolBox/assets/IconTexture.png b/examples/PoolBox/assets/IconTexture.png new file mode 100644 index 00000000..3fefb9c8 --- /dev/null +++ b/examples/PoolBox/assets/IconTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f607226a3415638de7e65be597dd6e9e7049addc69334f88bcb94f4611454246 +size 28329 diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index ed4344e0..d898dbb8 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -7,7 +7,11 @@ $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png @mkdir -p $(OUTPUT_DIR) jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 -all: $(OUTPUT_DIR)/TexturePage.bin +$(OUTPUT_DIR)/IconTexture.bin: IconTexture.png + @mkdir -p $(OUTPUT_DIR) + jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 + +all: $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin clean: rm -fr $(OUTPUT_DIR) \ No newline at end of file diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index 2c265b3c..c2ef9bf9 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -8,6 +8,7 @@
application/bin/PSX-release/PoolBox.psexe
assets/bin/TexturePage.bin + assets/bin/IconTexture.bin \ No newline at end of file