From 8af8d50de1baaaead3f4c3370feacb993b9aff6b Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Mon, 8 Apr 2024 23:20:58 +0300 Subject: [PATCH 1/2] Remove Editor viewport aspect ratio scaling from camera mouse movement Rescaled the final mouse delta values to roughly matching default viewport width in 1080p resolution. --- Source/Editor/Viewport/EditorViewport.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs index 5bcc2c2b9..4981b78e9 100644 --- a/Source/Editor/Viewport/EditorViewport.cs +++ b/Source/Editor/Viewport/EditorViewport.cs @@ -1663,8 +1663,7 @@ namespace FlaxEditor.Viewport { offset.X = offset.X > 0 ? Mathf.Floor(offset.X) : Mathf.Ceil(offset.X); offset.Y = offset.Y > 0 ? Mathf.Floor(offset.Y) : Mathf.Ceil(offset.Y); - _mouseDelta = offset / size; - _mouseDelta.Y *= size.Y / size.X; + _mouseDelta = offset; // Update delta filtering buffer _deltaFilteringBuffer[_deltaFilteringStep] = _mouseDelta; @@ -1682,8 +1681,7 @@ namespace FlaxEditor.Viewport } else { - _mouseDelta = offset / size; - _mouseDelta.Y *= size.Y / size.X; + _mouseDelta = offset; mouseDelta = _mouseDelta; } @@ -1697,7 +1695,7 @@ namespace FlaxEditor.Viewport // Update moveDelta *= dt * (60.0f * 4.0f); - mouseDelta *= 200.0f * MouseSpeed * _mouseSensitivity; + mouseDelta *= 0.1833f * MouseSpeed * _mouseSensitivity; UpdateView(dt, ref moveDelta, ref mouseDelta, out var centerMouse); // Move mouse back to the root position @@ -1723,7 +1721,7 @@ namespace FlaxEditor.Viewport var offset = _viewMousePos - _startPos; offset.X = offset.X > 0 ? Mathf.Floor(offset.X) : Mathf.Ceil(offset.X); offset.Y = offset.Y > 0 ? Mathf.Floor(offset.Y) : Mathf.Ceil(offset.Y); - _mouseDelta = offset / size; + _mouseDelta = offset; _startPos = _viewMousePos; } else From 1ddf9ab0e18f7632a4430a6e895f84dd09a76df7 Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Tue, 9 Apr 2024 21:45:18 +0300 Subject: [PATCH 2/2] Fix high mouse sensitivity in rotation gizmos --- Source/Editor/Viewport/EditorGizmoViewport.cs | 2 +- Source/Editor/Viewport/PrefabWindowViewport.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Editor/Viewport/EditorGizmoViewport.cs b/Source/Editor/Viewport/EditorGizmoViewport.cs index 9fb3d962e..df0f7a8ff 100644 --- a/Source/Editor/Viewport/EditorGizmoViewport.cs +++ b/Source/Editor/Viewport/EditorGizmoViewport.cs @@ -76,7 +76,7 @@ namespace FlaxEditor.Viewport public bool SnapToVertex => ContainsFocus && Editor.Instance.Options.Options.Input.SnapToVertex.Process(Root); /// - public Float2 MouseDelta => _mouseDelta * 1000; + public Float2 MouseDelta => _mouseDelta; /// public bool UseSnapping => Root?.GetKey(KeyboardKeys.Control) ?? false; diff --git a/Source/Editor/Viewport/PrefabWindowViewport.cs b/Source/Editor/Viewport/PrefabWindowViewport.cs index 32473c5ea..d7624892d 100644 --- a/Source/Editor/Viewport/PrefabWindowViewport.cs +++ b/Source/Editor/Viewport/PrefabWindowViewport.cs @@ -291,7 +291,7 @@ namespace FlaxEditor.Viewport public bool SnapToVertex => ContainsFocus && Editor.Instance.Options.Options.Input.SnapToVertex.Process(Root); /// - public Float2 MouseDelta => _mouseDelta * 1000; + public Float2 MouseDelta => _mouseDelta; /// public bool UseSnapping => Root.GetKey(KeyboardKeys.Control);