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

Merge branch 'xxSeys1-groupActors'

Browse Source
This commit is contained in:
Wojtek Figat
2024-10-25 18:24:23 +02:00
parent 3c64d57e3d f37a595bc3
commit 5fb6676ee6
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Editor/Modules/SceneEditingModule.cs
View File

@@ -555,10 +555,20 @@ namespace FlaxEditor.Modules
/// </summary> /// </summary>
public void CreateParentForSelectedActors() public void CreateParentForSelectedActors()
{ {
Actor actor = new EmptyActor();
Editor.SceneEditing.Spawn(actor, null, false);
List<SceneGraphNode> selection = Editor.SceneEditing.Selection; List<SceneGraphNode> selection = Editor.SceneEditing.Selection;
var actors = selection.Where(x => x is ActorNode).Select(x => ((ActorNode)x).Actor); var actors = selection.Where(x => x is ActorNode).Select(x => ((ActorNode)x).Actor);
var actorsCount = actors.Count();
if (actorsCount == 0)
return;
Vector3 center = Vector3.Zero;
foreach (var actor in actors)
center += actor.Position;
center /= actorsCount;
Actor parent = new EmptyActor
{
Position = center,
};
Editor.SceneEditing.Spawn(parent, null, false);
using (new UndoMultiBlock(Undo, actors, "Reparent actors")) using (new UndoMultiBlock(Undo, actors, "Reparent actors"))
{ {
for (int i = 0; i < selection.Count; i++) for (int i = 0; i < selection.Count; i++)
@@ -574,15 +584,15 @@ namespace FlaxEditor.Modules
// Put created node as child of the Parent Node of node // Put created node as child of the Parent Node of node
int parentOrder = node.Actor.OrderInParent; int parentOrder = node.Actor.OrderInParent;
actor.Parent = node.Actor.Parent; parent.SetParent(node.Actor.Parent, true, true);
actor.OrderInParent = parentOrder; parent.OrderInParent = parentOrder;
} }
node.Actor.Parent = actor; node.Actor.SetParent(parent, true, false);
} }
} }
} }
Editor.SceneEditing.Select(actor); Editor.SceneEditing.Select(parent);
Editor.Scene.GetActorNode(actor).TreeNode.StartRenaming(Editor.Windows.SceneWin, Editor.Windows.SceneWin.SceneTreePanel); Editor.Scene.GetActorNode(parent).TreeNode.StartRenaming(Editor.Windows.SceneWin, Editor.Windows.SceneWin.SceneTreePanel);
} }
/// <summary> /// <summary>

2
Source/Editor/Modules/UIModule.cs
View File

@@ -556,7 +556,7 @@ namespace FlaxEditor.Modules
cm.AddSeparator(); cm.AddSeparator();
_menuEditSelectAll = cm.AddButton("Select all", inputOptions.SelectAll, Editor.SceneEditing.SelectAllScenes); _menuEditSelectAll = cm.AddButton("Select all", inputOptions.SelectAll, Editor.SceneEditing.SelectAllScenes);
_menuEditDeselectAll = cm.AddButton("Deselect all", inputOptions.DeselectAll, Editor.SceneEditing.DeselectAllScenes); _menuEditDeselectAll = cm.AddButton("Deselect all", inputOptions.DeselectAll, Editor.SceneEditing.DeselectAllScenes);
_menuCreateParentForSelectedActors = cm.AddButton("Create parent for selected actors", Editor.SceneEditing.CreateParentForSelectedActors); _menuCreateParentForSelectedActors = cm.AddButton("Parent to new Actor", inputOptions.GroupSelectedActors, Editor.SceneEditing.CreateParentForSelectedActors);
_menuEditFind = cm.AddButton("Find", inputOptions.Search, Editor.Windows.SceneWin.Search); _menuEditFind = cm.AddButton("Find", inputOptions.Search, Editor.Windows.SceneWin.Search);
cm.AddSeparator(); cm.AddSeparator();
cm.AddButton("Game Settings", () => cm.AddButton("Game Settings", () =>

4
Source/Editor/Options/InputOptions.cs
View File

@@ -160,6 +160,10 @@ namespace FlaxEditor.Options
[EditorDisplay("Scene"), EditorOrder(573)] [EditorDisplay("Scene"), EditorOrder(573)]
public InputBinding PilotActor = new InputBinding(KeyboardKeys.None); public InputBinding PilotActor = new InputBinding(KeyboardKeys.None);
[DefaultValue(typeof(InputBinding), "Ctrl+G")]
[EditorDisplay("Scene"), EditorOrder(574)]
public InputBinding GroupSelectedActors = new InputBinding(KeyboardKeys.G, KeyboardKeys.Control);
#endregion #endregion
#region Tools #region Tools

1
Source/Editor/Utilities/Utils.cs
View File

@@ -1432,6 +1432,7 @@ namespace FlaxEditor.Utilities
inputActions.Add(options => options.SelectAll, Editor.Instance.SceneEditing.SelectAllScenes); inputActions.Add(options => options.SelectAll, Editor.Instance.SceneEditing.SelectAllScenes);
inputActions.Add(options => options.DeselectAll, Editor.Instance.SceneEditing.DeselectAllScenes); inputActions.Add(options => options.DeselectAll, Editor.Instance.SceneEditing.DeselectAllScenes);
inputActions.Add(options => options.Delete, Editor.Instance.SceneEditing.Delete); inputActions.Add(options => options.Delete, Editor.Instance.SceneEditing.Delete);
inputActions.Add(options => options.GroupSelectedActors, Editor.Instance.SceneEditing.CreateParentForSelectedActors);
inputActions.Add(options => options.Search, () => Editor.Instance.Windows.SceneWin.Search()); inputActions.Add(options => options.Search, () => Editor.Instance.Windows.SceneWin.Search());
inputActions.Add(options => options.MoveActorToViewport, Editor.Instance.UI.MoveActorToViewport); inputActions.Add(options => options.MoveActorToViewport, Editor.Instance.UI.MoveActorToViewport);
inputActions.Add(options => options.AlignActorWithViewport, Editor.Instance.UI.AlignActorWithViewport); inputActions.Add(options => options.AlignActorWithViewport, Editor.Instance.UI.AlignActorWithViewport);

2
Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
View File

@@ -133,7 +133,7 @@ namespace FlaxEditor.Windows
contextMenu.AddSeparator(); contextMenu.AddSeparator();
b = contextMenu.AddButton("Create parent for selected actors", Editor.SceneEditing.CreateParentForSelectedActors); b = contextMenu.AddButton("Parent to new Actor", inputOptions.GroupSelectedActors, Editor.SceneEditing.CreateParentForSelectedActors);
b.Enabled = canEditScene && hasSthSelected; b.Enabled = canEditScene && hasSthSelected;
b = contextMenu.AddButton("Create Prefab", Editor.Prefabs.CreatePrefab); b = contextMenu.AddButton("Create Prefab", Editor.Prefabs.CreatePrefab);