GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix editor viewport mouse control bug when using Alt key

Browse Source 
#2816
This commit is contained in:
Wojtek Figat
2024-08-20 18:56:38 +02:00
parent 2542adba92
commit 6534136632
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Source/Editor/Gizmo/TransformGizmoBase.cs
View File

@@ -138,18 +138,17 @@ namespace FlaxEditor.Gizmo
private void UpdateGizmoPosition() private void UpdateGizmoPosition()
{ {
var position = Vector3.Zero;
// Get gizmo pivot // Get gizmo pivot
switch (_activePivotType) switch (_activePivotType)
{ {
case PivotType.ObjectCenter: case PivotType.ObjectCenter:
if (SelectionCount > 0) if (SelectionCount > 0)
Position = GetSelectedTransform(0).Translation; position = GetSelectedTransform(0).Translation;
break; break;
case PivotType.SelectionCenter: case PivotType.SelectionCenter:
Position = GetSelectionCenter(); position = GetSelectionCenter();
break;
case PivotType.WorldOrigin:
Position = Vector3.Zero;
break; break;
} }
@@ -157,11 +156,13 @@ namespace FlaxEditor.Gizmo
if (_vertexSnapObject != null) if (_vertexSnapObject != null)
{ {
Vector3 vertexSnapPoint = _vertexSnapObject.Transform.LocalToWorld(_vertexSnapPoint); Vector3 vertexSnapPoint = _vertexSnapObject.Transform.LocalToWorld(_vertexSnapPoint);
Position += vertexSnapPoint - Position; position += vertexSnapPoint - position;
} }
// Apply current movement // Apply current movement
Position += _translationDelta; position += _translationDelta;
Position = position;
} }
private void UpdateMatrices() private void UpdateMatrices()
@@ -213,10 +214,11 @@ namespace FlaxEditor.Gizmo
ray.Position = Vector3.Transform(ray.Position, invRotationMatrix); ray.Position = Vector3.Transform(ray.Position, invRotationMatrix);
Vector3.TransformNormal(ref ray.Direction, ref invRotationMatrix, out ray.Direction); Vector3.TransformNormal(ref ray.Direction, ref invRotationMatrix, out ray.Direction);
var planeXY = new Plane(Vector3.Backward, Vector3.Transform(Position, invRotationMatrix).Z); var position = Position;
var planeYZ = new Plane(Vector3.Left, Vector3.Transform(Position, invRotationMatrix).X); var planeXY = new Plane(Vector3.Backward, Vector3.Transform(position, invRotationMatrix).Z);
var planeZX = new Plane(Vector3.Down, Vector3.Transform(Position, invRotationMatrix).Y); var planeYZ = new Plane(Vector3.Left, Vector3.Transform(position, invRotationMatrix).X);
var dir = Vector3.Normalize(ray.Position - Position); var planeZX = new Plane(Vector3.Down, Vector3.Transform(position, invRotationMatrix).Y);
var dir = Vector3.Normalize(ray.Position - position);
var planeDotXY = Mathf.Abs(Vector3.Dot(planeXY.Normal, dir)); var planeDotXY = Mathf.Abs(Vector3.Dot(planeXY.Normal, dir));
var planeDotYZ = Mathf.Abs(Vector3.Dot(planeYZ.Normal, dir)); var planeDotYZ = Mathf.Abs(Vector3.Dot(planeYZ.Normal, dir));
var planeDotZX = Mathf.Abs(Vector3.Dot(planeZX.Normal, dir)); var planeDotZX = Mathf.Abs(Vector3.Dot(planeZX.Normal, dir));
@@ -229,8 +231,8 @@ namespace FlaxEditor.Gizmo
var plane = planeDotXY > planeDotZX ? planeXY : planeZX; var plane = planeDotXY > planeDotZX ? planeXY : planeZX;
if (ray.Intersects(ref plane, out intersection)) if (ray.Intersects(ref plane, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
delta = new Vector3(_tDelta.X, 0, 0); delta = new Vector3(_tDelta.X, 0, 0);
} }
@@ -241,8 +243,8 @@ namespace FlaxEditor.Gizmo
var plane = planeDotXY > planeDotYZ ? planeXY : planeYZ; var plane = planeDotXY > planeDotYZ ? planeXY : planeYZ;
if (ray.Intersects(ref plane, out intersection)) if (ray.Intersects(ref plane, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
delta = new Vector3(0, _tDelta.Y, 0); delta = new Vector3(0, _tDelta.Y, 0);
} }
@@ -253,8 +255,8 @@ namespace FlaxEditor.Gizmo
var plane = planeDotZX > planeDotYZ ? planeZX : planeYZ; var plane = planeDotZX > planeDotYZ ? planeZX : planeYZ;
if (ray.Intersects(ref plane, out intersection)) if (ray.Intersects(ref plane, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
delta = new Vector3(0, 0, _tDelta.Z); delta = new Vector3(0, 0, _tDelta.Z);
} }
@@ -264,8 +266,8 @@ namespace FlaxEditor.Gizmo
{ {
if (ray.Intersects(ref planeYZ, out intersection)) if (ray.Intersects(ref planeYZ, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
delta = new Vector3(0, _tDelta.Y, _tDelta.Z); delta = new Vector3(0, _tDelta.Y, _tDelta.Z);
} }
@@ -275,8 +277,8 @@ namespace FlaxEditor.Gizmo
{ {
if (ray.Intersects(ref planeXY, out intersection)) if (ray.Intersects(ref planeXY, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
delta = new Vector3(_tDelta.X, _tDelta.Y, 0); delta = new Vector3(_tDelta.X, _tDelta.Y, 0);
} }
@@ -286,8 +288,8 @@ namespace FlaxEditor.Gizmo
{ {
if (ray.Intersects(ref planeZX, out intersection)) if (ray.Intersects(ref planeZX, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
delta = new Vector3(_tDelta.X, 0, _tDelta.Z); delta = new Vector3(_tDelta.X, 0, _tDelta.Z);
} }
@@ -299,8 +301,8 @@ namespace FlaxEditor.Gizmo
var plane = new Plane(-Vector3.Normalize(gizmoToView), gizmoToView.Length); var plane = new Plane(-Vector3.Normalize(gizmoToView), gizmoToView.Length);
if (ray.Intersects(ref plane, out intersection)) if (ray.Intersects(ref plane, out intersection))
{ {
_intersectPosition = ray.Position + ray.Direction * intersection; _intersectPosition = ray.GetPoint(intersection);
if (_lastIntersectionPosition != Vector3.Zero) if (!_lastIntersectionPosition.IsZero)
_tDelta = _intersectPosition - _lastIntersectionPosition; _tDelta = _intersectPosition - _lastIntersectionPosition;
} }
delta = _tDelta; delta = _tDelta;
@@ -412,10 +414,8 @@ namespace FlaxEditor.Gizmo
public override void Update(float dt) public override void Update(float dt)
{ {
LastDelta = Transform.Identity; LastDelta = Transform.Identity;
if (!IsActive) if (!IsActive)
return; return;
bool isLeftBtnDown = Owner.IsLeftMouseButtonDown; bool isLeftBtnDown = Owner.IsLeftMouseButtonDown;
// Snap to ground // Snap to ground
@@ -516,6 +516,7 @@ namespace FlaxEditor.Gizmo
{ {
// Clear cache // Clear cache
_accMoveDelta = Vector3.Zero; _accMoveDelta = Vector3.Zero;
_lastIntersectionPosition = _intersectPosition = Vector3.Zero;
EndTransforming(); EndTransforming();
} }
} }

3
Source/Editor/Viewport/EditorViewport.cs
View File

@@ -111,6 +111,9 @@ namespace FlaxEditor.Viewport
IsMouseRightDown = useMouse && window.GetMouseButton(MouseButton.Right); IsMouseRightDown = useMouse && window.GetMouseButton(MouseButton.Right);
IsMouseMiddleDown = useMouse && window.GetMouseButton(MouseButton.Middle); IsMouseMiddleDown = useMouse && window.GetMouseButton(MouseButton.Middle);
IsMouseLeftDown = useMouse && window.GetMouseButton(MouseButton.Left); IsMouseLeftDown = useMouse && window.GetMouseButton(MouseButton.Left);
if (WasAltDownBefore && !IsMouseLeftDown && !IsAltDown)
WasAltDownBefore = false;
} }
/// <summary> /// <summary>