Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
3 changed files with 14 additions and 6 deletions
Showing only changes of commit 2702bed58e - Show all commits

View File

@ -16,9 +16,14 @@ 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()
GPU::Color24::Blue()
).linked();
static const GPU::Color24 paco_color[] = {
GPU::Color24::Red(), GPU::Color24::Green(), GPU::Color24::Blue(), GPU::Color24::Yellow()
};
static uint8_t color_idx = 0;
static void setup() {
Assets::load_for_main();
FontWriter::setup();
@ -31,14 +36,17 @@ static void update() {
const auto end_pos = FontWriter::write({0, 32}, "Cody is cute\n&\na \x1b[8;0;0mBAAAAABY!!!");
FontWriter::write(end_pos, "\x1b[0;7;7mJaby was\nhere c:");
if(timer.is_expired_for(1000_ms)) {
printf("Dino\n");
if(timer.is_expired_for(325_ms)) {
static constexpr uint8_t last_idx = (sizeof(paco_color)/sizeof(paco_color[0])) - 1;
color_idx = (color_idx == last_idx) ? 0 : color_idx + 1;
timer.reset();
}
}
static void render() {
GPU::swap_buffers_vsync(1);
paco->color = paco_color[color_idx];
GPU::render(paco_texpage);
FontWriter::render();
}

View File

@ -16,7 +16,7 @@ $(OUTPUT_DIR)/YoshiFont.bin: YoshiFont.png
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
$(OUTPUT_DIR)/Paco.bin: Paco.png
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
all: $(INPUT)

BIN
examples/PoolBox/assets/Paco.png (Stored with Git LFS)

Binary file not shown.