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

Do mass loading with AllTheJaby

This commit is contained in:
jaby 2024-12-31 10:59:29 +01:00
parent 3fd15f91e2
commit af36b248b5
6 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,9 @@ namespace GPUTest {
enum LBA { enum LBA {
__jabyengine_start_lba_request __jabyengine_start_lba_request
__jabyengine_request_lba_for(TEX, "ASSETS/TEX.IMG"), __jabyengine_request_lba_for(TEX, "ASSETS/TEX.IMG"),
__jabyengine_request_lba_for(ICON, "ASSETS/ICON.IMG"), __jabyengine_request_lba_for(ICON, "ASSETS/ICON.IMG"),
__jabyengine_request_lba_for(ALL_THE_JABY, "ASSETS/ATJ.TIM"),
__jabyengine_end_lba_request __jabyengine_end_lba_request
}; };
__declare_lba_header(LBA); __declare_lba_header(LBA);
@ -19,41 +20,41 @@ namespace GPUTest {
}; };
CDFile LargeAssets[36] = { CDFile LargeAssets[36] = {
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
CDFileBuilder::simple_tim(LBA::ICON, IconTIM), CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
}; };
} }

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

@ -129,9 +129,6 @@ 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();
@ -262,7 +259,7 @@ namespace LoadingScene {
} }
jaby_sprt.tex_offset.add(jaby_frame_offset, 0); jaby_sprt.tex_offset.add(jaby_frame_offset, 0);
GPU::swap_buffers(); GPU::swap_buffers(!Shared::load_test);
GPU::render(jaby_sprt); GPU::render(jaby_sprt);
GPU::render(load_font); GPU::render(load_font);
jaby_sprt.position.move(Assets::Main::JabyLoader::FontFrame.size.width + Assets::Main::JabyLoader::JabyFrame.size.width + 8, 0); jaby_sprt.position.move(Assets::Main::JabyLoader::FontFrame.size.width + Assets::Main::JabyLoader::JabyFrame.size.width + 8, 0);

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

@ -10,6 +10,8 @@
extern "C" uint32_t __bios_info_start; extern "C" uint32_t __bios_info_start;
extern "C" uint32_t __controller_tests_start; extern "C" uint32_t __controller_tests_start;
extern "C" uint32_t __gpu_tests_start; extern "C" uint32_t __gpu_tests_start;
extern "C" uint32_t __gte_tests_start;
extern "C" uint32_t __font_cycler_start;
extern "C" uint32_t __screen_center_start; extern "C" uint32_t __screen_center_start;
namespace Assets { namespace Assets {
@ -113,11 +115,11 @@ namespace Assets {
} }
void load_gte_test() { void load_gte_test() {
load(CDFileBuilder::overlay(LBA::GTE_TEST_OVL, &__gpu_tests_start), GTETest::lba, GTETest::Assets); load(CDFileBuilder::overlay(LBA::GTE_TEST_OVL, &__gte_tests_start), GTETest::lba, GTETest::Assets);
} }
void load_font_cycler() { void load_font_cycler() {
load(CDFileBuilder::overlay(LBA::FONT_CYC_OVL, &__screen_center_start)); load(CDFileBuilder::overlay(LBA::FONT_CYC_OVL, &__font_cycler_start));
} }
void load_screen_center() { void load_screen_center() {

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

Binary file not shown.

3
examples/PoolBox/assets/Makefile
View File

@ -37,6 +37,9 @@ JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/IMG_6921.tim INPUT += $(OUTPUT_DIR)/IMG_6921.tim
IMG_6921_TIM_FLAGS = tim full16 --clut-pos {384,255} --tex-pos {384,256} IMG_6921_TIM_FLAGS = tim full16 --clut-pos {384,255} --tex-pos {384,256}
INPUT += $(OUTPUT_DIR)/AllTheJaby.tim
AllTheJaby_TIM_FLAGS = tim full16 --tex-pos {0,0}
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
psxfileconv $< -o $@ xa psxfileconv $< -o $@ xa

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

@ -42,6 +42,7 @@
<File name = "TEX.IMG" lz4 = "already">../assets/bin/TexturePage.img</File> <File name = "TEX.IMG" lz4 = "already">../assets/bin/TexturePage.img</File>
<File name = "ICON.IMG" lz4 = "already">../assets/bin/IconTexture.img</File> <File name = "ICON.IMG" lz4 = "already">../assets/bin/IconTexture.img</File>
<File name = "SAND.TIM" lz4 = "already">../assets/bin/IMG_6921.tim</File> <File name = "SAND.TIM" lz4 = "already">../assets/bin/IMG_6921.tim</File>
<File name = "ATJ.TIM" lz4 = "already">../assets/bin/AllTheJaby.tim</File>
</Directory> </Directory>
<Directory name = "XAAUDIO" hidden = "true"> <Directory name = "XAAUDIO" hidden = "true">
<InterleavedFile name = "MIX.XA"> <InterleavedFile name = "MIX.XA">