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

Hold R2 and L2 to active load test

This commit is contained in:
jaby 2024-07-22 20:09:47 +02:00
parent 79f2b436ff
commit c4d4b8f014
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/PoolBox/application/include/shared.hpp
View File

@ -6,4 +6,5 @@
namespace Shared {
extern Menu::BackMenu back_menu;
extern JabyEngine::GPU::POLY_G4 background;
extern bool load_test;
}

1
examples/PoolBox/application/src/Overlay/GTETest/gte_test.cpp
View File

@ -57,7 +57,6 @@ namespace GTETest {
}
static auto star_base = Make::SPRT(
// TODO: improve magic numbers
Make::AreaI16(Position, Make::SizeI16(64, 64)),
Make::OffsetPageWithClut(JabySTARTim.get_page_offset_clut4(), Make::PageClut(JabySTARTim.get_clut_position()))
).linked();

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

@ -11,6 +11,7 @@
#include <stdio.hpp>
using namespace JabyEngine;
using DigitalButton = Periphery::GenericController::Button;
struct XAPlayer {
static constexpr auto MaxChannels = 2;
@ -91,12 +92,19 @@ namespace Shared {
Make::AreaI16(0, 0, GPU::Display::Width, GPU::Display::Height),
{GPU::Color24::Red(0xA0), GPU::Color24::Green(0xA0), GPU::Color24::Blue(0xA0), GPU::Color24::Black()}
);
bool load_test = false;
}
static void setup() {
// Use this size for the doener fish state?
// doener_fish.set_rect_size_fast(Make::SizeI16(64, 32));
const auto& controller = Periphery::get_primary_controller_as<JabyEngine::Periphery::GenericController>();
// With this approach we can default load_test to true for debugging reasons
if(controller.button.is_down(DigitalButton::R2) && controller.button.is_down(DigitalButton::L2)) {
Shared::load_test = true;
}
Assets::Main::load();
FontWriter::setup();
paco.setup();
@ -145,8 +153,6 @@ static void setup() {
namespace NormalScene {
static void update() {
using DigitalButton = Periphery::GenericController::Button;
static const char Title[] = ">> Pool Box <<";
static const char Version[] = "Ver. 0.8.5";
static constexpr auto TitleLength = DefaultFont::Info.estimate_str_render_length(Title);
@ -170,10 +176,13 @@ namespace NormalScene {
FontWriter::new_font_writer.write(cursor.change_position(Make::PositionI16((GPU::Display::Width-VersionLength)/2, 16 + DefaultFont::Info.get_kern_size().height)), Version, GPU::Color24::Green(0xD0), &FontWriter::wiggle);
menu.update(FontWriter::bios_font_writer, cursor, Make::PositionI16(8, 64));
// TODO: Make this a feature
// Force state change for now
/*state_changer.asset_load = Assets::Overlay::load_gpu_test;
state_changer.main = GPUTest::main;*/
if(Shared::load_test) {
// Force state change if we are in the load_test state
state_changer.asset_load = Assets::Overlay::load_gpu_test;
state_changer.main = GPUTest::main;
}
}
static void render() {
@ -226,6 +235,7 @@ namespace LoadingScene {
}
void main() {
Periphery::query_controller();
setup();
while(true) {

3
examples/PoolBox/application/src/menu.cpp
View File

@ -1,3 +1,4 @@
#include "../include/shared.hpp"
#include "include/menu.hpp"
#include <PSX/Periphery/periphery.hpp>
@ -49,7 +50,7 @@ namespace Menu {
bool BackMenu :: update(const GPU::PositionI16& position, bool auto_clear) {
const auto& controller = Periphery::get_primary_controller_as<JabyEngine::Periphery::GenericController>();
if(true/*controller.button.is_down(DigitalButton::Circle)*/) {
if(Shared::load_test || controller.button.is_down(DigitalButton::Circle)) {
this->waiting = true;
if(this->timeout.is_expired_for(2500_ms)) {
return true;

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

@ -32,8 +32,8 @@
</Directory>
<Directory name = "XAAUDIO" hidden = "true">
<XA-Audio name = "FOX.XA">
<Channel>../assets/bin/fox.xa</Channel>
<Channel>../assets/bin/Evacuation.xa</Channel>
<Channel>../assets/bin/fox.xa</Channel>
</XA-Audio>
</Directory>
</Track>