From 0c35a1e234133c55ac7f8d2f13414d7ad459322d Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Fri, 29 Nov 2024 19:09:00 -0500 Subject: [PATCH] Make it easy to clear/reset mappings --- src/input.rs | 66 ++++++++++++++++++++++++++++++++------------- src/window/input.rs | 11 ++++++++ 2 files changed, 58 insertions(+), 19 deletions(-) diff --git a/src/input.rs b/src/input.rs index e818521..057d616 100644 --- a/src/input.rs +++ b/src/input.rs @@ -22,19 +22,23 @@ pub struct GamepadInfo { pub trait Mappings { fn mapping_names(&self) -> HashMap>; fn clear_mappings(&mut self, key: VBKey); + fn clear_all_mappings(&mut self); + fn use_default_mappings(&mut self); } pub struct GamepadMapping { buttons: HashMap, axes: HashMap, + default_buttons: HashMap, + default_axes: HashMap, } impl GamepadMapping { fn for_gamepad(gamepad: &Gamepad) -> Self { - let mut buttons = HashMap::new(); + let mut default_buttons = HashMap::new(); let mut default_button = |btn: Button, key: VBKey| { if let Some(code) = gamepad.button_code(btn) { - buttons.insert(code, key); + default_buttons.insert(code, key); } }; default_button(Button::South, VBKey::A); @@ -44,10 +48,10 @@ impl GamepadMapping { default_button(Button::Start, VBKey::STA); default_button(Button::Select, VBKey::SEL); - let mut axes = HashMap::new(); + let mut default_axes = HashMap::new(); let mut default_axis = |axis: Axis, neg: VBKey, pos: VBKey| { if let Some(code) = gamepad.axis_code(axis) { - axes.insert(code, (neg, pos)); + default_axes.insert(code, (neg, pos)); } }; default_axis(Axis::LeftStickX, VBKey::LL, VBKey::LR); @@ -57,7 +61,12 @@ impl GamepadMapping { default_axis(Axis::DPadX, VBKey::LL, VBKey::LR); default_axis(Axis::DPadY, VBKey::LD, VBKey::LU); - Self { buttons, axes } + Self { + buttons: default_buttons.clone(), + axes: default_axes.clone(), + default_buttons, + default_axes, + } } pub fn add_button_mapping(&mut self, key: VBKey, code: Code) { @@ -112,6 +121,16 @@ impl Mappings for GamepadMapping { !keys.is_empty() }); } + + fn clear_all_mappings(&mut self) { + self.axes.clear(); + self.buttons.clear(); + } + + fn use_default_mappings(&mut self) { + self.axes = self.default_axes.clone(); + self.buttons = self.default_buttons.clone(); + } } #[derive(Default)] @@ -162,23 +181,15 @@ impl Mappings for InputMapping { !keys.is_empty() }); } -} -#[derive(Clone)] -pub struct MappingProvider { - device_mappings: Arc>>>>, - sim_mappings: HashMap>>, - gamepad_info: Arc>>, -} + fn clear_all_mappings(&mut self) { + self.keys.clear(); + } -impl MappingProvider { - pub fn new() -> Self { - let mut mappings = HashMap::new(); - - let mut p1_mappings = InputMapping::default(); - let p2_mappings = InputMapping::default(); + fn use_default_mappings(&mut self) { + self.keys.clear(); let mut default_key = |code, key| { - p1_mappings.add_keyboard_mapping(key, PhysicalKey::Code(code)); + self.keys.insert(PhysicalKey::Code(code), key); }; default_key(KeyCode::KeyA, VBKey::SEL); default_key(KeyCode::KeyS, VBKey::STA); @@ -194,6 +205,23 @@ impl MappingProvider { default_key(KeyCode::ArrowLeft, VBKey::LL); default_key(KeyCode::ArrowDown, VBKey::LD); default_key(KeyCode::ArrowRight, VBKey::LR); + } +} + +#[derive(Clone)] +pub struct MappingProvider { + device_mappings: Arc>>>>, + sim_mappings: HashMap>>, + gamepad_info: Arc>>, +} + +impl MappingProvider { + pub fn new() -> Self { + let mut mappings = HashMap::new(); + + let mut p1_mappings = InputMapping::default(); + p1_mappings.use_default_mappings(); + let p2_mappings = InputMapping::default(); mappings.insert(SimId::Player1, Arc::new(RwLock::new(p1_mappings))); mappings.insert(SimId::Player2, Arc::new(RwLock::new(p2_mappings))); diff --git a/src/window/input.rs b/src/window/input.rs index 2999e8b..c93c6e4 100644 --- a/src/window/input.rs +++ b/src/window/input.rs @@ -50,6 +50,17 @@ impl InputWindow { mappings: &RwLock, bind_message: &str, ) { + ui.horizontal(|ui| { + if ui.button("Use defaults").clicked() { + mappings.write().unwrap().use_default_mappings(); + self.now_binding = None; + } + if ui.button("Clear all").clicked() { + mappings.write().unwrap().clear_all_mappings(); + self.now_binding = None; + } + }); + ui.separator(); let mut names = { let mapping = mappings.read().unwrap(); mapping.mapping_names()