Limit stick point to unit vector

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

diff --git a/src/core/game.rs b/src/core/game.rs
index e335798..f48d9b3 100644 (file)
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,4 +1,5 @@
 use AppState;
+use sdl2::joystick::PowerLevel;
 use common::Point2D;
 use core::controller::Controller;
 use core::controller::ControllerManager;
@@ -169,13 +170,25 @@ impl Object for Character {
            for _i in 0..100 {
                objects.push(Box::new(Boll {
                    pos: self.pos,
-                   vel: ctrl.aim.to_adjusted_point() * (3.0 + rand::random::<f64>()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel,
+                   vel: ctrl.aim.to_point() * (3.0 + rand::random::<f64>()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel,
                    bounces: 2,
                }));
            }
            ctrl.rumble(1.0, dt);
        }
 
+       if ctrl.start.is_pressed && !ctrl.start.was_pressed {
+           match ctrl.device.power_level() {
+               Ok(PowerLevel::Unknown) => { println!("power level unknown"); }
+               Ok(PowerLevel::Empty) => { println!("power level empty"); }
+               Ok(PowerLevel::Low) => { println!("power level low"); }
+               Ok(PowerLevel::Medium) => { println!("power level medium"); }
+               Ok(PowerLevel::Full) => { println!("power level full"); }
+               Ok(PowerLevel::Wired) => { println!("power level wired"); }
+               Err(_) => {}
+           };
+       }
+
        match ctrl.mov.x {
            v if v < -0.9 => { self.vel.x -= 0.5 }
            v if v > 0.9 => { self.vel.x += 0.5 }
@@ -194,12 +207,12 @@ impl Object for Character {
        let l = 300.0;
        let pos = (self.pos.x as i32, self.pos.y as i32);
        // axis values
-       let p = (self.pos + ctrl.aim.to_point() * l).to_i32().into();
+       let p = (self.pos + ctrl.aim.to_axis_point() * l).to_i32().into();
        canvas.set_draw_color((0, 255, 0));
        canvas.draw_line(pos, p).unwrap();
        draw_cross(canvas, p);
-       // adjusted values
-       let p = (self.pos + ctrl.aim.to_adjusted_point() * l).to_i32().into();
+       // values limited to unit vector
+       let p = (self.pos + ctrl.aim.to_point() * l).to_i32().into();
        canvas.set_draw_color((255, 0, 0));
        canvas.draw_line(pos, p).unwrap();
        draw_cross(canvas, p);
@@ -225,7 +238,7 @@ pub struct Boll {
 }
 
 impl Object for Boll {
-    fn update(&mut self, _objects: &mut Objects, lvl: &Level, _dt: Duration) -> ObjectState {
+    fn update(&mut self, objects: &mut Objects, lvl: &Level, _dt: Duration) -> ObjectState {
        self.vel += lvl.gravity;
        self.pos += self.vel;
 
@@ -239,6 +252,18 @@ impl Object for Boll {
            }
        }
 
+       if self.pos.x <= 0.0 || self.pos.x >= 1280.0 { // only for testing
+           self.pos.x = self.pos.x.max(0.0).min(1280.0);
+           self.vel.x = -self.vel.x;
+           self.bounces = 0;
+           use rand::distributions::{Distribution, Normal};
+           let normal = Normal::new(0.5, 0.4);
+           objects.push(Box::new(Boll {
+               vel: self.vel * normal.sample(&mut rand::thread_rng()),
+               ..*self
+           }));
+       }
+
        Alive
     }