X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=8474fab4ed116475f71d4be5ae779b769761a10a;hb=d34c324faf3016c49bfa53ad253f8b02920fa3bd;hp=bf7d2df3704e53e4c8c83daf9e4e18645b45ceec;hpb=bf7b5671bb386ccd3d325ae3dea33046342d129c;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index bf7d2df..8474fab 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,5 +1,5 @@
 use AppState;
-use common::Nanoseconds;
+use sdl2::joystick::PowerLevel;
 use common::Point2D;
 use core::controller::Controller;
 use core::controller::ControllerManager;
@@ -11,6 +11,7 @@ use sdl2::video::Window;
 use sprites::SpriteManager;
 use std::cell::RefCell;
 use std::rc::Rc;
+use time::Duration;
 
 ////////// GAMESTATE ///////////////////////////////////////////////////////////
 
@@ -28,7 +29,7 @@ impl GameState {
 }
 
 impl AppState for GameState {
-    fn enter(&mut self, ctrl_man: &mut ControllerManager) {
+    fn enter(&mut self, ctrl_man: &ControllerManager) {
 	if let Some(ctrl) = ctrl_man.controllers.get(&0) {
 	    self.world.add(Box::new(Character::new(ctrl.clone())));
 	}
@@ -36,11 +37,11 @@ impl AppState for GameState {
 
     fn leave(&mut self) {}
 
-    fn update(&mut self, dt: Nanoseconds) {
+    fn update(&mut self, dt: Duration) {
 	self.world.update(dt);
     }
 
-    fn render(&mut self, canvas: &mut Canvas<Window>, sprites: &mut SpriteManager) {
+    fn render(&mut self, canvas: &mut Canvas<Window>, sprites: &SpriteManager) {
 	self.world.render(canvas, sprites);
     }
 
@@ -66,7 +67,7 @@ impl World {
 	}
     }
 
-    pub fn update(&mut self, dt: Nanoseconds) {
+    pub fn update(&mut self, dt: Duration) {
 	let mut breeding_ground = vec!();
 
 	for i in (0..self.objects.len()).rev() {
@@ -80,7 +81,7 @@ impl World {
 	}
     }
 
-    pub fn render(&mut self, canvas: &mut Canvas<Window>, sprites: &mut SpriteManager) {
+    pub fn render(&mut self, canvas: &mut Canvas<Window>, sprites: &SpriteManager) {
 	self.level.render(canvas, sprites);
 	for o in &mut self.objects {
 	    o.render(canvas, sprites);
@@ -101,7 +102,7 @@ pub struct Level {
 }
 
 impl Level {
-    pub fn render(&mut self, canvas: &mut Canvas<Window>, _sprites: &mut SpriteManager) {
+    pub fn render(&mut self, canvas: &mut Canvas<Window>, _sprites: &SpriteManager) {
 	let w = canvas.viewport().width() as i32;
 	for i in 1..11 {
 	    let y = (i * i - 1) as i32 + self.ground as i32;
@@ -116,8 +117,8 @@ impl Level {
 type Objects = Vec<Box<dyn Object>>;
 
 pub trait Object {
-    fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Nanoseconds) -> ObjectState;
-    fn render(&self, _canvas: &mut Canvas<Window>, _sprites: &mut SpriteManager) {}
+    fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState;
+    fn render(&self, _canvas: &mut Canvas<Window>, _sprites: &SpriteManager) {}
 }
 
 #[derive(PartialEq)]
@@ -147,7 +148,7 @@ impl Character {
 }
 
 impl Object for Character {
-    fn update(&mut self, objects: &mut Objects, lvl: &Level, _dt: Nanoseconds) -> ObjectState {
+    fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState {
 	self.vel += lvl.gravity;
 	self.pos += self.vel;
 
@@ -173,7 +174,19 @@ impl Object for Character {
 		    bounces: 2,
 		}));
 	    }
-	    ctrl.rumble(1.0, _dt as u32 / 1_000_000);
+	    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 {
@@ -185,7 +198,7 @@ impl Object for Character {
 	Alive
     }
 
-    fn render(&self, canvas: &mut Canvas<Window>, sprites: &mut SpriteManager) {
+    fn render(&self, canvas: &mut Canvas<Window>, sprites: &SpriteManager) {
         let block = sprites.get("mario");
 	let size = 32;
         canvas.copy(block, None, Rect::new(self.pos.x as i32 - size as i32 / 2, self.pos.y as i32 - size as i32, size, size)).unwrap();
@@ -216,6 +229,8 @@ fn draw_cross(canvas: &mut Canvas<Window>, p: (i32, i32)) {
     canvas.draw_line((p.0, p.1 - 5), (p.0, p.1 + 5)).unwrap();
 }
 
+////////// BOLL ////////////////////////////////////////////////////////////////
+
 pub struct Boll {
     pos: Point2D<f64>,
     vel: Point2D<f64>,
@@ -223,7 +238,7 @@ pub struct Boll {
 }
 
 impl Object for Boll {
-    fn update(&mut self, _objects: &mut Objects, lvl: &Level, _dt: Nanoseconds) -> ObjectState {
+    fn update(&mut self, objects: &mut Objects, lvl: &Level, _dt: Duration) -> ObjectState {
 	self.vel += lvl.gravity;
 	self.pos += self.vel;
 
@@ -237,10 +252,22 @@ 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
     }
 
-    fn render(&self, canvas: &mut Canvas<Window>, _sprites: &mut SpriteManager) {
+    fn render(&self, canvas: &mut Canvas<Window>, _sprites: &SpriteManager) {
         let block = _sprites.get("block");
 	let size = 4 + self.bounces * 6;
         canvas.copy(block, None, Rect::new(self.pos.x as i32 - size as i32 / 2, self.pos.y as i32 - size as i32 / 2, size as u32, size as u32)).unwrap();