X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fcontroller.rs;h=030d962108caaa5ef46f701c9456d37cfa5c22b9;hb=e570927ad1703298a2c85599c7e25475c60b33d4;hp=23af1b28d494d8f0296a9eabd4e71e0eb5b5f45b;hpb=93fc5734baf7537eae88e3b1a418ceb868862f2b;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/controller.rs b/src/core/controller.rs
index 23af1b2..030d962 100644
--- 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,16 +83,16 @@ 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.normalized()
@@ -102,7 +102,7 @@ impl Stick {
     }
 }
 
-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
     )