Merge pull request #8 from NathanaelG1/586_SceneGizmo

#586 scene gizmo
FyroxEngine · Jul 13, 2024 · 8c1d60f · 8c1d60f
2 parents 39f593f + e6f87f5
commit 8c1d60f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/editor/src/scene_viewer/gizmo.rs b/editor/src/scene_viewer/gizmo.rs
@@ -7,6 +7,7 @@ use crate::fyrox::{
         sstorage::ImmutableString,
     },
     engine::Engine,
+    gui::message::ButtonState,
     material::{Material, MaterialResource, PropertyValue},
     resource::texture::{TextureResource, TextureResourceExtension},
     scene::{
@@ -50,6 +51,7 @@ pub struct SceneGizmo {
     pub pos_z: Handle<Node>,
     pub neg_z: Handle<Node>,
     pub center: Handle<Node>,
+    pub last_click_position: Vector2<f32>,
 }
 
 fn make_cone(transform: Matrix4<f32>, color: Color, graph: &mut Graph) -> Handle<Node> {
@@ -207,6 +209,7 @@ impl SceneGizmo {
             pos_z,
             neg_z,
             center,
+            last_click_position: Vector2::default(),
         }
     }
 
@@ -275,7 +278,8 @@ impl SceneGizmo {
         &mut self,
         pos: Vector2<f32>,
         engine: &mut Engine,
-        camera_controller: Option<&mut CameraController>,
+        camera_controller: &mut CameraController,
+        left_mouse_button: ButtonState,
     ) {
         let graph = &engine.scenes[self.scene].graph;
         let closest = self.pick(pos, engine);
@@ -302,14 +306,17 @@ impl SceneGizmo {
                 },
             )
         }
-
-        if let Some(camera_controller) = camera_controller {
-            camera_controller.yaw = pos.x * 0.1;
-            camera_controller.pitch = pos.y * 0.1;
+        if left_mouse_button == ButtonState::Pressed {
+            let delta = pos - self.last_click_position;
+            if delta.magnitude() > 0.1 {
+                camera_controller.yaw = delta.x * 0.1;
+                camera_controller.pitch = delta.y * 0.1;
+            }
         }
     }
 
-    pub fn on_click(&self, pos: Vector2<f32>, engine: &Engine) -> Option<SceneGizmoAction> {
+    pub fn on_click(&mut self, pos: Vector2<f32>, engine: &Engine) -> Option<SceneGizmoAction> {
+        self.last_click_position = pos;
         let closest = self.pick(pos, engine);
 
         if closest == self.neg_x {

diff --git a/editor/src/scene_viewer/mod.rs b/editor/src/scene_viewer/mod.rs
@@ -16,7 +16,7 @@ use crate::{
             formatted_text::WrapMode,
             grid::{Column, GridBuilder, Row},
             image::{ImageBuilder, ImageMessage},
-            message::{ButtonState, MessageDirection, MouseButton, UiMessage},
+            message::{MessageDirection, MouseButton, UiMessage},
             numeric::{NumericUpDownBuilder, NumericUpDownMessage},
             stack_panel::StackPanelBuilder,
             tab_control::{
@@ -833,14 +833,12 @@ impl SceneViewer {
                                         .first()
                                         .node(self.scene_gizmo_image)
                                         .screen_position();
-                                self.scene_gizmo.on_mouse_move(rel_pos, engine, None);
-                                if state.left == ButtonState::Pressed {
-                                    self.scene_gizmo.on_mouse_move(
-                                        pos,
-                                        engine,
-                                        Some(&mut game_scene.camera_controller),
-                                    );
-                                }
+                                self.scene_gizmo.on_mouse_move(
+                                    rel_pos,
+                                    engine,
+                                    &mut game_scene.camera_controller,
+                                    state.left,
+                                );
                             }
                             _ => (),
                         }