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

Merge branch 'add-order-in-spawn' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-order-in-spawn

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-08 12:57:29 +02:00
parent 46f842a555 5ffe6a39ab
commit df1313af33
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -690,9 +690,8 @@ namespace FlaxEditor.SceneGraph.GUI
if (_dragAssets.Objects[i] is not PrefabItem)
actor.Transform = Transform.Identity;
var previousTrans = actor.Transform;
ActorNode.Root.Spawn(actor, spawnParent);
ActorNode.Root.Spawn(actor, spawnParent, newOrder);
actor.LocalTransform = previousTrans;
actor.OrderInParent = newOrder;
}
result = DragDropEffect.Move;
}
@@ -710,8 +709,7 @@ namespace FlaxEditor.SceneGraph.GUI
}
actor.StaticFlags = newParent.StaticFlags;
actor.Name = item.Name;
ActorNode.Root.Spawn(actor, newParent);
actor.OrderInParent = newOrder;
ActorNode.Root.Spawn(actor, newParent, newOrder);
}
result = DragDropEffect.Move;
}
@@ -733,8 +731,7 @@ namespace FlaxEditor.SceneGraph.GUI
StaticFlags = newParent.StaticFlags,
Name = item.Name,
};
ActorNode.Root.Spawn(uiControl, newParent);
uiControl.OrderInParent = newOrder;
ActorNode.Root.Spawn(uiControl, newParent, newOrder);
}
result = DragDropEffect.Move;
}
@@ -761,8 +758,7 @@ namespace FlaxEditor.SceneGraph.GUI
actor.StaticFlags = spawnParent.StaticFlags;
actor.Name = actorType.Name;
actor.Transform = spawnParent.Transform;
ActorNode.Root.Spawn(actor, spawnParent);
actor.OrderInParent = newOrder;
ActorNode.Root.Spawn(actor, spawnParent, newOrder);
}
else if (scriptType != ScriptType.Null)
{

2
Source/Editor/SceneGraph/RootNode.cs
View File

@@ -159,7 +159,7 @@ namespace FlaxEditor.SceneGraph
/// </summary>
/// <param name="actor">The actor.</param>
/// <param name="parent">The parent.</param>
public abstract void Spawn(Actor actor, Actor parent);
public abstract void Spawn(Actor actor, Actor parent, int orderInParent = -1);
/// <summary>
/// Gets the undo.