diff --git a/Cargo.toml b/Cargo.toml index f9c7194..1ddefe7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,13 +27,13 @@ short_description = "A Raytracer." [dependencies] # error handling -anyhow = "1.0.79" +anyhow = "1.0.80" # time -chrono = { version = "0.4.32", default-features = false, features = ["clock"] } +chrono = { version = "0.4.34", default-features = false, features = ["clock"] } # image loading and saving -image = { version = "0.24.8", default-features = false, features = [ +image = { version = "0.24.9", default-features = false, features = [ "png", "jpeg", "tiff", @@ -41,39 +41,39 @@ image = { version = "0.24.8", default-features = false, features = [ ] } # logging -log = "0.4.20" -simplelog = "0.12.1" +log = "0.4.21" +simplelog = "0.12.2" # linear algebra -nalgebra = { version = "0.32.3", features = ["glam022"] } +nalgebra = { version = "0.32.4", features = ["glam022"] } rand = "0.8.5" # obj file loading obj = "0.10.2" # automatic parallelization -rayon = "1.8.1" -bytemuck = { version = "1.14.1", features = ["derive"] } +rayon = "1.9.0" +bytemuck = { version = "1.14.3", features = ["derive"] } # total order for floats ordered-float = "4.2.0" # generic serialization / deserialization -serde = { version = "1.0.195", features = ["derive"] } -serde_yaml = "0.9.30" +serde = { version = "1.0.197", features = ["derive"] } +serde_yaml = "0.9.32" # GUI -eframe = { version = "0.25", features = [ +eframe = { version = "0.26.2", features = [ "wgpu", "accesskit", "default_fonts", "wayland", "x11", ], default-features = false } -egui = { version = "0.25", features = ["log", "color-hex"] } -egui-wgpu = { version = "0.25" } -egui_file = "0.14.1" -egui_extras = { version = "0.25", features = ["svg", "image"] } +egui = { version = "0.26.2", features = ["log", "color-hex"] } +egui-wgpu = { version = "0.26.2" } +egui_file = "0.16.3" +egui_extras = { version = "0.26.2", features = ["svg", "image"] } color-hex = "0.2.0" # BVH diff --git a/src/ui/preview/gpu.rs b/src/ui/preview/gpu.rs index f95b1a0..c01dbb5 100644 --- a/src/ui/preview/gpu.rs +++ b/src/ui/preview/gpu.rs @@ -70,6 +70,7 @@ impl CallbackTrait for WgpuPainter { &self, device: &wgpu::Device, queue: &wgpu::Queue, + _screen_descriptor: &egui_wgpu::ScreenDescriptor, _egui_encoder: &mut wgpu::CommandEncoder, callback_resources: &mut egui_wgpu::CallbackResources, ) -> Vec { diff --git a/src/ui/preview/mod.rs b/src/ui/preview/mod.rs index 0615dcd..2d4c1ee 100644 --- a/src/ui/preview/mod.rs +++ b/src/ui/preview/mod.rs @@ -235,7 +235,7 @@ impl Preview { scene.camera.look_at = scene.camera.position + (new_point - scene.camera.position).normalize(); - scene.camera.fov = (scene.camera.fov - (ui.input(|i| i.scroll_delta.y) * 0.001)) + scene.camera.fov = (scene.camera.fov - (ui.input(|i| i.raw_scroll_delta.y) * 0.001)) .clamp(0.0_f32.to_radians(), 180.0_f32.to_radians()); // compute movement diff --git a/src/ui/renderresult.rs b/src/ui/renderresult.rs index ccd3bd9..eb25da2 100644 --- a/src/ui/renderresult.rs +++ b/src/ui/renderresult.rs @@ -23,7 +23,7 @@ impl RenderResult { // Check if the dialog is being hovered over or active if response.has_focus() || response.hovered() { - self.zoom += ui.input(|i| i.scroll_delta.y); + self.zoom += ui.input(|i| i.raw_scroll_delta.y); self.zoom = self.zoom.clamp( -response.rect.width().min(response.rect.height()) / 4.0, std::f32::INFINITY,