Use Direction type for the event helpers

Author: fwcd

lighthouse-protocol/src/input/gamepad_button_event.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{Delta, Unity, Zero};
+use crate::Direction;
 
 /// A button event on a gamepad.
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
@@ -17,12 +17,12 @@ pub struct GamepadButtonEvent {
 impl GamepadButtonEvent {
     /// The direction if one of the D-pad buttons was pressed.
     /// See https://www.w3.org/TR/gamepad/#dfn-standard-gamepad
-    pub fn d_pad_direction<T>(&self) -> Option<Delta<T>> where T: Zero + Unity {
+    pub fn d_pad_direction(&self) -> Option<Direction> {
         match self.index {
-            12 => Some(Delta::UP),
-            13 => Some(Delta::DOWN),
-            14 => Some(Delta::LEFT),
-            15 => Some(Delta::RIGHT),
+            12 => Some(Direction::Up),
+            13 => Some(Direction::Down),
+            14 => Some(Direction::Left),
+            15 => Some(Direction::Right),
             _ => None,
         }
     }

lighthouse-protocol/src/input/key_event.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{Delta, Unity, Zero};
+use crate::Direction;
 
 use super::{EventSource, KeyModifiers};
 
@@ -22,28 +22,28 @@ pub struct KeyEvent {
 
 impl KeyEvent {
     /// The direction if either the WASD or arrow keys were pressed.
-    pub fn direction<T>(&self) -> Option<Delta<T>> where T: Zero + Unity {
+    pub fn direction(&self) -> Option<Direction> {
         self.wasd_direction().or_else(|| self.arrow_direction())
     }
 
     /// The direction if one of the WASD keys was pressed.
-    pub fn wasd_direction<T>(&self) -> Option<Delta<T>> where T: Zero + Unity {
+    pub fn wasd_direction(&self) -> Option<Direction> {
         match self.code.as_str() {
-            "KeyW" => Some(Delta::UP),
-            "KeyA" => Some(Delta::LEFT),
-            "KeyS" => Some(Delta::DOWN),
-            "KeyD" => Some(Delta::RIGHT),
+            "KeyW" => Some(Direction::Up),
+            "KeyA" => Some(Direction::Left),
+            "KeyS" => Some(Direction::Down),
+            "KeyD" => Some(Direction::Right),
             _ => None,
         }
     }
 
     /// The direction if one of the arrow keys was pressed.
-    pub fn arrow_direction<T>(&self) -> Option<Delta<T>> where T: Zero + Unity {
+    pub fn arrow_direction(&self) -> Option<Direction> {
         match self.code.as_str() {
-            "ArrowUp" => Some(Delta::UP),
-            "ArrowLeft" => Some(Delta::LEFT),
-            "ArrowDown" => Some(Delta::DOWN),
-            "ArrowRight" => Some(Delta::RIGHT),
+            "ArrowUp" => Some(Direction::Up),
+            "ArrowLeft" => Some(Direction::Left),
+            "ArrowDown" => Some(Direction::Down),
+            "ArrowRight" => Some(Direction::Right),
             _ => None,
         }
     }