From a89db78213aa6a9776787406da638dbf847db15b Mon Sep 17 00:00:00 2001
From: Dmitry Stepanov <d1maxa@yandex.ru>
Date: Sun, 20 Apr 2025 11:05:12 +0300
Subject: [PATCH] reset editor camera rotation when in 2d mode

- do not allow the camera to be rotated by rmb when 2d mode
---
 editor/src/camera/mod.rs | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/editor/src/camera/mod.rs b/editor/src/camera/mod.rs
index 2f7fd0c40..8e2ee390c 100644
--- a/editor/src/camera/mod.rs
+++ b/editor/src/camera/mod.rs
@@ -440,17 +440,19 @@ impl CameraController {
 
         match button {
             MouseButton::Right => {
-                if modifiers.shift && is_perspective {
-                    self.mouse_control_mode = MouseControlMode::Drag {
-                        initial_position: self.position(graph),
-                        initial_mouse_position: mouse_position,
-                    };
-                } else {
-                    self.mouse_control_mode = MouseControlMode::CenteredRotation {
-                        prev_z_offset: self.z_offset,
-                    };
-                    self.move_along_look_vector(self.z_offset, graph);
-                    self.z_offset = 0.0;
+                if is_perspective {
+                    if modifiers.shift {
+                        self.mouse_control_mode = MouseControlMode::Drag {
+                            initial_position: self.position(graph),
+                            initial_mouse_position: mouse_position,
+                        };
+                    } else {
+                        self.mouse_control_mode = MouseControlMode::CenteredRotation {
+                            prev_z_offset: self.z_offset,
+                        };
+                        self.move_along_look_vector(self.z_offset, graph);
+                        self.z_offset = 0.0;
+                    }
                 }
             }
             MouseButton::Middle => {
@@ -627,17 +629,21 @@ impl CameraController {
 
                 camera
                     .local_transform_mut()
-                    .set_rotation(UnitQuaternion::from_axis_angle(&Vector3::x_axis(), 0.0));
+                    .set_rotation(Default::default());
 
-                let local_transform = graph[self.pivot].local_transform_mut();
+                graph[self.camera_hinge]
+                    .local_transform_mut()
+                    .set_rotation(Default::default());
 
-                let mut new_position = **local_transform.position();
+                let pivot_local_transform = graph[self.pivot].local_transform_mut();
+
+                let mut new_position = **pivot_local_transform.position();
                 new_position.z = DEFAULT_Z_OFFSET;
                 new_position.x += move_vec.x;
                 new_position.y += move_vec.y;
 
-                local_transform
-                    .set_rotation(UnitQuaternion::from_axis_angle(&Vector3::y_axis(), 0.0))
+                pivot_local_transform
+                    .set_rotation(Default::default())
                     .set_position(new_position);
             }
         }