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

Merge branch 'Tryibion-add-script'

Browse Source
This commit is contained in:
Wojtek Figat
2024-05-15 12:26:06 +02:00
parent 03eabbcf63 a6e8e6f749
commit 4fdd9a242b
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ using FlaxEditor.Windows.Assets;
using FlaxEngine; using FlaxEngine;
using FlaxEngine.GUI; using FlaxEngine.GUI;
using FlaxEngine.Utilities; using FlaxEngine.Utilities;
using Object = FlaxEngine.Object;
namespace FlaxEditor.SceneGraph.GUI namespace FlaxEditor.SceneGraph.GUI
{ {
@@ -625,6 +626,7 @@ namespace FlaxEditor.SceneGraph.GUI
{ {
var item = _dragScriptItems.Objects[i]; var item = _dragScriptItems.Objects[i];
var actorType = Editor.Instance.CodeEditing.Actors.Get(item); var actorType = Editor.Instance.CodeEditing.Actors.Get(item);
var scriptType = Editor.Instance.CodeEditing.Scripts.Get(item);
if (actorType != ScriptType.Null) if (actorType != ScriptType.Null)
{ {
var actor = actorType.CreateInstance() as Actor; var actor = actorType.CreateInstance() as Actor;
@@ -639,6 +641,18 @@ namespace FlaxEditor.SceneGraph.GUI
ActorNode.Root.Spawn(actor, spawnParent); ActorNode.Root.Spawn(actor, spawnParent);
actor.OrderInParent = newOrder; actor.OrderInParent = newOrder;
} }
else if (scriptType != ScriptType.Null)
{
if (DragOverMode == DragItemPositioning.Above || DragOverMode == DragItemPositioning.Below)
{
Editor.LogWarning("Failed to spawn script of type " + actorType.TypeName);
continue;
}
IUndoAction action = new AddRemoveScript(true, newParent, scriptType);
Select();
ActorNode.Root.Undo?.AddAction(action);
action.Do();
}
} }
result = DragDropEffect.Move; result = DragDropEffect.Move;
} }
@@ -699,9 +713,9 @@ namespace FlaxEditor.SceneGraph.GUI
return Editor.Instance.CodeEditing.Controls.Get().Contains(controlType); return Editor.Instance.CodeEditing.Controls.Get().Contains(controlType);
} }
private static bool ValidateDragScriptItem(ScriptItem script) private bool ValidateDragScriptItem(ScriptItem script)
{ {
return Editor.Instance.CodeEditing.Actors.Get(script) != ScriptType.Null; return Editor.Instance.CodeEditing.Actors.Get(script) != ScriptType.Null || Editor.Instance.CodeEditing.Scripts.Get(script) != ScriptType.Null;
} }
/// <inheritdoc /> /// <inheritdoc />

4
Source/Editor/Viewport/MainEditorGizmoViewport.cs
View File

@@ -622,12 +622,12 @@ namespace FlaxEditor.Viewport
private static bool ValidateDragActorType(ScriptType actorType) private static bool ValidateDragActorType(ScriptType actorType)
{ {
return Level.IsAnySceneLoaded; return Level.IsAnySceneLoaded && Editor.Instance.CodeEditing.Actors.Get().Contains(actorType);
} }
private static bool ValidateDragScriptItem(ScriptItem script) private static bool ValidateDragScriptItem(ScriptItem script)
{ {
return Editor.Instance.CodeEditing.Actors.Get(script) != ScriptType.Null; return Level.IsAnySceneLoaded && Editor.Instance.CodeEditing.Actors.Get(script) != ScriptType.Null;
} }
/// <inheritdoc /> /// <inheritdoc />

2
Source/Editor/Viewport/PrefabWindowViewport.cs
View File

@@ -499,7 +499,7 @@ namespace FlaxEditor.Viewport
private static bool ValidateDragActorType(ScriptType actorType) private static bool ValidateDragActorType(ScriptType actorType)
{ {
return true; return Editor.Instance.CodeEditing.Actors.Get().Contains(actorType);
} }
private static bool ValidateDragScriptItem(ScriptItem script) private static bool ValidateDragScriptItem(ScriptItem script)