Merge pull request #199 from bvssvni/master

Published 0.80.0

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "pistoncore-glfw_window"
-version = "0.79.0"
+version = "0.80.0"
 authors = [
     "bvssvni <[email protected]>",
     "Coeuvre <[email protected]>",
@@ -28,5 +28,5 @@ name = "glfw_window"
 pistoncore-window = "1.0.0"
 pistoncore-input = "1.0.0"
 shader_version = "0.7.0"
-glfw = "0.53.0"
+glfw = "0.54.0"
 gl = "0.13.0"

src/lib.rs

@@ -17,7 +17,8 @@ use input::{
 use std::collections::VecDeque;
 use std::error::Error;
 use std::time::Duration;
-use std::{collections::HashMap, sync::mpsc::Receiver};
+use std::collections::HashMap;
+use glfw::GlfwReceiver as Receiver;
 use window::{
     AdvancedWindow, Api, BuildFromWindowSettings, OpenGLWindow, Position, ProcAddress, Size,
     UnsupportedGraphicsApiError, Window, WindowSettings,
@@ -48,7 +49,7 @@ const JOYSTICKS: [JoystickId; 16] = [
 /// Contains stuff for game window.
 pub struct GlfwWindow {
     /// The window.
-    pub window: glfw::Window,
+    pub window: glfw::PWindow,
     /// Receives events from window.
     events: Receiver<(f64, glfw::WindowEvent)>,
     /// GLFW context.
@@ -69,7 +70,7 @@ pub struct GlfwWindow {
 impl GlfwWindow {
     /// Create a new game window from an existing GLFW window.
     pub fn from_pieces(
-        mut win: glfw::Window,
+        mut win: glfw::PWindow,
         glfw: glfw::Glfw,
         events: Receiver<(f64, glfw::WindowEvent)>,
         exit_on_esc: bool,