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

Fix synchronizing ActorTreeNode order after actor duplicate

Browse Source 
#487
This commit is contained in:
Wojtek Figat
2021-04-29 15:22:10 +02:00
parent a9b5c5d32d
commit c2afe0b6b2
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,7 +194,7 @@ namespace FlaxEditor.SceneGraph
{ {
get get
{ {
var scene = _actor.Scene; var scene = _actor ? _actor.Scene : null;
return scene != null ? SceneGraphFactory.FindNode(scene.ID) as SceneNode : null; return scene != null ? SceneGraphFactory.FindNode(scene.ID) as SceneNode : null;
} }
} }
@@ -235,7 +235,6 @@ namespace FlaxEditor.SceneGraph
{ {
if (!(value is ActorNode)) if (!(value is ActorNode))
throw new InvalidOperationException("ActorNode can have only ActorNode as a parent node."); throw new InvalidOperationException("ActorNode can have only ActorNode as a parent node.");
base.ParentNode = value; base.ParentNode = value;
} }
} }
@@ -299,6 +298,7 @@ namespace FlaxEditor.SceneGraph
// (eg. we build new node for spawned actor and link it to the game) // (eg. we build new node for spawned actor and link it to the game)
if (_treeNode.Parent != null && !_treeNode.Parent.IsLayoutLocked) if (_treeNode.Parent != null && !_treeNode.Parent.IsLayoutLocked)
{ {
_treeNode.IndexInParent = _actor.OrderInParent;
_treeNode.Parent.SortChildren(); _treeNode.Parent.SortChildren();
// Update UI // Update UI

4
Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
View File

@@ -86,6 +86,10 @@ namespace FlaxEditor.SceneGraph.GUI
} }
parent.SortChildren(); parent.SortChildren();
} }
else if (Actor)
{
_orderInParent = Actor.OrderInParent;
}
} }
internal void OnNameChanged() internal void OnNameChanged()

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

@@ -112,18 +112,9 @@ namespace FlaxEditor.SceneGraph
{ {
if (parentNode != value) if (parentNode != value)
{ {
if (parentNode != null) parentNode?.ChildNodes.Remove(this);
{
parentNode.ChildNodes.Remove(this);
}
parentNode = value; parentNode = value;
parentNode?.ChildNodes.Add(this);
if (parentNode != null)
{
parentNode.ChildNodes.Add(this);
}
OnParentChanged(); OnParentChanged();
} }
} }

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

@@ -1597,7 +1597,7 @@ bool Actor::FromBytes(const Span<byte>& data, Array<Actor*>& output, ISerializeM
// Order in parent // Order in parent
int32 orderInParent; int32 orderInParent;
stream.ReadInt32(&orderInParent); stream.ReadInt32(&orderInParent);
order.At(i) = orderInParent; order[i] = orderInParent;
// Load JSON // Load JSON
rapidjson_flax::Document document; rapidjson_flax::Document document;
@@ -1637,7 +1637,6 @@ bool Actor::FromBytes(const Span<byte>& data, Array<Actor*>& output, ISerializeM
// Order in parent // Order in parent
int32 orderInParent; int32 orderInParent;
stream.ReadInt32(&orderInParent); stream.ReadInt32(&orderInParent);
order.Add(orderInParent);
// Load JSON // Load JSON
rapidjson_flax::Document document; rapidjson_flax::Document document;

2
Source/Engine/UI/GUI/ContainerControl.cs
View File

@@ -249,6 +249,8 @@ namespace FlaxEngine.GUI
internal void ChangeChildIndex(Control child, int newIndex) internal void ChangeChildIndex(Control child, int newIndex)
{ {
int oldIndex = _children.IndexOf(child); int oldIndex = _children.IndexOf(child);
if (oldIndex == newIndex)
return;
_children.RemoveAt(oldIndex); _children.RemoveAt(oldIndex);
// Check if index is invalid // Check if index is invalid