implements PLN-0145

This commit is contained in:
2026-07-04 18:52:04 +01:00
parent 3eeda25e97
commit 0ecab2910b
5 changed files with 32 additions and 42 deletions
@@ -96,6 +96,15 @@ impl Firmware {
signals: &InputSignals,
platform: &mut dyn RuntimePlatform,
) {
let new_state = match new_state {
FirmwareState::ResumeResidentGame => {
let Some(resume_state) = self.resident_game_resume_state() else {
return;
};
resume_state
}
state => state,
};
let entering_game_from_home = matches!(self.state, FirmwareState::HubHome(_))
&& matches!(new_state, FirmwareState::GameRunning(_));
self.on_exit(signals, platform);
@@ -126,6 +135,7 @@ impl Firmware {
FirmwareState::LaunchHub(s) => s.on_enter(&mut req),
FirmwareState::HubHome(s) => s.on_enter(&mut req),
FirmwareState::LoadCartridge(s) => s.on_enter(&mut req),
FirmwareState::ResumeResidentGame => {}
FirmwareState::GameRunning(s) => s.on_enter(&mut req),
FirmwareState::ShellRunning(s) => s.on_enter(&mut req),
FirmwareState::AppCrashes(s) => s.on_enter(&mut req),
@@ -153,6 +163,7 @@ impl Firmware {
FirmwareState::LaunchHub(s) => s.on_update(&mut req),
FirmwareState::HubHome(s) => s.on_update(&mut req),
FirmwareState::LoadCartridge(s) => s.on_update(&mut req),
FirmwareState::ResumeResidentGame => None,
FirmwareState::GameRunning(s) => s.on_update(&mut req),
FirmwareState::ShellRunning(s) => s.on_update(&mut req),
FirmwareState::AppCrashes(s) => s.on_update(&mut req),
@@ -175,6 +186,7 @@ impl Firmware {
FirmwareState::LaunchHub(s) => s.on_exit(&mut req),
FirmwareState::HubHome(s) => s.on_exit(&mut req),
FirmwareState::LoadCartridge(s) => s.on_exit(&mut req),
FirmwareState::ResumeResidentGame => {}
FirmwareState::GameRunning(s) => s.on_exit(&mut req),
FirmwareState::ShellRunning(s) => s.on_exit(&mut req),
FirmwareState::AppCrashes(s) => s.on_exit(&mut req),
@@ -201,20 +213,27 @@ impl Firmware {
}
pub fn resume_resident_game_from_home(&mut self) -> bool {
let Some(task_id) = self.os.lifecycle().resident_game_task() else {
let Some(state) = self.resident_game_resume_state() else {
return false;
};
if self.os.lifecycle().resume_task(task_id).is_err() {
return false;
self.state = state;
self.state_initialized = false;
true
}
fn resident_game_resume_state(&mut self) -> Option<FirmwareState> {
let task_id = self.os.lifecycle().resident_game_task()?;
if let Err(error) = self.os.lifecycle().resume_task(task_id) {
self.os.warn(LogSource::Pos, format!("Resident Game resume failed: {error:?}"));
return None;
}
let app_id = self.os.vm().current_app_id();
self.os.vm().transition_render_owner(AppMode::Game, app_id);
self.state = FirmwareState::GameRunning(GameRunningStep::new(task_id));
self.state_initialized = false;
self.game_input_barrier_frames = 1;
true
self.game_input_barrier_frames = self.game_input_barrier_frames.max(1);
Some(FirmwareState::GameRunning(GameRunningStep::new(task_id)))
}
pub fn game_lifecycle_audio_paused(&mut self) -> bool {
@@ -14,6 +14,7 @@ pub enum FirmwareState {
LaunchHub(LaunchHubStep),
HubHome(HubHomeStep),
LoadCartridge(LoadCartridgeStep),
ResumeResidentGame,
GameRunning(GameRunningStep),
ShellRunning(ShellRunningStep),
AppCrashes(AppCrashesStep),
@@ -1,8 +1,7 @@
use crate::firmware::firmware_state::{
AppCrashesStep, FirmwareState, GameRunningStep, LoadCartridgeStep, ShellRunningStep,
AppCrashesStep, FirmwareState, LoadCartridgeStep, ShellRunningStep,
};
use crate::firmware::prometeu_context::PrometeuContext;
use prometeu_hal::InputSignals;
use prometeu_hal::app_mode::AppMode;
use prometeu_hal::cartridge_loader::CartridgeLoader;
use prometeu_hal::log::{LogLevel, LogSource};
@@ -41,39 +40,10 @@ impl HubHomeStep {
Some(SystemProfileAction::LaunchGame { path }) => match CartridgeLoader::load(&path) {
Ok(cartridge) => {
if cartridge.app_mode == AppMode::Game
&& let Some(task_id) = ctx.os.lifecycle().resident_game_task()
&& ctx.os.lifecycle().resident_game_task().is_some()
{
if ctx.os.vm().current_app_id() == cartridge.app_id {
match ctx.os.lifecycle().resume_task(task_id) {
Ok(()) => {
ctx.os
.vm()
.transition_render_owner(AppMode::Game, cartridge.app_id);
ctx.platform
.input_mut()
.pad_mut()
.begin_frame(&InputSignals::default());
ctx.platform
.input_mut()
.touch_mut()
.begin_frame(&InputSignals::default());
return Some(FirmwareState::GameRunning(GameRunningStep::new(
task_id,
)));
}
Err(error) => {
ctx.os.log(
LogLevel::Warn,
LogSource::Hub,
0,
format!(
"Failed to resume resident Home game {}: {error:?}",
cartridge.title
),
);
return None;
}
}
return Some(FirmwareState::ResumeResidentGame);
}
let resident_app_id = ctx.os.vm().current_app_id();