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

Optimize and improve ActorChildNodes handling

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-27 12:11:59 +01:00
parent 1d19d38c38
commit 53601d8a85
6 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ namespace FlaxEditor.SceneGraph
/// <summary>
/// The actor child nodes used to represent special parts of the actor (meshes, links, surfaces).
/// </summary>
public readonly List<ActorChildNode> ActorChildNodes = new List<ActorChildNode>();
public List<ActorChildNode> ActorChildNodes;
/// <summary>
/// Initializes a new instance of the <see cref="ActorNode"/> class.
@@ -108,6 +108,8 @@ namespace FlaxEditor.SceneGraph
/// <returns>The node</returns>
public ActorChildNode AddChildNode(ActorChildNode node)
{
if (ActorChildNodes == null)
ActorChildNodes = new List<ActorChildNode>();
ActorChildNodes.Add(node);
node.ParentNode = this;
return node;
@@ -125,9 +127,12 @@ namespace FlaxEditor.SceneGraph
root.OnActorChildNodesDispose(this);
}
for (int i = 0; i < ActorChildNodes.Count; i++)
ActorChildNodes[i].Dispose();
ActorChildNodes.Clear();
if (ActorChildNodes != null)
{
for (int i = 0; i < ActorChildNodes.Count; i++)
ActorChildNodes[i].Dispose();
ActorChildNodes.Clear();
}
}
/// <summary>
@@ -275,8 +280,12 @@ namespace FlaxEditor.SceneGraph
/// <inheritdoc />
public override void Dispose()
{
// Cleanup UI
_treeNode.Dispose();
if (ActorChildNodes != null)
{
ActorChildNodes.Clear();
ActorChildNodes = null;
}
base.Dispose();
}