X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=8fbbef04059a7c971cd32eb1bd0a7cc72b4a55bd;hb=b0137bb6d47c158bff30f2d4fd1faab9d4945d54;hp=36e6ed50c38e8c79af9d4a8bb3fc3e1ed8d3e1d0;hpb=f3fe1a328df7ca0db89ddb14b7d45c3f16cea7fa;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index 36e6ed5..8fbbef0 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,10 +1,10 @@
-use ActiveState;
+use teststate::TestState;
 use AppState;
-use common::{Point2D, Radians};
+use common::{Point, Radians};
 use core::app::StateChange;
 use core::controller::Controller;
 use core::controller::ControllerManager;
-use core::level::{Level, LevelGenerator};
+use core::level::{Level, LevelGenerator, Wall, IntersectResult::Intersection};
 use core::render::Renderer;
 use point;
 use sdl2::event::Event;
@@ -26,7 +26,7 @@ pub struct GameState {
 
 impl GameState {
     pub fn new() -> Self {
-	let lvlgen = LevelGenerator::new(0, 5);
+	let lvlgen = LevelGenerator::new(0);
 	GameState {
 	    world: World::new(lvlgen.generate()),
 	    lvlgen,
@@ -58,7 +58,7 @@ impl AppState for GameState {
 		return Some(StateChange::Pop)
             }
 	    Event::KeyDown { keycode: Some(Keycode::Return), .. } => {
-		return Some(StateChange::Push(Box::new(ActiveState::new((800, 600)))))
+		return Some(StateChange::Push(Box::new(TestState::new())))
             }
 	    Event::KeyDown { keycode: Some(Keycode::Space), .. } => {
 		self.lvlgen.seed = std::time::UNIX_EPOCH.elapsed().unwrap().as_secs() as u32;
@@ -66,14 +66,24 @@ impl AppState for GameState {
 	    }
 	    Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => {
 		self.lvlgen.iterations += 1;
-		println!("{} iteration(s) of cellular automata", self.lvlgen.iterations);
 		self.world.level = self.lvlgen.generate();
 	    }
 	    Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => {
-		self.lvlgen.iterations = 1.max(self.lvlgen.iterations - 1);
-		println!("{} iteration(s) of cellular automata", self.lvlgen.iterations);
+		if self.lvlgen.iterations > 0 {
+		    self.lvlgen.iterations -= 1;
+		    self.world.level = self.lvlgen.generate();
+		}
+	    }
+	    Event::KeyDown { keycode: Some(Keycode::KpMultiply), .. } => {
+		self.lvlgen.wall_smooth_radius += 1;
 		self.world.level = self.lvlgen.generate();
 	    }
+	    Event::KeyDown { keycode: Some(Keycode::KpDivide), .. } => {
+		if self.lvlgen.wall_smooth_radius > 0 {
+		    self.lvlgen.wall_smooth_radius -= 1;
+		    self.world.level = self.lvlgen.generate();
+		}
+	    }
 	    _ => {}
 	}
 	None
@@ -145,8 +155,8 @@ pub trait Drawable {}
 
 pub struct Character {
     ctrl: Rc<RefCell<Controller>>,
-    pos: Point2D<f64>,
-    vel: Point2D<f64>,
+    pos: Point<f64>,
+    vel: Point<f64>,
 }
 
 impl Character {
@@ -163,8 +173,8 @@ impl Object for Character {
     fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState {
 	let ctrl = self.ctrl.borrow();
 
-	let x = (self.pos.x / lvl.grid.cell_size as f64).min(lvl.grid.width as f64 - 1.0).max(0.0) as usize;
-	let y = (self.pos.y / lvl.grid.cell_size as f64).min(lvl.grid.height as f64 - 1.0).max(0.0) as usize;
+	let x = (self.pos.x / lvl.grid.cell_size.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize;
+	let y = (self.pos.y / lvl.grid.cell_size.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize;
 	self.vel += lvl.gravity;
 	if lvl.grid.cells[x][y] {
 	    if self.vel.y > 0.0 && !(ctrl.mov.down() && ctrl.jump.is_pressed) {
@@ -237,7 +247,7 @@ impl Object for Character {
 	renderer.draw_line(pos, p, (0, 255, 0));
 	draw_cross(renderer, p);
 	// // circle values
-	// let p = (self.pos + Point2D::from(ctrl.aim.a) * l).to_i32().into();
+	// let p = (self.pos + Point::from(ctrl.aim.a) * l).to_i32().into();
 	// renderer.draw_line(pos, p, (0, 0, 255));
 	// draw_cross(renderer, p);
     }
@@ -251,8 +261,8 @@ fn draw_cross(renderer: &mut Renderer, p: (i32, i32)) {
 ////////// BOLL ////////////////////////////////////////////////////////////////
 
 pub struct Boll {
-    pos: Point2D<f64>,
-    vel: Point2D<f64>,
+    pos: Point<f64>,
+    vel: Point<f64>,
     bounces: u8,
 }
 
@@ -261,12 +271,11 @@ impl Object for Boll {
 	self.vel += lvl.gravity;
 	self.pos += self.vel;
 
-	let x = (self.pos.x / lvl.grid.cell_size as f64).min(lvl.grid.width as f64 - 1.0).max(0.0) as usize;
-	let y = (self.pos.y / lvl.grid.cell_size as f64).min(lvl.grid.height as f64 - 1.0).max(0.0) as usize;
-	if lvl.grid.cells[x][y] {
+	if let Intersection(wall, pos) = lvl.intersect_walls(self.pos - self.vel, self.pos) {
 	    if self.bounces == 0 {
 		return Dead
 	    }
+	    self.pos = pos;
 	    self.vel *= -0.25;
 	    self.pos += self.vel;
 	    self.bounces -= 1;
@@ -274,10 +283,27 @@ impl Object for Boll {
 	    let mut rng = rand::thread_rng();
 	    let a = Radians(self.vel.to_radians().0 + Normal::new(0.0, 0.75).sample(&mut rng));
 	    objects.push(Box::new(Boll {
-	    	vel: Point2D::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(),
+	    	vel: Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(),
 	    	..*self
 	    }));
 	}
+	// let x = (self.pos.x / lvl.grid.cell_size.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize;
+	// let y = (self.pos.y / lvl.grid.cell_size.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize;
+	// if lvl.grid.cells[x][y] {
+	//     if self.bounces == 0 {
+	// 	return Dead
+	//     }
+	//     self.vel *= -0.25;
+	//     self.pos += self.vel;
+	//     self.bounces -= 1;
+	//     use rand::distributions::{Distribution, Normal};
+	//     let mut rng = rand::thread_rng();
+	//     let a = Radians(self.vel.to_radians().0 + Normal::new(0.0, 0.75).sample(&mut rng));
+	//     objects.push(Box::new(Boll {
+	//     	vel: Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(),
+	//     	..*self
+	//     }));
+	// }
 
 	Alive
     }