diff --git a/examples/PoolBox/application/src/Overlay/ControllerTest/controller_test_assets.cpp b/examples/PoolBox/application/src/Overlay/ControllerTest/controller_test_assets.cpp index 82e3a3de..fef8e5ee 100644 --- a/examples/PoolBox/application/src/Overlay/ControllerTest/controller_test_assets.cpp +++ b/examples/PoolBox/application/src/Overlay/ControllerTest/controller_test_assets.cpp @@ -7,7 +7,7 @@ namespace ControllerTest { enum LBA { __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 }; __declare_lba_header(LBA); diff --git a/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp b/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp index 5249e644..fb57f977 100644 --- a/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp +++ b/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp @@ -7,8 +7,8 @@ namespace GPUTest { enum LBA { __jabyengine_start_lba_request - __jabyengine_request_lba_for(TEX, "ASSETS/TEX.BIN"), - __jabyengine_request_lba_for(ICON, "ASSETS/ICON.BIN"), + __jabyengine_request_lba_for(TEX, "ASSETS/TEX.IMG"), + __jabyengine_request_lba_for(ICON, "ASSETS/ICON.IMG"), __jabyengine_end_lba_request }; __declare_lba_header(LBA); diff --git a/examples/PoolBox/application/src/Overlay/GTETest/gte_test_assets.cpp b/examples/PoolBox/application/src/Overlay/GTETest/gte_test_assets.cpp index bf42db7e..10f6cb96 100644 --- a/examples/PoolBox/application/src/Overlay/GTETest/gte_test_assets.cpp +++ b/examples/PoolBox/application/src/Overlay/GTETest/gte_test_assets.cpp @@ -4,7 +4,7 @@ namespace GTETest { enum LBA { __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 }; __declare_lba_header(LBA); diff --git a/examples/PoolBox/application/src/application.cpp b/examples/PoolBox/application/src/application.cpp index 9b67e55d..feaeece8 100644 --- a/examples/PoolBox/application/src/application.cpp +++ b/examples/PoolBox/application/src/application.cpp @@ -214,10 +214,7 @@ namespace LoadingScene { } static void run() { - if(true) {//(old_state_changer != state_changer) { - //printf("Loading new state...\n"); - - // TODO: Callback for file load? Locally? + if(Shared::load_test || old_state_changer != state_changer) { update(); GPU::swap_buffers_vsync(1); render(); diff --git a/examples/PoolBox/application/src/asset_mgr.cpp b/examples/PoolBox/application/src/asset_mgr.cpp index d7f3b712..2fefab3b 100644 --- a/examples/PoolBox/application/src/asset_mgr.cpp +++ b/examples/PoolBox/application/src/asset_mgr.cpp @@ -14,9 +14,9 @@ extern "C" uint32_t __screen_center_start; namespace Assets { enum LBA { __jabyengine_start_lba_request - __jabyengine_request_lba_for(PACO, "ASSETS/MAIN/PACO.BIN"), - __jabyengine_request_lba_for(DFISH, "ASSETS/MAIN/DFISH.BIN"), - __jabyengine_request_lba_for(FOX_XA, "XAAUDIO/FOX.XA"), + __jabyengine_request_lba_for(PACO, "ASSETS/MAIN/PACO.IMG"), + __jabyengine_request_lba_for(DFISH, "ASSETS/MAIN/DFISH.IMG"), + __jabyengine_request_lba_for(MIX_XA, "XAAUDIO/MIX.XA"), __jabyengine_request_lba_for(BIOS_INFO_OVL, "BIO.BIN"), __jabyengine_request_lba_for(GPU_TEST_OVL, "GTO.BIN"), __jabyengine_request_lba_for(GTE_TEST_OVL, "GTE.BIN"), @@ -84,7 +84,6 @@ namespace Assets { 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() { load(CDFileBuilder::overlay(LBA::BIOS_INFO_OVL, &__bios_info_start)); } @@ -112,7 +111,7 @@ namespace Assets { namespace XAAudio { void play_fox() { - CDXA::play(lba, FOX_XA, 0, false); + CDXA::play(lba, MIX_XA, 0, false); } } } \ No newline at end of file diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index 0d1cd2c0..2b7aa634 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -1,41 +1,48 @@ include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk +define wuff + $1_FLAGS = $2 +endef + 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 @mkdir -p $(OUTPUT_DIR) jaby_engine_fconv $< -o $@ xa -$(OUTPUT_DIR)/Evacuation.xa: audio/Evacuation_cdda.wav +$(OUTPUT_DIR)/%.xa: audio/%.wav @mkdir -p $(OUTPUT_DIR) jaby_engine_fconv $< -o $@ xa -# TODO: Simplyfy all of these? -$(OUTPUT_DIR)/TexturePage.bin: TexturePage.png +$(OUTPUT_DIR)/%.img: %.png @mkdir -p $(OUTPUT_DIR) - jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 - -$(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 + jaby_engine_fconv --lz4 $< -o $@ $($*_FLAGS) all: $(INPUT) diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index 0b331162..86cf2eb8 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -15,24 +15,24 @@