Point2D -> Point

[kaka/rust-sdl-test.git] / src / core / controller.rs

diff --git a/src/core/controller.rs b/src/core/controller.rs
index 9d23257..030d962 100644 (file)
--- a/src/core/controller.rs
+++ b/src/core/controller.rs
@@ -1,4 +1,4 @@
-use common::Point2D;
+use common::Point;
 use {hashmap, point};
 use common::Radians;
 use sdl2::HapticSubsystem;
@@ -83,26 +83,26 @@ impl Stick {
        self.a = Radians(self.y.atan2(self.x) as f64);
     }
 
-    #[inline(always)] #[allow(dead_code)] fn up(&self) -> bool { self.y > 0.99 }
-    #[inline(always)] #[allow(dead_code)] fn down(&self) -> bool { self.y < -0.99 }
-    #[inline(always)] #[allow(dead_code)] fn left(&self) -> bool { self.x < -0.99 }
-    #[inline(always)] #[allow(dead_code)] fn right(&self) -> bool { self.x > 0.99 }
+    #[inline(always)] #[allow(dead_code)] pub fn up(&self) -> bool { self.y < -0.99 }
+    #[inline(always)] #[allow(dead_code)] pub fn down(&self) -> bool { self.y > 0.99 }
+    #[inline(always)] #[allow(dead_code)] pub fn left(&self) -> bool { self.x < -0.99 }
+    #[inline(always)] #[allow(dead_code)] pub fn right(&self) -> bool { self.x > 0.99 }
 
-    pub fn to_axis_point(&self) -> Point2D<f64> {
+    pub fn to_axis_point(&self) -> Point<f64> {
        point!(self.x as f64, self.y as f64)
     }
 
-    pub fn to_point(&self) -> Point2D<f64> {
+    pub fn to_point(&self) -> Point<f64> {
        let p = point!(self.x as f64, self.y as f64);
        if p.length() > 1.0 {
-           p.normalize()
+           p.normalized()
        } else {
            p
        }
     }
 }
 
-impl From<&Stick> for Point2D<f64> {
+impl From<&Stick> for Point<f64> {
     fn from(item: &Stick) -> Self {
        Self {
            x: item.x as f64,
@@ -216,7 +216,7 @@ fn get_action_mapping() -> HashMap<ActionControls, DeviceControls> {
        ActionControls::MovementY => DeviceControls::AxisLY,
        ActionControls::AimX => DeviceControls::AxisRX,
        ActionControls::AimY => DeviceControls::AxisRY,
-       ActionControls::Jump => DeviceControls::ButtonL1,
+       ActionControls::Jump => DeviceControls::ButtonA,
        ActionControls::Shoot => DeviceControls::ButtonR1,
        ActionControls::Start => DeviceControls::ButtonStart
     )