From 032a88e33ab552dcba55e13393e5b54e58514da6 Mon Sep 17 00:00:00 2001 From: Jaby Date: Tue, 23 Jan 2024 11:46:41 -0500 Subject: [PATCH] Prepare GTE overlay --- examples/PoolBox/application/Overlays.json | 3 +++ examples/PoolBox/application/include/asset_mgr.hpp | 1 + .../PoolBox/application/src/Overlay/GTETest/gte_test.cpp | 7 +++++++ .../src/Overlay/GTETest/include/gte_test_assets.hpp | 6 ++++++ examples/PoolBox/application/src/Overlay/Overlays.hpp | 4 ++++ examples/PoolBox/application/src/application.cpp | 9 +++++++-- examples/PoolBox/application/src/asset_mgr.cpp | 9 +++++++++ examples/PoolBox/iso/Config.xml | 1 + 8 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 examples/PoolBox/application/src/Overlay/GTETest/gte_test.cpp create mode 100644 examples/PoolBox/application/src/Overlay/GTETest/include/gte_test_assets.hpp diff --git a/examples/PoolBox/application/Overlays.json b/examples/PoolBox/application/Overlays.json index 5ce89e47..cdec7013 100644 --- a/examples/PoolBox/application/Overlays.json +++ b/examples/PoolBox/application/Overlays.json @@ -6,6 +6,9 @@ "gpu_tests": { "pattern": "bin/*/src/Overlay/GPUTest/*.o" }, + "gte_tests": { + "pattern": "bin/*/src/Overlay/GTETest/*.o" + }, "font_cycler": { "pattern": "bin/*/src/Overlay/FontCycler/*.o" }, diff --git a/examples/PoolBox/application/include/asset_mgr.hpp b/examples/PoolBox/application/include/asset_mgr.hpp index b4baa454..0420b7fb 100644 --- a/examples/PoolBox/application/include/asset_mgr.hpp +++ b/examples/PoolBox/application/include/asset_mgr.hpp @@ -14,6 +14,7 @@ namespace Assets { namespace Overlay { void load_controller_test(); void load_gpu_test(); + void load_gte_test(); void load_font_cycler(); void load_screen_center(); } diff --git a/examples/PoolBox/application/src/Overlay/GTETest/gte_test.cpp b/examples/PoolBox/application/src/Overlay/GTETest/gte_test.cpp new file mode 100644 index 00000000..af7dfc85 --- /dev/null +++ b/examples/PoolBox/application/src/Overlay/GTETest/gte_test.cpp @@ -0,0 +1,7 @@ +#include + +namespace GTETest { + void main() { + printf("PLANSCHIPLANSCHIPLANSCHIPLANSCHI\n"); + } +} \ No newline at end of file diff --git a/examples/PoolBox/application/src/Overlay/GTETest/include/gte_test_assets.hpp b/examples/PoolBox/application/src/Overlay/GTETest/include/gte_test_assets.hpp new file mode 100644 index 00000000..c5a9576a --- /dev/null +++ b/examples/PoolBox/application/src/Overlay/GTETest/include/gte_test_assets.hpp @@ -0,0 +1,6 @@ +#pragma once +#include + +namespace GTETest { + using namespace JabyEngine; +} \ No newline at end of file diff --git a/examples/PoolBox/application/src/Overlay/Overlays.hpp b/examples/PoolBox/application/src/Overlay/Overlays.hpp index 537b9c82..e08715ec 100644 --- a/examples/PoolBox/application/src/Overlay/Overlays.hpp +++ b/examples/PoolBox/application/src/Overlay/Overlays.hpp @@ -15,6 +15,10 @@ namespace GPUTest { void main(); } +namespace GTETest { + void main(); +} + namespace FontCycler { void main(); } diff --git a/examples/PoolBox/application/src/application.cpp b/examples/PoolBox/application/src/application.cpp index 9712cc25..1bc282d2 100644 --- a/examples/PoolBox/application/src/application.cpp +++ b/examples/PoolBox/application/src/application.cpp @@ -33,9 +33,9 @@ struct StateChange { static const Menu::SimpleMenu::Entry MenuEntries[] = { {"Controller Test"}, {"GPU Test"}, + {"GTE Test"}, {"Font Cycler"}, {"Screen Center"}, - {"Menu 5"} }; static const auto doener_fish = Make::SPRT( @@ -81,11 +81,16 @@ static void setup() { break; case 2: + state_changer.asset_load = Assets::Overlay::load_gte_test; + state_changer.main = GTETest::main; + break; + + case 3: state_changer.asset_load = Assets::Overlay::load_font_cycler; state_changer.main = FontCycler::main; break; - case 3: + case 4: state_changer.asset_load = Assets::Overlay::load_screen_center; state_changer.main = ScreenCenter::main; break; diff --git a/examples/PoolBox/application/src/asset_mgr.cpp b/examples/PoolBox/application/src/asset_mgr.cpp index a4b000ed..b41d0e30 100644 --- a/examples/PoolBox/application/src/asset_mgr.cpp +++ b/examples/PoolBox/application/src/asset_mgr.cpp @@ -15,6 +15,7 @@ namespace Assets { __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(GTE_TEST_OVL, "GTE.BIN"), __jabyengine_request_lba_for(CONT_TEST_OVL, "CTO.BIN"), __jabyengine_request_lba_for(FONT_CYC_OVL, "FCO.BIN"), __jabyengine_request_lba_for(SCREEN_CENT_OVL, "SCO.BIN"), @@ -81,6 +82,14 @@ namespace Assets { ::Assets::load(GPUTest::lba, GPUTest::Assets); } + void load_gte_test() { + const CDFile Files[] = { + CDFileBuilder::overlay(LBA::GTE_TEST_OVL, &__gpu_tests_start) + }; + + ::Assets::load(lba, Files); + } + void load_font_cycler() { const CDFile Files[] = { CDFileBuilder::overlay(LBA::FONT_CYC_OVL, &__screen_center_start) diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index e46dcc2c..a2f4907e 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -8,6 +8,7 @@
../application/bin/PSX-release/PoolBox.psexe
../application/bin/PSX-release/Overlay.controller_tests ../application/bin/PSX-release/Overlay.gpu_tests + ../application/bin/PSX-release/Overlay.gte_tests ../application/bin/PSX-release/Overlay.font_cycler ../application/bin/PSX-release/Overlay.screen_center