Update glfw to 0.56.0 (#32)

tommy-xr · Sep 3, 2024 · a4a3db4 · a4a3db4
1 parent 5303763
commit a4a3db4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtimes/desktop_runtime/Cargo.toml b/runtimes/desktop_runtime/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 gl = "0.14.0"
-glfw = "0.45.0"
+glfw = "0.56.0"
 engine = { path = "../../engine" }
 dark = { path = "../../dark" }
 shock2vr = { path = "../../shock2vr" }

diff --git a/runtimes/desktop_runtime/src/main.rs b/runtimes/desktop_runtime/src/main.rs
@@ -9,6 +9,7 @@ use dark::SCALE_FACTOR;
 use engine::profile;
 
 use engine::util::compute_view_matrix_from_render_context;
+use glfw::GlfwReceiver;
 use glfw::Modifiers;
 use shock2vr::command::LoadCommand;
 use shock2vr::command::MoveInventoryCommand;
@@ -184,7 +185,7 @@ pub fn main() {
     //tracing_subscriber::fmt::init();
     let args = Args::parse();
     //panic!("args: {:?}", args);
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::fail_on_errors).unwrap();
     // TODO: Figure out ANGLE
     // glfw.window_hint(glfw::WindowHint::ClientApi(glfw::OpenGlEs));
     glfw.window_hint(glfw::WindowHint::ContextVersion(4, 1));
@@ -391,7 +392,7 @@ fn process_events(
     camera_context: &mut CameraContext,
     hand_context: &mut HandContext,
     last_input_state: &InputState,
-    events: &Receiver<(f64, glfw::WindowEvent)>,
+    events: &GlfwReceiver<(f64, glfw::WindowEvent)>,
     delta_time: f32,
 ) -> (InputContext, InputState, Vec<Box<dyn Command>>, Vec<Effect>) {
     let _speed = 20.0;

diff --git a/runtimes/tool/Cargo.toml b/runtimes/tool/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 gl = "0.14.0"
-glfw = "0.45.0"
+glfw = "0.56.0"
 engine = { path = "../../engine" }
 engine_ffmpeg = { path = "../../engine_ffmpeg" }
 dark = { path = "../../dark" }

diff --git a/runtimes/tool/src/main.rs b/runtimes/tool/src/main.rs
@@ -1,5 +1,6 @@
 extern crate glfw;
 use engine_ffmpeg::VideoPlayer;
+use glfw::GlfwReceiver;
 
 use self::glfw::{Action, Context, Key};
 use engine::audio::{self, AudioClip, AudioContext, AudioHandle};
@@ -168,7 +169,7 @@ pub fn main() {
 
     // panic!();
     tracing_subscriber::fmt::init();
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::fail_on_errors).unwrap();
     // TODO: Figure out ANGLE
     // glfw.window_hint(glfw::WindowHint::ClientApi(glfw::OpenGlEs));
     glfw.window_hint(glfw::WindowHint::ContextVersion(4, 1));
@@ -426,7 +427,7 @@ fn process_events(
     //audio: &mut AudioContext,
     window: &mut glfw::Window,
     camera_context: &mut CameraContext,
-    events: &Receiver<(f64, glfw::WindowEvent)>,
+    events: &GlfwReceiver<(f64, glfw::WindowEvent)>,
     delta_time: f32,
 ) -> (InputContext, Vec<Box<dyn Command>>) {
     let _speed = 20.0;