X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=3a8d3c9a2d0ccdaf12ea8ada7aa727cda3a19897;hb=953b4c960649b82f4e186c2a9afee5367270f0fc;hp=2fa7ddd5111be4d50ea9b80d5bacc8c2fd06352e;hpb=4074267844733949556af129550dfc42fc81da76;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index 2fa7ddd..3a8d3c9 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,11 +1,10 @@
-use teststate::TestState;
 use AppState;
-use common::{Point, ToAngle};
 use core::app::StateChange;
 use core::controller::Controller;
 use core::controller::ControllerManager;
 use core::level::{Level, LevelGenerator, Wall, IntersectResult::Intersection};
 use core::render::Renderer;
+use geometry::{Point, ToAngle};
 use point;
 use sdl2::event::Event;
 use sdl2::joystick::PowerLevel;
@@ -14,6 +13,7 @@ use sdl2::rect::Rect;
 use sprites::SpriteManager;
 use std::cell::RefCell;
 use std::rc::Rc;
+use teststate::TestState;
 use time::Duration;
 
 ////////// GAMESTATE ///////////////////////////////////////////////////////////
@@ -22,6 +22,7 @@ use time::Duration;
 pub struct GameState {
     world: World,
     lvlgen: LevelGenerator,
+    debug_mode: bool,
 }
 
 impl GameState {
@@ -30,6 +31,7 @@ impl GameState {
 	GameState {
 	    world: World::new(lvlgen.generate()),
 	    lvlgen,
+	    ..Default::default()
 	}
     }
 }
@@ -49,7 +51,7 @@ impl AppState for GameState {
     }
 
     fn render(&mut self, renderer: &mut Renderer, sprites: &SpriteManager) {
-	self.world.render(renderer, sprites);
+	self.world.render(renderer, sprites, self.debug_mode);
     }
 
     fn handle_event(&mut self, event: Event) -> Option<StateChange> {
@@ -60,6 +62,9 @@ impl AppState for GameState {
 	    Event::KeyDown { keycode: Some(Keycode::Return), .. } => {
 		return Some(StateChange::Push(Box::new(TestState::new())))
             }
+	    Event::KeyDown { keycode: Some(Keycode::KpEnter), .. } => {
+		self.debug_mode = !self.debug_mode;
+	    }
 	    Event::KeyDown { keycode: Some(Keycode::Space), .. } => {
 		self.lvlgen.seed = std::time::UNIX_EPOCH.elapsed().unwrap().as_secs() as u32;
 		self.world.level = self.lvlgen.generate();
@@ -122,8 +127,8 @@ impl World {
 	println!("\x1b[Kobject count: {}\x1b[1A", self.objects.len()); // clear line, print, move cursor up
     }
 
-    pub fn render(&mut self, renderer: &mut Renderer, sprites: &SpriteManager) {
-	self.level.render(renderer, sprites);
+    pub fn render(&mut self, renderer: &mut Renderer, sprites: &SpriteManager, debug_mode: bool) {
+	self.level.render(renderer, sprites, debug_mode);
 	for o in &mut self.objects {
 	    o.render(renderer, sprites);
 	}