X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=55bb80cb688a7b690daf0cefa0eec7371480a3fa;hb=a6b57e450092f390103915bb8b936ceb9a116b03;hp=e5e2aa6d8bdab4897c3d46670ba158c34c19ae29;hpb=ee533e13b52bf1fc13139dad7a9612c789c3d827;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index e5e2aa6..55bb80c 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -2,10 +2,12 @@ use AppState;
 use common::Point2D;
 use core::controller::Controller;
 use core::controller::ControllerManager;
+use core::level::Level;
 use core::render::Renderer;
 use point;
 use sdl2::event::Event;
 use sdl2::joystick::PowerLevel;
+use sdl2::keyboard::Keycode;
 use sdl2::rect::Rect;
 use sprites::SpriteManager;
 use std::cell::RefCell;
@@ -44,7 +46,20 @@ impl AppState for GameState {
 	self.world.render(renderer, sprites);
     }
 
-    fn handle_event(&mut self, _event: Event) {}
+    fn handle_event(&mut self, event: Event) {
+	match event {
+	    Event::KeyDown { keycode: Some(Keycode::Space), .. } => {
+		self.world.level.regenerate();
+	    }
+	    Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => {
+		self.world.level.increase_iteration();
+	    }
+	    Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => {
+		self.world.level.decrease_iteration();
+	    }
+	    _ => {}
+	}
+    }
 }
 
 ////////// WORLD ///////////////////////////////////////////////////////////////
@@ -58,10 +73,7 @@ pub struct World {
 impl World {
     pub fn new() -> Self {
 	World {
-	    level: Level {
-		gravity: point!(0.0, 0.1),
-		ground: 600.0,
-	    },
+	    level: Level::new(point!(0.0, 0.1), 600.0),
 	    ..Default::default()
 	}
     }
@@ -92,25 +104,6 @@ impl World {
     }
 }
 
-////////// LEVEL ///////////////////////////////////////////////////////////////
-
-#[derive(Default)]
-pub struct Level {
-    gravity: Point2D<f64>,
-    ground: f64,		// just to have something
-}
-
-impl Level {
-    pub fn render(&mut self, renderer: &mut Renderer, _sprites: &SpriteManager) {
-	let w = renderer.viewport().0 as i32;
-	for i in 1..11 {
-	    let y = (i * i - 1) as i32 + self.ground as i32;
-	    renderer.canvas().set_draw_color((255 - i * 20, 255 - i * 20, 0));
-	    renderer.canvas().draw_line((0, y), (w, y)).unwrap();
-	}
-    }
-}
-
 ////////// OBJECT //////////////////////////////////////////////////////////////
 
 type Objects = Vec<Box<dyn Object>>;
@@ -248,15 +241,19 @@ 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;
+	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 self.bounces == 0 {
+		return Dead
+	    }
+	    self.vel = -self.vel;
+	    self.bounces -= 1;
 	    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
+	    	vel: self.vel * normal.sample(&mut rand::thread_rng()),
+	    	..*self
 	    }));
 	}
 
@@ -267,7 +264,7 @@ impl Object for Boll {
         let block = _sprites.get("block");
 	let size = 4 + self.bounces * 6;
         renderer.blit(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));
-	// renderer.set_draw_color((0, self.bounces * 100, 255));
-	// renderer.draw_point((self.pos.x as i32, self.pos.y as i32)).unwrap();
+	// renderer.canvas().set_draw_color((0, self.bounces * 100, 255));
+	// renderer.canvas().draw_point((self.pos.x as i32, self.pos.y as i32)).unwrap();
     }
 }