X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=554bde720ac02ec2452db5328a8def228c45e2c6;hb=1f42d724d84ed1c014ff40ccc91058472391be0c;hp=3dacac1560830d572d06c6ffe1ae989715d59158;hpb=9768e2bbbcdfa38e84d593215c098ba96db754da;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index 3dacac1..554bde7 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -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,
@@ -66,13 +66,21 @@ 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), .. } => {
 		if self.lvlgen.iterations > 0 {
 		    self.lvlgen.iterations -= 1;
-		    println!("{} iteration(s) of cellular automata", self.lvlgen.iterations);
+		    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();
 		}
 	    }
@@ -165,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) {
@@ -263,8 +271,8 @@ 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;
+	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