diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 2b294bf99..823f76cd6 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -74,6 +74,7 @@ mod nether_portal; mod options; mod packs; mod pad; +mod pad_menu; mod paintings; mod passengers; mod persist; @@ -3140,6 +3141,7 @@ impl Game<'_> { let mut batch = self.hud_layers(size); self.frame_graph .draw(self.settings.horizon.overlay, &mut batch, &self.res.atlas); + self.draw_pad_cursor(&mut batch); batch } fn hud_layers(&mut self, size: [u32; 2]) -> HudBatch { @@ -8568,7 +8570,7 @@ impl ApplicationHandler for Game<'_> { } fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) { self.poll_control(event_loop); - self.poll_pads(); + self.poll_pads(event_loop); if self.options.frames.is_some() && self.started.elapsed() > self.options.timeout { self.error = Some("frame-limited run timed out".into()); event_loop.exit(); diff --git a/crates/horizon-client/src/game/pad.rs b/crates/horizon-client/src/game/pad.rs index 608f3c4ae..698422134 100644 --- a/crates/horizon-client/src/game/pad.rs +++ b/crates/horizon-client/src/game/pad.rs @@ -12,7 +12,7 @@ use horizon_client::{ }; use serde_json::{Value, json}; use std::time::Instant; -use winit::keyboard::KeyCode; +use winit::{event_loop::ActiveEventLoop, keyboard::KeyCode}; pub(super) const HELP: &[&str] = &[ "pad BUTTON down|up|tap a virtual controller button (south east west north lb rb lt rt select start ls rs up down left right)", @@ -42,10 +42,12 @@ pub(super) struct Pads { pressed_at: [Option; 16], late_releases: Vec