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

Cleanup Assets

This commit is contained in:
jaby 2024-07-22 21:20:55 +02:00
parent c4d4b8f014
commit 687fa3be82
7 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PoolBox/application/src/Overlay/ControllerTest/controller_test_assets.cpp
View File

@ -7,7 +7,7 @@ namespace ControllerTest {
enum LBA { enum LBA {
__jabyengine_start_lba_request __jabyengine_start_lba_request
__jabyengine_request_lba_for(CONT, "ASSETS/CONT/CONT.BIN"), __jabyengine_request_lba_for(CONT, "ASSETS/CONT/CONT.IMG"),
__jabyengine_end_lba_request __jabyengine_end_lba_request
}; };
__declare_lba_header(LBA); __declare_lba_header(LBA);

4
examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp
View File

@ -7,8 +7,8 @@ namespace GPUTest {
enum LBA { enum LBA {
__jabyengine_start_lba_request __jabyengine_start_lba_request
__jabyengine_request_lba_for(TEX, "ASSETS/TEX.BIN"), __jabyengine_request_lba_for(TEX, "ASSETS/TEX.IMG"),
__jabyengine_request_lba_for(ICON, "ASSETS/ICON.BIN"), __jabyengine_request_lba_for(ICON, "ASSETS/ICON.IMG"),
__jabyengine_end_lba_request __jabyengine_end_lba_request
}; };
__declare_lba_header(LBA); __declare_lba_header(LBA);

2
examples/PoolBox/application/src/Overlay/GTETest/gte_test_assets.cpp
View File

@ -4,7 +4,7 @@
namespace GTETest { namespace GTETest {
enum LBA { enum LBA {
__jabyengine_start_lba_request __jabyengine_start_lba_request
__jabyengine_request_lba_for(JABY_STAR, "ASSETS/GTE/JABY.BIN"), __jabyengine_request_lba_for(JABY_STAR, "ASSETS/GTE/JABY.IMG"),
__jabyengine_end_lba_request __jabyengine_end_lba_request
}; };
__declare_lba_header(LBA); __declare_lba_header(LBA);

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

@ -214,10 +214,7 @@ namespace LoadingScene {
} }
static void run() { static void run() {
if(true) {//(old_state_changer != state_changer) { if(Shared::load_test || old_state_changer != state_changer) {
//printf("Loading new state...\n");
// TODO: Callback for file load? Locally?
update(); update();
GPU::swap_buffers_vsync(1); GPU::swap_buffers_vsync(1);
render(); render();

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

@ -14,9 +14,9 @@ extern "C" uint32_t __screen_center_start;
namespace Assets { 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.IMG"),
__jabyengine_request_lba_for(DFISH, "ASSETS/MAIN/DFISH.BIN"), __jabyengine_request_lba_for(DFISH, "ASSETS/MAIN/DFISH.IMG"),
__jabyengine_request_lba_for(FOX_XA, "XAAUDIO/FOX.XA"), __jabyengine_request_lba_for(MIX_XA, "XAAUDIO/MIX.XA"),
__jabyengine_request_lba_for(BIOS_INFO_OVL, "BIO.BIN"), __jabyengine_request_lba_for(BIOS_INFO_OVL, "BIO.BIN"),
__jabyengine_request_lba_for(GPU_TEST_OVL, "GTO.BIN"), __jabyengine_request_lba_for(GPU_TEST_OVL, "GTO.BIN"),
__jabyengine_request_lba_for(GTE_TEST_OVL, "GTE.BIN"), __jabyengine_request_lba_for(GTE_TEST_OVL, "GTE.BIN"),
@ -84,7 +84,6 @@ namespace Assets {
load(overlay_file, overlay_lba, overlay_assets, N); load(overlay_file, overlay_lba, overlay_assets, N);
} }
// TODO: Get rid of these as soon as we have a proper loading screen
void load_bios_info() { void load_bios_info() {
load(CDFileBuilder::overlay(LBA::BIOS_INFO_OVL, &__bios_info_start)); load(CDFileBuilder::overlay(LBA::BIOS_INFO_OVL, &__bios_info_start));
} }
@ -112,7 +111,7 @@ namespace Assets {
namespace XAAudio { namespace XAAudio {
void play_fox() { void play_fox() {
CDXA::play(lba, FOX_XA, 0, false); CDXA::play(lba, MIX_XA, 0, false);
} }
} }
} }

57
examples/PoolBox/assets/Makefile
View File

@ -1,41 +1,48 @@
include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk
include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk
define wuff
$1_FLAGS = $2
endef
OUTPUT_DIR = bin OUTPUT_DIR = bin
INPUT = $(OUTPUT_DIR)/Evacuation.xa $(OUTPUT_DIR)/fox.xa $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin $(OUTPUT_DIR)/JabyStar.bin CLUT_4_COLOR_TRANS_FLAGS = simple-tim clut4 --color-trans
# Ressources to convert
## Music tracks
INPUT += $(OUTPUT_DIR)/Evacuation_cdda.xa
INPUT += $(OUTPUT_DIR)/fox.xa
## Images
INPUT += $(OUTPUT_DIR)/TexturePage.img
TexturePage_FLAGS = simple-tim clut4
INPUT += $(OUTPUT_DIR)/IconTexture.img
IconTexture_FLAGS = simple-tim clut4 --semi-trans --color-trans
INPUT += $(OUTPUT_DIR)/Paco.img
Paco_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/Controller.img
Controller_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/doener_fish.img
doener_fish_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/JabyStar.img
JabyStar_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ xa jaby_engine_fconv $< -o $@ xa
$(OUTPUT_DIR)/Evacuation.xa: audio/Evacuation_cdda.wav $(OUTPUT_DIR)/%.xa: audio/%.wav
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ xa jaby_engine_fconv $< -o $@ xa
# TODO: Simplyfy all of these? $(OUTPUT_DIR)/%.img: %.png
$(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 jaby_engine_fconv --lz4 $< -o $@ $($*_FLAGS)
$(OUTPUT_DIR)/IconTexture.bin: IconTexture.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --semi-trans --color-trans
$(OUTPUT_DIR)/Paco.bin: Paco.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
$(OUTPUT_DIR)/Controller.bin: Controller.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
$(OUTPUT_DIR)/doener_fish.bin: doener_fish.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
$(OUTPUT_DIR)/JabyStar.bin: JabyStar.png
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans
all: $(INPUT) all: $(INPUT)

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

@ -15,24 +15,24 @@
<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.IMG" lz4 = "already">../assets/bin/Paco.img</File>
<File name = "DFISH.BIN" lz4 = "already">../assets/bin/doener_fish.bin</File> <File name = "DFISH.IMG" lz4 = "already">../assets/bin/doener_fish.img</File>
</Directory> </Directory>
<Directory name = "CONT"> <Directory name = "CONT">
<File name = "CONT.BIN" lz4 = "already">../assets/bin/Controller.bin</File> <File name = "CONT.IMG" lz4 = "already">../assets/bin/Controller.img</File>
</Directory> </Directory>
<Directory name = "GTE"> <Directory name = "GTE">
<File name = "JABY.BIN" lz4 = "already">../assets/bin/JabyStar.bin</File> <File name = "JABY.IMG" lz4 = "already">../assets/bin/JabyStar.img</File>
</Directory> </Directory>
<File name = "TEX.BIN" lz4 = "already">../assets/bin/TexturePage.bin</File> <File name = "TEX.IMG" lz4 = "already">../assets/bin/TexturePage.img</File>
<File name = "ICON.BIN" lz4 = "already">../assets/bin/IconTexture.bin</File> <File name = "ICON.IMG" lz4 = "already">../assets/bin/IconTexture.img</File>
</Directory> </Directory>
<Directory name = "XAAUDIO" hidden = "true"> <Directory name = "XAAUDIO" hidden = "true">
<XA-Audio name = "FOX.XA"> <XA-Audio name = "MIX.XA">
<Channel>../assets/bin/Evacuation.xa</Channel> <Channel>../assets/bin/Evacuation_cdda.xa</Channel>
<Channel>../assets/bin/fox.xa</Channel> <Channel>../assets/bin/fox.xa</Channel>
</XA-Audio> </XA-Audio>
</Directory> </Directory>