rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-01-11 02:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate redundant variables

Browse Source
This commit is contained in:
Hanno Braun 2024-11-18 20:36:31 +01:00
parent 8d850bef54
commit 73476e5541
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/fj-viewer/src/viewer.rs
View File

@ -91,8 +91,8 @@ impl Viewer {
y: -(y / height * 2. - 1.) / aspect_ratio,
};
if let (Some(cursor_old), Some(button)) =
(self.cursor, self.most_recent_mouse_button)
if let (Some(cursor_old), Some(button), Some(focus_point)) =
(self.cursor, self.most_recent_mouse_button, self.focus_point)
{
match button {
MouseButton::Left => {
@ -103,16 +103,9 @@ impl Viewer {
let angle_y =
diff_x * self.camera_tuning_config.rotation_sensitivity;
if let Some(focus_point) = self.focus_point {
self.camera.apply_rotation(
angle_x,
angle_y,
focus_point,
);
}
self.camera.apply_rotation(angle_x, angle_y, focus_point);
}
MouseButton::Right => {
if let Some(focus_point) = self.focus_point {
self.camera.apply_translation(
cursor_old,
cursor_new,
@ -121,7 +114,6 @@ impl Viewer {
}
}
}
}
self.cursor = Some(cursor_new);
}