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

Fix viewpoints.

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2021-05-29 18:53:30 +02:00
parent 03014dcf08
commit ccef5f0d73
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Editor/Viewport/MainEditorGizmoViewport.cs
View File

@@ -656,11 +656,20 @@ namespace FlaxEditor.Viewport
/// Focuses the viewport on the current selection of the gizmo. /// Focuses the viewport on the current selection of the gizmo.
/// </summary> /// </summary>
public void FocusSelection() public void FocusSelection()
{
var orientation = ViewOrientation;
FocusSelection(ref orientation);
}
/// <summary>
/// Focuses the viewport on the current selection of the gizmo.
/// </summary>
/// <param name="orientation">The target view orientation.</param>
public void FocusSelection(ref Quaternion orientation)
{ {
if (TransformGizmo.SelectedParents.Count == 0) if (TransformGizmo.SelectedParents.Count == 0)
return; return;
var orientation = ViewOrientation;
var gizmoBounds = Gizmos.Active.FocusBounds; var gizmoBounds = Gizmos.Active.FocusBounds;
if (gizmoBounds != BoundingSphere.Empty) if (gizmoBounds != BoundingSphere.Empty)
((FPSCamera)ViewportCamera).ShowSphere(ref gizmoBounds, ref orientation); ((FPSCamera)ViewportCamera).ShowSphere(ref gizmoBounds, ref orientation);
@@ -725,9 +734,10 @@ namespace FlaxEditor.Viewport
/// <inheritdoc /> /// <inheritdoc />
protected override void OrientViewport(ref Quaternion orientation) protected override void OrientViewport(ref Quaternion orientation)
{ {
FocusSelection(); if (TransformGizmo.SelectedParents.Count != 0)
FocusSelection(ref orientation);
base.OrientViewport(ref orientation); else
base.OrientViewport(ref orientation);
} }
/// <inheritdoc /> /// <inheritdoc />

18
Source/Editor/Viewport/PrefabWindowViewport.cs
View File

@@ -787,11 +787,20 @@ namespace FlaxEditor.Viewport
/// Focuses the viewport on the current selection of the gizmo. /// Focuses the viewport on the current selection of the gizmo.
/// </summary> /// </summary>
public void FocusSelection() public void FocusSelection()
{
var orientation = ViewOrientation;
FocusSelection(ref orientation);
}
/// <summary>
/// Focuses the viewport on the current selection of the gizmo.
/// </summary>
/// <param name="orientation">The target view orientation.</param>
public void FocusSelection(ref Quaternion orientation)
{ {
if (TransformGizmo.SelectedParents.Count == 0) if (TransformGizmo.SelectedParents.Count == 0)
return; return;
var orientation = ViewOrientation;
var gizmoBounds = Gizmos.Active.FocusBounds; var gizmoBounds = Gizmos.Active.FocusBounds;
if (gizmoBounds != BoundingSphere.Empty) if (gizmoBounds != BoundingSphere.Empty)
((FPSCamera)ViewportCamera).ShowSphere(ref gizmoBounds, ref orientation); ((FPSCamera)ViewportCamera).ShowSphere(ref gizmoBounds, ref orientation);
@@ -802,9 +811,10 @@ namespace FlaxEditor.Viewport
/// <inheritdoc /> /// <inheritdoc />
protected override void OrientViewport(ref Quaternion orientation) protected override void OrientViewport(ref Quaternion orientation)
{ {
FocusSelection(); if (TransformGizmo.SelectedParents.Count != 0)
FocusSelection(ref orientation);
base.OrientViewport(ref orientation); else
base.OrientViewport(ref orientation);
} }
/// <inheritdoc /> /// <inheritdoc />