Improve Gamepad DPad Button Detection

Enable the `axis_dpad_to_button` gilrs filter to map hats to dpad buttons on supported remotes.
bevyengine · Jul 5, 2022 · a975e7f · a975e7f
1 parent f73987a
commit a975e7f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/crates/bevy_gilrs/src/converter.rs b/crates/bevy_gilrs/src/converter.rs
@@ -37,8 +37,11 @@ pub fn convert_axis(axis: gilrs::Axis) -> Option<GamepadAxisType> {
         gilrs::Axis::RightStickX => Some(GamepadAxisType::RightStickX),
         gilrs::Axis::RightStickY => Some(GamepadAxisType::RightStickY),
         gilrs::Axis::RightZ => Some(GamepadAxisType::RightZ),
-        gilrs::Axis::DPadX => Some(GamepadAxisType::DPadX),
-        gilrs::Axis::DPadY => Some(GamepadAxisType::DPadY),
         gilrs::Axis::Unknown => None,
+        // The `axis_dpad_to_button` gilrs filter should filter out all DPadX and DPadY events. If
+        // it doesn't then we probably need an entry added to the following repo and an update to
+        // GilRs to use the updated database: https://github.com/gabomdq/SDL_GameControllerDB
+        gilrs::Axis::DPadX => None,
+        gilrs::Axis::DPadY => None,
     }
 }
diff --git a/crates/bevy_gilrs/src/gilrs_system.rs b/crates/bevy_gilrs/src/gilrs_system.rs
@@ -2,7 +2,7 @@ use crate::converter::{convert_axis, convert_button, convert_gamepad_id};
 use bevy_ecs::event::EventWriter;
 use bevy_ecs::system::{NonSend, NonSendMut};
 use bevy_input::{gamepad::GamepadEventRaw, prelude::*};
-use gilrs::{EventType, Gilrs};
+use gilrs::{ev::filter::axis_dpad_to_button, EventType, Filter, Gilrs};
 
 pub fn gilrs_event_startup_system(gilrs: NonSend<Gilrs>, mut events: EventWriter<GamepadEventRaw>) {
     for (id, _) in gilrs.gamepads() {
@@ -14,7 +14,12 @@ pub fn gilrs_event_startup_system(gilrs: NonSend<Gilrs>, mut events: EventWriter
 }
 
 pub fn gilrs_event_system(mut gilrs: NonSendMut<Gilrs>, mut events: EventWriter<GamepadEventRaw>) {
-    while let Some(gilrs_event) = gilrs.next_event() {
+    while let Some(gilrs_event) = gilrs
+        .next_event()
+        .filter_ev(&axis_dpad_to_button, &mut gilrs)
+    {
+        gilrs.update(&gilrs_event);
+
         match gilrs_event.event {
             EventType::Connected => {
                 events.send(GamepadEventRaw::new(

diff --git a/crates/bevy_input/src/gamepad.rs b/crates/bevy_input/src/gamepad.rs
@@ -135,8 +135,6 @@ pub enum GamepadAxisType {
     RightStickX,
     RightStickY,
     RightZ,
-    DPadX,
-    DPadY,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -412,15 +410,13 @@ const ALL_BUTTON_TYPES: [GamepadButtonType; 19] = [
     GamepadButtonType::DPadRight,
 ];
 
-const ALL_AXIS_TYPES: [GamepadAxisType; 8] = [
+const ALL_AXIS_TYPES: [GamepadAxisType; 6] = [
     GamepadAxisType::LeftStickX,
     GamepadAxisType::LeftStickY,
     GamepadAxisType::LeftZ,
     GamepadAxisType::RightStickX,
     GamepadAxisType::RightStickY,
     GamepadAxisType::RightZ,
-    GamepadAxisType::DPadX,
-    GamepadAxisType::DPadY,
 ];
 
 #[cfg(test)]