jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add Dönerfisch

This commit is contained in:
jaby 2024-01-23 11:10:04 -05:00
parent 91b0e63451
commit 31bdf854a7
6 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/PoolBox/application/include/asset_mgr.hpp
View File

@ -6,6 +6,7 @@ namespace Assets {
namespace Main { namespace Main {
static constexpr auto PacoTIM = SimpleTIM(896, 0, 960, 510); static constexpr auto PacoTIM = SimpleTIM(896, 0, 960, 510);
static constexpr auto DoenerFishTIM = SimpleTIM(896 + 30, 0, 960 + 16, 510);
void load(); void load();
} }

14
examples/PoolBox/application/src/application.cpp
View File

@ -38,6 +38,12 @@ static const Menu::SimpleMenu::Entry MenuEntries[] = {
{"Menu 5"} {"Menu 5"}
}; };
static const auto doener_fish = Make::SPRT(
Make::AreaI16(16, GPU::Display::Height - 64, 128, 64), // v this needs to be nicer! Has to be
Make::OffsetPageWithClut(Make::PageOffset(120, 0), Make::PageClut(Assets::Main::DoenerFishTIM.get_clut_position())),
GPU::Color24::Grey()
);
// Do we want this namespace? // Do we want this namespace?
// Do we want Paco to be HERE?! // Do we want Paco to be HERE?!
static object::Paco paco; static object::Paco paco;
@ -54,6 +60,9 @@ namespace Shared {
} }
static void setup() { static void setup() {
// Use this size for the doener fish state?
// doener_fish.set_rect_size_fast(Make::SizeI16(64, 32));
Assets::Main::load(); Assets::Main::load();
FontWriter::setup(); FontWriter::setup();
paco.setup(); paco.setup();
@ -86,8 +95,8 @@ static void setup() {
namespace NormalScene { namespace NormalScene {
static void update() { static void update() {
static const char Title[] = "Pool Box"; static const char Title[] = ">> Pool Box <<";
static const char Version[] = "Ver. 0.8"; static const char Version[] = "Ver. 0.8.1";
static constexpr auto TitleLength = DefaultFont::Info.estimate_str_render_length(Title); static constexpr auto TitleLength = DefaultFont::Info.estimate_str_render_length(Title);
static constexpr auto VersionLength = DefaultFont::Info.estimate_str_render_length(Version); static constexpr auto VersionLength = DefaultFont::Info.estimate_str_render_length(Version);
@ -105,6 +114,7 @@ namespace NormalScene {
FontWriter::new_font_writer.render(); FontWriter::new_font_writer.render();
FontWriter::bios_font_writer.render(); FontWriter::bios_font_writer.render();
paco.render(); paco.render();
GPU::render(doener_fish);
} }
static void run() { static void run() {

4
examples/PoolBox/application/src/asset_mgr.cpp
View File

@ -13,6 +13,7 @@ namespace Assets {
enum LBA { enum LBA {
__jabyengine_start_lba_request __jabyengine_start_lba_request
__jabyengine_request_lba_for(PACO, "ASSETS/MAIN/PACO.BIN"), __jabyengine_request_lba_for(PACO, "ASSETS/MAIN/PACO.BIN"),
__jabyengine_request_lba_for(DFISH, "ASSETS/MAIN/DFISH.BIN"),
__jabyengine_request_lba_for(GPU_TEST_OVL, "GTO.BIN"), __jabyengine_request_lba_for(GPU_TEST_OVL, "GTO.BIN"),
__jabyengine_request_lba_for(CONT_TEST_OVL, "CTO.BIN"), __jabyengine_request_lba_for(CONT_TEST_OVL, "CTO.BIN"),
__jabyengine_request_lba_for(FONT_CYC_OVL, "FCO.BIN"), __jabyengine_request_lba_for(FONT_CYC_OVL, "FCO.BIN"),
@ -51,7 +52,8 @@ namespace Assets {
namespace Main { namespace Main {
static const CDFile Files[] = { static const CDFile Files[] = {
CDFileBuilder::simple_tim(LBA::PACO, PacoTIM) CDFileBuilder::simple_tim(LBA::PACO, PacoTIM),
CDFileBuilder::simple_tim(LBA::DFISH, DoenerFishTIM)
}; };
void load() { void load() {

5
examples/PoolBox/assets/Makefile
View File

@ -2,7 +2,7 @@ include $(JABY_ENGINE_DIR)/mkfile/ExportPath.mk
include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk
OUTPUT_DIR = bin OUTPUT_DIR = bin
INPUT = $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin INPUT = $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin
$(OUTPUT_DIR)/TexturePage.bin: TexturePage.png $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
@ -18,6 +18,9 @@ $(OUTPUT_DIR)/Paco.bin: Paco.png
$(OUTPUT_DIR)/Controller.bin: Controller.png $(OUTPUT_DIR)/Controller.bin: Controller.png
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
$(OUTPUT_DIR)/doener_fish.bin: doener_fish.png
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
all: $(INPUT) all: $(INPUT)
clean: clean:

BIN
examples/PoolBox/assets/doener_fish.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
examples/PoolBox/iso/Config.xml
View File

@ -14,6 +14,7 @@
<Directory name="ASSETS" hidden = "true"> <Directory name="ASSETS" hidden = "true">
<Directory name = "MAIN"> <Directory name = "MAIN">
<File name = "PACO.BIN" lz4 = "already">../assets/bin/Paco.bin</File> <File name = "PACO.BIN" lz4 = "already">../assets/bin/Paco.bin</File>
<File name = "DFISH.BIN" lz4 = "already">../assets/bin/doener_fish.bin</File>
</Directory> </Directory>
<Directory name = "CONT"> <Directory name = "CONT">