Skip to content

Commit

Permalink
Maintenance (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
bircni authored Mar 5, 2024
1 parent 19a64b0 commit 83b531f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
30 changes: 15 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,53 +27,53 @@ 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",
"openexr",
] }

# 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
Expand Down
1 change: 1 addition & 0 deletions src/ui/preview/gpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<wgpu::CommandBuffer> {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preview/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ui/renderresult.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 83b531f

Please sign in to comment.