Factor out direction methods on GamepadEvent

Author: fwcd

lighthouse-protocol/src/input/gamepad_event.rs

@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 
+use crate::Direction;
+
 use super::{EventSource, GamepadControlEvent};
 
 /// A gamepad/controller event.
@@ -12,3 +14,29 @@ pub struct GamepadEvent {
     #[serde(flatten)]
     pub control: GamepadControlEvent,
 }
+
+impl GamepadEvent {
+    /// Parses the gamepad event as an arbitrary direction.
+    pub fn direction(&self) -> Option<Direction> {
+        self.left_direction().or_else(|| self.right_direction())
+    }
+
+    /// The direction if the gamepad event represents a D-pad or left stick.
+    /// Commonly used e.g. for movement in games.
+    pub fn left_direction(&self) -> Option<Direction> {
+        match &self.control {
+            GamepadControlEvent::Button(button) => button.d_pad_direction(),
+            GamepadControlEvent::Axis2D(axis2d) if axis2d.index == 0 => axis2d.direction(),
+            _ => None,
+        }
+    }
+
+    /// The direction if the gamepad event represents a right stick event.
+    /// Commonly used e.g. for camera control in games.
+    pub fn right_direction(&self) -> Option<Direction> {
+        match &self.control {
+            GamepadControlEvent::Axis2D(axis2d) if axis2d.index == 1 => axis2d.direction(),
+            _ => None,
+        }
+    }
+}

lighthouse-protocol/src/input/input_event.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::Direction;
 
-use super::{EventSource, GamepadControlEvent, GamepadEvent, KeyEvent, MouseEvent};
+use super::{EventSource, GamepadEvent, KeyEvent, MouseEvent};
 
 /// A user input event, as generated by the new frontend (LUNA).
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
@@ -33,11 +33,7 @@ impl InputEvent {
     pub fn left_direction(&self) -> Option<Direction> {
         match self {
             InputEvent::Key(key) => key.wasd_direction(),
-            InputEvent::Gamepad(gamepad) => match &gamepad.control {
-                GamepadControlEvent::Button(button) => button.d_pad_direction(),
-                GamepadControlEvent::Axis2D(axis2d) if axis2d.index == 0 => axis2d.direction(),
-                _ => None,
-            },
+            InputEvent::Gamepad(gamepad) => gamepad.left_direction(),
             _ => None,
         }
     }
@@ -47,10 +43,7 @@ impl InputEvent {
     pub fn right_direction(&self) -> Option<Direction> {
         match self {
             InputEvent::Key(key) => key.arrow_direction(),
-            InputEvent::Gamepad(gamepad) => match &gamepad.control {
-                GamepadControlEvent::Axis2D(axis2d) if axis2d.index == 1 => axis2d.direction(),
-                _ => None,
-            },
+            InputEvent::Gamepad(gamepad) => gamepad.right_direction(),
             _ => None,
         }
     }