0.1.0-0-pre.11-fix.5

This commit is contained in:
2026-09-16 22:58:48 +02:00
parent 9386372e51
commit 9197758184
9 changed files with 181 additions and 90 deletions

View File

@@ -1,5 +1,5 @@
// file: crates/engines/engine-v1-sdl/src/runtime.rs
// version: 10
// version: 11
/// Minimal SDL3 runtime used by Desktop and Android POC runners.
pub struct SdlRuntime {
@@ -50,9 +50,22 @@ impl SdlRuntime {
let mut input = engine_v1_common::InputState::none().with_pointer(pointer);
for event in events.poll_iter() {
match event {
sdl3::event::Event::Quit { .. } => break 'running,
sdl3::event::Event::KeyDown { keycode: Some(sdl3::keyboard::Keycode::Escape), .. } => break 'running,
sdl3::event::Event::KeyDown { keycode: Some(sdl3::keyboard::Keycode::AcBack), .. } => break 'running,
sdl3::event::Event::Quit { .. } => {
if quit_requested(game, engine_v1_common::QuitSource::WindowClose) {
break 'running;
}
},
sdl3::event::Event::KeyDown { keycode: Some(sdl3::keyboard::Keycode::Escape), .. } => {
if quit_requested(game, engine_v1_common::QuitSource::Escape) {
break 'running;
}
},
sdl3::event::Event::KeyDown { keycode: Some(sdl3::keyboard::Keycode::AcBack), .. }
| sdl3::event::Event::KeyDown { scancode: Some(sdl3::keyboard::Scancode::AcBack), .. } => {
if quit_requested(game, engine_v1_common::QuitSource::PlatformBack) {
break 'running;
}
},
sdl3::event::Event::KeyDown { keycode: Some(sdl3::keyboard::Keycode::Left), repeat: false, .. } => {
input = input.with_action(engine_v1_common::GameAction::Left, true);
},
@@ -67,9 +80,6 @@ impl SdlRuntime {
},
sdl3::event::Event::MouseButtonDown { mouse_btn: sdl3::mouse::MouseButton::Left, x, y, .. } => {
pointer = normalize_mouse_pointer(&canvas, true, x, y);
if platform_quit_control_hit(pointer) {
break 'running;
}
gesture_start = Some(pointer);
input = input.with_pointer(pointer).with_action(engine_v1_common::GameAction::Primary, true);
},
@@ -86,9 +96,6 @@ impl SdlRuntime {
},
sdl3::event::Event::FingerDown { x, y, .. } => {
pointer = engine_v1_common::PointerState::normalized(true, x, y);
if platform_quit_control_hit(pointer) {
break 'running;
}
gesture_start = Some(pointer);
input = input.with_pointer(pointer).with_action(engine_v1_common::GameAction::Primary, true);
},
@@ -153,70 +160,18 @@ fn render_scene(canvas: &mut sdl3::render::WindowCanvas, scene: engine_v1_common
std::result::Result::Err(error) => return std::result::Result::Err(error.to_string()),
}
}
match render_platform_controls(canvas, width, height) {
std::result::Result::Ok(()) => {},
std::result::Result::Err(error) => return std::result::Result::Err(error),
}
canvas.present();
return std::result::Result::Ok(());
}
const SWIPE_DIRECTION_THRESHOLD: f32 = 0.04;
fn platform_quit_control_hit(pointer: engine_v1_common::PointerState) -> bool {
#[cfg(target_os = "android")]
{
return quit_control_hit(pointer);
}
#[cfg(not(target_os = "android"))]
{
let _ = pointer;
return false;
}
}
fn quit_control_hit(pointer: engine_v1_common::PointerState) -> bool {
return pointer.x() >= 0.86 && pointer.x() <= 0.99 && pointer.y() >= 0.015 && pointer.y() <= 0.105;
}
fn render_platform_controls(canvas: &mut sdl3::render::WindowCanvas, width: u32, height: u32) -> std::result::Result<(), std::string::String> {
#[cfg(target_os = "android")]
{
let button = sdl3::render::FRect::new(0.86 * width as f32, 0.015 * height as f32, 0.13 * width as f32, 0.09 * height as f32);
canvas.set_draw_color(sdl3::pixels::Color::RGBA(176, 48, 48, 232));
match canvas.fill_rect(button) {
std::result::Result::Ok(()) => {},
std::result::Result::Err(error) => return std::result::Result::Err(error.to_string()),
}
canvas.set_draw_color(sdl3::pixels::Color::RGBA(255, 255, 255, 255));
let marks = [
(0.885_f32, 0.032_f32),
(0.905_f32, 0.044_f32),
(0.925_f32, 0.056_f32),
(0.945_f32, 0.068_f32),
(0.965_f32, 0.080_f32),
(0.965_f32, 0.032_f32),
(0.945_f32, 0.044_f32),
(0.925_f32, 0.056_f32),
(0.905_f32, 0.068_f32),
(0.885_f32, 0.080_f32),
];
for (x, y) in marks {
let mark = sdl3::render::FRect::new(x * width as f32, y * height as f32, 0.012 * width as f32, 0.012 * height as f32);
match canvas.fill_rect(mark) {
std::result::Result::Ok(()) => {},
std::result::Result::Err(error) => return std::result::Result::Err(error.to_string()),
}
}
}
#[cfg(not(target_os = "android"))]
{
let _ = canvas;
let _ = width;
let _ = height;
}
return std::result::Result::Ok(());
fn quit_requested<G>(game: &mut G, source: engine_v1_common::QuitSource) -> bool
where
G: engine_v1_common::EngineGame,
{
let request = engine_v1_common::QuitRequest::new(source);
return game.quit_requested(request) == engine_v1_common::QuitDecision::Exit;
}
fn apply_swipe_direction(