X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fteststate.rs;h=82acb79f4dacad39c83465da0d3136f82a3e9132;hb=bb3eb700e040846ca793832da4adc133218f2954;hp=0a66d82982e2489bc25fecd4bbd4fb2c56603209;hpb=8012f86b052f550fe6644ec33a2713f381fc4347;p=kaka%2Frust-sdl-test.git

diff --git a/src/teststate.rs b/src/teststate.rs
index 0a66d82..82acb79 100644
--- a/src/teststate.rs
+++ b/src/teststate.rs
@@ -1,12 +1,12 @@
-use common::{Dimension, Point, Intersection};
 use core::app::{AppState, StateChange};
 use core::controller::ControllerManager;
 use core::level::Grid;
 use core::render::Renderer;
-use {point, dimen};
+use geometry::{Dimension, Point, Intersection};
 use sdl2::event::Event;
 use sprites::SpriteManager;
 use time::{Duration, Instant};
+use {point, dimen};
 
 pub struct TestState {
     start: Instant,
@@ -73,12 +73,12 @@ impl AppState for TestState {
 
 	let grid = Grid {
 	    size: dimen!(10, 10),
-	    cell_size: dimen!(30, 30),
+	    scale: dimen!(30.0, 30.0),
 	    cells: vec!(vec!(false; 10); 10),
 	};
 
 	let offset = point!(200, 200);
-	let size = grid.cell_size;
+	let size = grid.scale;
 	for x in 0..grid.size.width {
 	    for y in 0..grid.size.height {
 		let col = (32 + 32 * ((x + y) % 2)) as u8;
@@ -115,10 +115,9 @@ impl AppState for TestState {
     fn leave(&mut self) {
     }
 
-    fn handle_event(&mut self, _event: Event) -> Option<StateChange> {
-	match _event {
-	    Event::MouseMotion { x, y, .. } => self.mouse = point!(x, y),
-	    _ => {}
+    fn handle_event(&mut self, event: Event) -> Option<StateChange> {
+	if let Event::MouseMotion { x, y, .. } = event {
+	    self.mouse = point!(x, y);
 	}
 	None
     }