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

Improve focusing on selected object in Editor

Browse Source 
#328
This commit is contained in:
Wojtek Figat
2021-03-18 22:20:27 +01:00
parent 255b2c85c8
commit 4ae3fccfd9
5 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/SceneGraph/ActorNode.cs
View File

@@ -263,6 +263,12 @@ namespace FlaxEditor.SceneGraph
return _actor.IntersectsItself(ray.Ray, out distance, out normal);
}
/// <inheritdoc />
public override void GetEditorSphere(out BoundingSphere sphere)
{
Editor.GetActorEditorSphere(_actor, out sphere);
}
/// <inheritdoc />
public override void OnDebugDraw(ViewportDebugDrawData data)
{

14
Source/Editor/SceneGraph/SceneGraphNode.cs
View File

@@ -309,6 +309,20 @@ namespace FlaxEditor.SceneGraph
return false;
}
/// <summary>
/// Gets the object bounding sphere (including child actors).
/// </summary>
/// <param name="sphere">The bounding sphere.</param>
public virtual void GetEditorSphere(out BoundingSphere sphere)
{
sphere = new BoundingSphere(Transform.Translation, 15.0f);
for (int i = 0; i < ChildNodes.Count; i++)
{
ChildNodes[i].GetEditorSphere(out var childSphere);
BoundingSphere.Merge(ref sphere, ref childSphere, out sphere);
}
}
/// <summary>
/// Called when selected nodes should draw debug shapes using <see cref="DebugDraw"/> interface.
/// </summary>

34
Source/Editor/Viewport/Cameras/FPSCamera.cs
View File

@@ -103,45 +103,43 @@ namespace FlaxEditor.Viewport.Cameras
/// <summary>
/// Moves the viewport to visualize selected actors.
/// </summary>
/// <param name="actors">The actors to show.</param>
public void ShowActors(List<SceneGraphNode> actors)
/// <param name="selection">The actors to show.</param>
public void ShowActors(List<SceneGraphNode> selection)
{
if (actors.Count == 0)
if (selection.Count == 0)
return;
BoundingSphere mergesSphere = BoundingSphere.Empty;
for (int i = 0; i < actors.Count; i++)
for (int i = 0; i < selection.Count; i++)
{
if (actors[i] is ActorNode actor)
{
Editor.GetActorEditorSphere(actor.Actor, out BoundingSphere sphere);
BoundingSphere.Merge(ref mergesSphere, ref sphere, out mergesSphere);
}
selection[i].GetEditorSphere(out var sphere);
BoundingSphere.Merge(ref mergesSphere, ref sphere, out mergesSphere);
}
if (mergesSphere == BoundingSphere.Empty)
return;
ShowSphere(ref mergesSphere);
}
/// <summary>
/// Moves the viewport to visualize selected actors.
/// </summary>
/// <param name="actors">The actors to show.</param>
/// <param name="selection">The actors to show.</param>
/// <param name="orientation">The used orientation.</param>
public void ShowActors(List<SceneGraphNode> actors, ref Quaternion orientation)
public void ShowActors(List<SceneGraphNode> selection, ref Quaternion orientation)
{
if (actors.Count == 0)
if (selection.Count == 0)
return;
BoundingSphere mergesSphere = BoundingSphere.Empty;
for (int i = 0; i < actors.Count; i++)
for (int i = 0; i < selection.Count; i++)
{
if (actors[i] is ActorNode actor)
{
Editor.GetActorEditorSphere(actor.Actor, out BoundingSphere sphere);
BoundingSphere.Merge(ref mergesSphere, ref sphere, out mergesSphere);
}
selection[i].GetEditorSphere(out var sphere);
BoundingSphere.Merge(ref mergesSphere, ref sphere, out mergesSphere);
}
if (mergesSphere == BoundingSphere.Empty)
return;
ShowSphere(ref mergesSphere, ref orientation);
}

16
Source/Engine/Level/Actor.cpp
View File

@@ -1139,20 +1139,28 @@ BoundingBox Actor::GetBoxWithChildren() const
#if USE_EDITOR
BoundingBox Actor::GetEditorBox() const
{
return GetBox();
}
BoundingBox Actor::GetEditorBoxChildren() const
{
BoundingBox result = GetEditorBox();
for (int32 i = 0; i < Children.Count(); i++)
{
BoundingBox::Merge(result, Children[i]->GetEditorBoxChildren(), result);
}
return result;
}
#endif
bool Actor::HasContentLoaded() const
{
return true;
}
void Actor::UnregisterObjectHierarchy()
{
if (IsRegistered())
@@ -1170,6 +1178,10 @@ void Actor::UnregisterObjectHierarchy()
}
}
void Actor::Draw(RenderContext& renderContext)
{
}
void Actor::DrawGeneric(RenderContext& renderContext)
{
// Generic drawing uses only GBuffer Fill Pass and simple frustum culling (see SceneRendering for more optimized drawing)

14
Source/Engine/Level/Actor.h
View File

@@ -629,10 +629,7 @@ public:
/// <summary>
/// Gets actor bounding box (single actor, no children included) for editor tools.
/// </summary>
API_PROPERTY() virtual BoundingBox GetEditorBox() const
{
return GetBox();
}
API_PROPERTY() virtual BoundingBox GetEditorBox() const;
/// <summary>
/// Gets actor bounding box of the actor including all child actors for editor tools.
@@ -644,10 +641,7 @@ public:
/// <summary>
/// Returns true if actor has loaded content.
/// </summary>
API_PROPERTY() virtual bool HasContentLoaded() const
{
return true;
}
API_PROPERTY() virtual bool HasContentLoaded() const;
/// <summary>
/// Calls UnregisterObject for all objects in the actor hierarchy.
@@ -660,9 +654,7 @@ public:
/// Draws this actor. Called by Scene Rendering service. This call is more optimized than generic Draw (eg. models are rendered during all passed but other actors are invoked only during GBufferFill pass).
/// </summary>
/// <param name="renderContext">The rendering context.</param>
virtual void Draw(RenderContext& renderContext)
{
}
virtual void Draw(RenderContext& renderContext);
/// <summary>
/// Draws this actor. Called during custom actor rendering or any other generic rendering from code.