diff --git a/examples/PoolBox/application/src/assets.hpp b/examples/PoolBox/application/src/assets.hpp index a92673eb..c70f17dc 100644 --- a/examples/PoolBox/application/src/assets.hpp +++ b/examples/PoolBox/application/src/assets.hpp @@ -6,6 +6,7 @@ namespace Assets { using namespace JabyEngine; static constexpr auto FontTIM = SimpleTIM(960, 0, 960, 511); + static constexpr auto PacoTIM = SimpleTIM(896, 0, 960, 510); void load_for_main(); } diff --git a/examples/PoolBox/application/src/main.cpp b/examples/PoolBox/application/src/main.cpp index f29aee5e..03ebc201 100644 --- a/examples/PoolBox/application/src/main.cpp +++ b/examples/PoolBox/application/src/main.cpp @@ -1,19 +1,30 @@ #include "FontWriter/font_writer.hpp" #include "assets.hpp" -#include #include +#include #include #include using namespace JabyEngine; static SimpleTimer timer; +static auto paco_texpage = GPU::TexPage( + {Assets::PacoTIM.get_texture_x(), Assets::PacoTIM.get_texture_y()}, + GPU::TexturePageColor::$4bit +).linked(); +static auto paco = GPU::SPRT( + // This pic used to be 122px (file size) and every tool would except it - however the display would be corrupt. Try it!! + GPU::AreaI16({0, 100}, {120, 128}), + GPU::PagePositionClut({0, 0}, GPU::PageClut(Assets::PacoTIM.get_clut_x(), Assets::PacoTIM.get_clut_y())), + GPU::Color24::Grey() +).linked(); static void setup() { Assets::load_for_main(); FontWriter::setup(); timer.reset(); + paco_texpage.concat(paco); } static void update() { @@ -28,6 +39,7 @@ static void update() { static void render() { GPU::swap_buffers_vsync(1); + GPU::render(paco_texpage); FontWriter::render(); } diff --git a/examples/PoolBox/application/src/main_assets.cpp b/examples/PoolBox/application/src/main_assets.cpp index b3ea8041..241d59e1 100644 --- a/examples/PoolBox/application/src/main_assets.cpp +++ b/examples/PoolBox/application/src/main_assets.cpp @@ -6,6 +6,7 @@ namespace Assets { enum LBA { __jabyengine_start_lba_request __jabyengine_request_lba_for(FONT, "ASSETS/MAIN/FONT.BIN"), + __jabyengine_request_lba_for(PACO, "ASSETS/MAIN/PACO.BIN"), __jabyengine_end_lba_request }; @@ -14,6 +15,7 @@ namespace Assets { void load_for_main() { static const CDFile Assets[] = { CDFileBuilder::simple_tim(LBA::FONT, FontTIM), + CDFileBuilder::simple_tim(LBA::PACO, PacoTIM), }; const auto buffer_cfg = CDFileProcessor::BufferConfiguration::new_default(); diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index ba1dc0ad..012b4b7a 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -2,6 +2,7 @@ include $(JABY_ENGINE_DIR)/lib/ExportPath.mk include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk OUTPUT_DIR = bin +INPUT = $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/YoshiFont.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png @mkdir -p $(OUTPUT_DIR) @@ -14,7 +15,10 @@ $(OUTPUT_DIR)/IconTexture.bin: IconTexture.png $(OUTPUT_DIR)/YoshiFont.bin: YoshiFont.png jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans -all: $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/YoshiFont.bin +$(OUTPUT_DIR)/Paco.bin: Paco.png + jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 + +all: $(INPUT) clean: rm -fr $(OUTPUT_DIR) \ No newline at end of file diff --git a/examples/PoolBox/assets/Paco.png b/examples/PoolBox/assets/Paco.png new file mode 100644 index 00000000..05db9e67 --- /dev/null +++ b/examples/PoolBox/assets/Paco.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ffd5f19946196768be2c2b14a7b7de2c3d7e0016969c58c4366799d4c4a4dd5 +size 5127 diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index 0211a1f3..c36a0ab5 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -9,6 +9,7 @@