Merge pull request #35 from mitchmindtree/master

Updated to latest gfx and use crates.io dependencies

Author: kvark

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "piston_window"
-version = "0.0.6"
+version = "0.0.7"
 authors = ["bvssvni <[email protected]>"]
 keywords = ["window", "piston"]
 description = "The official Piston window back-end for the Piston game engine"
@@ -15,22 +15,14 @@ homepage = "https://github.com/pistondevelopers/piston_window"
 path = "src/lib.rs"
 name = "piston_window"
 
-[dependencies.piston]
-#git = "https://github.com/pistondevelopers/piston"
-version = "0.1.3"
 
-[dependencies.gfx]
-git = "https://github.com/gfx-rs/gfx-rs"
+[dependencies]
+gfx = "0.6.*"
+gfx_device_gl = "0.4.*"
+piston = "0.1.3"
+piston2d-gfx_graphics = "0.1.20"
+piston2d-graphics = "0.0.48"
 
-[dependencies.gfx_device_gl]
-git = "https://github.com/gfx-rs/gfx_device_gl"
+[dev-dependencies]
+pistoncore-glutin_window = "0.0.8"
 
-[dependencies.piston2d-gfx_graphics]
-git = "https://github.com/pistondevelopers/gfx_graphics"
-
-[dependencies.piston2d-graphics]
-git = "https://github.com/pistondevelopers/graphics"
-
-[dev-dependencies.pistoncore-glutin_window]
-#git = "https://github.com/pistondevelopers/glutin_window"
-version = "0.0.8"

src/lib.rs

@@ -36,6 +36,8 @@ pub struct PistonWindow<W: window::Window, T = ()> {
     pub event: Option<event::Event<W::Event>>,
     /// Application structure.
     pub app: Rc<RefCell<T>>,
+    /// The factory that was created along with the device.
+    pub factory: Rc<RefCell<gfx_device_gl::Factory>>,
 }
 
 impl<W, T> Clone for PistonWindow<W, T>
@@ -50,6 +52,7 @@ impl<W, T> Clone for PistonWindow<W, T>
             events: self.events.clone(),
             event: self.event.clone(),
             app: self.app.clone(),
+            factory: self.factory.clone(),
         }
     }
 }
@@ -64,8 +67,8 @@ impl<W, T> PistonWindow<W, T>
         use piston::event::Events;
         use piston::window::{ OpenGLWindow, Window };
 
-        let device = gfx_device_gl::Device::new(|s| window.borrow_mut().get_proc_address(s));
-        let mut factory = device.spawn_factory();
+        let (device, mut factory) =
+            gfx_device_gl::create(|s| window.borrow_mut().get_proc_address(s));
 
         let draw_size = window.borrow().draw_size();
         let output = factory.make_fake_output(draw_size.width as u16, draw_size.height as u16);
@@ -82,6 +85,7 @@ impl<W, T> PistonWindow<W, T>
             events: Rc::new(RefCell::new(window.events())),
             event: None,
             app: app,
+            factory: Rc::new(RefCell::new(factory)),
         }
     }
 
@@ -95,6 +99,7 @@ impl<W, T> PistonWindow<W, T>
             events: self.events,
             event: self.event,
             app: app,
+            factory: self.factory,
         }
     }
 
@@ -163,6 +168,7 @@ impl<W, T> Iterator for PistonWindow<W, T>
                 events: self.events.clone(),
                 event: Some(e),
                 app: self.app.clone(),
+                factory: self.factory.clone(),
             })
         } else { None }
     }
@@ -196,6 +202,7 @@ impl<W, T> event::GenericEvent for PistonWindow<W, T>
                         events: old_event.events.clone(),
                         event: Some(e),
                         app: old_event.app.clone(),
+                        factory: old_event.factory.clone(),
                     })
                 }
                 None => None