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

diff --git a/src/core/game.rs b/src/core/game.rs
index bf6d0ba..bf7d2df 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,17 +1,16 @@
-use sdl2::controller::{Axis, Button};
-use core::controller::ControllerManager;
-use std::cell::RefCell;
-use std::rc::Rc;
-use core::controller::Controller;
-use common::Point2D;
-use sdl2::rect::Rect;
+use AppState;
 use common::Nanoseconds;
+use common::Point2D;
+use core::controller::Controller;
+use core::controller::ControllerManager;
+use point;
 use sdl2::event::Event;
-use sprites::SpriteManager;
+use sdl2::rect::Rect;
 use sdl2::render::Canvas;
 use sdl2::video::Window;
-use AppState;
-use point;
+use sprites::SpriteManager;
+use std::cell::RefCell;
+use std::rc::Rc;
 
 ////////// GAMESTATE ///////////////////////////////////////////////////////////
 
@@ -152,32 +151,32 @@ impl Object for Character {
 	self.vel += lvl.gravity;
 	self.pos += self.vel;
 
-	let ctrl = &self.ctrl.borrow().ctrl;
-	let right_stick = point!(ctrl.axis(Axis::RightX) as f64 / 32768.0, ctrl.axis(Axis::RightY) as f64 / 32768.0);
+	let ctrl = self.ctrl.borrow();
 
 	if self.pos.y >= lvl.ground {
 	    self.pos.y = lvl.ground;
 	    self.vel.y = 0.0;
 	    self.vel.x *= 0.9;
 
-	    if ctrl.button(Button::LeftShoulder) {
-		self.vel = right_stick * 5.0;
+	    if ctrl.jump.is_pressed {
+		self.vel = ctrl.aim.to_point() * 5.0;
 	    }
 	}
 
-	if ctrl.button(Button::RightShoulder) {
+	if ctrl.shoot.is_pressed {
 	    use rand::distributions::{Distribution, Normal};
 	    let normal = Normal::new(0.0, 0.1);
 	    for _i in 0..100 {
 		objects.push(Box::new(Boll {
 		    pos: self.pos,
-		    vel: right_stick * (3.0 + rand::random::<f64>()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel,
+		    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,
 		    bounces: 2,
 		}));
 	    }
+	    ctrl.rumble(1.0, _dt as u32 / 1_000_000);
 	}
 
-	match ctrl.axis(Axis::LeftX) as f64 / 32768.0 {
+	match ctrl.mov.x {
 	    v if v < -0.9 => { self.vel.x -= 0.5 }
 	    v if v > 0.9 => { self.vel.x += 0.5 }
 	    _ => {}
@@ -190,13 +189,33 @@ impl Object for Character {
         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();
-	let ctrl = &self.ctrl.borrow().ctrl;
-	let (x, y) = (ctrl.axis(Axis::RightX) as f64 / 32768.0, ctrl.axis(Axis::RightY) as f64 / 32768.0);
+
+	let ctrl = &self.ctrl.borrow();
+	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();
 	canvas.set_draw_color((0, 255, 0));
-	canvas.draw_line((self.pos.x as i32, self.pos.y as i32), ((self.pos.x + x * size as f64) as i32, (self.pos.y + y * size as f64) as i32)).unwrap();
+	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();
+	canvas.set_draw_color((255, 0, 0));
+	canvas.draw_line(pos, p).unwrap();
+	draw_cross(canvas, p);
+	// circle values
+	let p = (self.pos + Point2D::from(ctrl.aim.a) * l).to_i32().into();
+	canvas.set_draw_color((0, 0, 255));
+	canvas.draw_line(pos, p).unwrap();
+	draw_cross(canvas, p);
     }
 }
 
+fn draw_cross(canvas: &mut Canvas<Window>, p: (i32, i32)) {
+    canvas.draw_line((p.0 - 5, p.1), (p.0 + 5, p.1)).unwrap();
+    canvas.draw_line((p.0, p.1 - 5), (p.0, p.1 + 5)).unwrap();
+}
+
 pub struct Boll {
     pos: Point2D<f64>,
     vel: Point2D<f64>,