Dependency update

Cargo.toml

@@ -10,4 +10,5 @@ authors = [
 name = "rust-pilot"
 
 [dependencies]
-piston_window = "0.40.0"
+piston_window = "*"
+#"0.40.0"

src/game/controls.rs

@@ -17,9 +17,8 @@ impl Controls {
         }
     }
 
-    pub fn update(&mut self, inp: Input) {
+    pub fn update(&mut self, inp: &Event) {
-        match inp {
+        if let Some(b) = inp.press_args() {
-            Input::Press(b) => {
             match b {
                 Button::Keyboard(Key::Up)    => { self.up_d    = true; }
                 Button::Keyboard(Key::Down)  => { self.down_d  = true; }
@@ -27,8 +26,9 @@ impl Controls {
                 Button::Keyboard(Key::Right) => { self.right_d = true; }
                 _ => {}
             }
+
         }
-            Input::Release(b) => {
+        if let Some(b) = inp.release_args() {
             match b {
                 Button::Keyboard(Key::Up)    => { self.up_d    = false; }
                 Button::Keyboard(Key::Down)  => { self.down_d  = false; }
@@ -38,8 +38,6 @@ impl Controls {
                 _ => {}
             }
         }
-            _ => {}
-        }
     }
 
     pub fn thrust_control(&self) -> Scalar {

src/game/mod.rs

@@ -60,9 +60,11 @@ impl Game {
         }
     }
 
-    pub fn render(&mut self, args: RenderArgs, w: PistonWindow) {
+    pub fn render<GE>(&mut self, args: RenderArgs, w: &mut PistonWindow, e: &GE) where
+        GE: GenericEvent
+    {
 
-        w.draw_2d(|context, gl| {
+        w.draw_2d(e, |context, gl| {
             draw_background(gl);
 
             let ds = context.draw_state.blend(Blend::Alpha);
@@ -105,7 +107,7 @@ impl Game {
         self.camera.follow(self.player.position, &self.map);
     }
 
-    pub fn input(&mut self, inp: Input) {
+    pub fn input(&mut self, inp: &Event) {
         self.controls.update(inp);
     }
 }

src/main.rs

@@ -9,7 +9,7 @@ const XDIM: u32 = 600;
 const YDIM: u32 = 600;
 
 fn main() {
-    let window: PistonWindow = WindowSettings::new(
+    let mut window: PistonWindow = WindowSettings::new(
         "rust-pilot",
         [XDIM, YDIM]
     )
@@ -21,18 +21,19 @@ fn main() {
 
     // Create a new game and run it.
     let mut game = Game::new(XDIM as Scalar, YDIM as Scalar);
-    for e in window {
+    while let Some(e) = window.next() {
-        match e.event {
+        match e {
-            Some(Event::Update(upd)) => {
+            Event::Loop(Loop::Update(upd)) => {
                 game.update(upd);
             }
 
-            Some(Event::Render(ren)) => {
+            Event::Loop(Loop::Render(ren)) => {
-                game.render(ren, e);
+                game.render(ren, &mut window, &e);
             }
 
-            Some(Event::Input(inp)) => {
+            Event::Input(inp) => {
-                game.input(inp);
+                let ev = Event::Input(inp);
+                game.input(&ev);
             }
             _ => {