From 0a75b3dfc944f8c388d9b0950224efc601af4c83 Mon Sep 17 00:00:00 2001
From: Coeuvre <coeuvre@gmail.com>
Date: Mon, 9 Jun 2014 08:36:12 +0800
Subject: [PATCH] Upgraded to latest Piston

---
 src/app.rs   | 32 +++++++++++---------------------
 src/board.rs |  2 +-
 src/main.rs  |  1 -
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 177aea7..30ce494 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -77,41 +77,31 @@ impl<'a> Game for App<'a> {
         self.comment2 = Some(Texture::from_path(&asset_store.path("comment2.png").unwrap()).unwrap());
     }
 
-    fn render(&self, _ext_dt: f64, c: &Context, gl: &mut Gl) {
-        self.render_ui(c, gl);
-        self.board.render(self.number_renderer.get_ref(), c, gl);
+    fn render(&self, c: &Context, args: RenderArgs) {
+        self.render_ui(c, args.gl);
+        self.board.render(self.number_renderer.get_ref(), c, args.gl);
     }
 
-    fn update(&mut self, dt: f64, _asset_store: &mut AssetStore) {
-        self.board.update(dt);
+    fn update(&mut self, args: UpdateArgs) {
+        self.board.update(args.dt);
     }
 
-    fn key_press(
-        &mut self,
-        key: keyboard::Key,
-        _asset_store: &mut AssetStore
-    ) {
-        if key == keyboard::Left {
+    fn key_press(&mut self, args: KeyPressArgs) {
+        if args.key == keyboard::Left {
             self.board.merge_from_right_to_left();
         }
-        if key == keyboard::Right {
+        if args.key == keyboard::Right {
             self.board.merge_from_left_to_right();
         }
-        if key == keyboard::Up {
+        if args.key == keyboard::Up {
             self.board.merge_from_bottom_to_top();
         }
-        if key == keyboard::Down {
+        if args.key == keyboard::Down {
             self.board.merge_from_top_to_bottom();
         }
-        if key == keyboard::Space {
+        if args.key == keyboard::Space {
             self.board = Board::new(self.settings);
         }
     }
-
-    fn key_release(
-        &mut self,
-        _key: keyboard::Key,
-        _asset_store: &mut AssetStore
-    ) {}
 }
 
diff --git a/src/board.rs b/src/board.rs
index c606d5c..7743e81 100644
--- a/src/board.rs
+++ b/src/board.rs
@@ -1,6 +1,6 @@
 
 use std::iter::range_step;
-use collections::hashmap::HashSet;
+use std::collections::hashmap::HashSet;
 use std::rand::random;
 use graphics::*;
 use piston::*;
diff --git a/src/main.rs b/src/main.rs
index 9d6daa0..2045d51 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 
 #![feature(globs)]
 
-extern crate collections;
 extern crate serialize;
 
 extern crate graphics;