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

Cleanup Assets

Browse Source
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
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 {
__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);

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

@@ -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);

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

@@ -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);

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

@@ -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();

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

@@ -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);
}
}
}