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

Add support for custom drag&drop into level/prefab viewports from custom asset items

Browse Source
This commit is contained in:
Wojtek Figat
2021-05-24 18:34:19 +02:00
parent c78fb7995e
commit 2c7d62bb8e
13 changed files with 262 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ namespace FlaxEditor.Viewport
private readonly ViewportWidgetButton _rotateSnapping;
private readonly ViewportWidgetButton _scaleSnapping;
private readonly DragAssets<DragDropEventArgs> _dragAssets = new DragAssets<DragDropEventArgs>(ValidateDragItem);
private readonly DragAssets<DragDropEventArgs> _dragAssets;
private readonly DragActorType<DragDropEventArgs> _dragActorType = new DragActorType<DragDropEventArgs>(ValidateDragActorType);
private SelectionOutline _customSelectionOutline;
@@ -187,6 +187,7 @@ namespace FlaxEditor.Viewport
: base(Object.New<SceneRenderTask>(), editor.Undo)
{
_editor = editor;
_dragAssets = new DragAssets<DragDropEventArgs>(ValidateDragItem);
// Prepare rendering task
Task.ActorsSource = ActorsSources.Scenes;
@@ -800,31 +801,19 @@ namespace FlaxEditor.Viewport
return result;
}
private static bool ValidateDragItem(ContentItem contentItem)
private bool ValidateDragItem(ContentItem contentItem)
{
if (!Level.IsAnySceneLoaded)
return false;
if (contentItem is AssetItem assetItem)
{
if (assetItem.IsOfType<ParticleSystem>())
return true;
if (assetItem.IsOfType<SceneAnimation>())
if (assetItem.OnEditorDrag(this))
return true;
if (assetItem.IsOfType<MaterialBase>())
return true;
if (assetItem.IsOfType<ModelBase>())
return true;
if (assetItem.IsOfType<CollisionData>())
return true;
if (assetItem.IsOfType<AudioClip>())
return true;
if (assetItem.IsOfType<Prefab>())
return true;
if (assetItem.IsOfType<SceneAsset>())
return true;
if (assetItem is VisualScriptItem visualScriptItem && new ScriptType(typeof(Actor)).IsAssignableFrom(visualScriptItem.ScriptType) && visualScriptItem.ScriptType.CanCreateInstance)
return true;
}
return false;
@@ -891,119 +880,40 @@ namespace FlaxEditor.Viewport
private void Spawn(AssetItem item, SceneGraphNode hit, ref Vector2 location, ref Vector3 hitLocation)
{
if (item is AssetItem assetItem)
if (item.IsOfType<MaterialBase>())
{
if (assetItem.IsOfType<ParticleSystem>())
if (hit is StaticModelNode staticModelNode)
{
var asset = FlaxEngine.Content.LoadAsync<ParticleSystem>(item.ID);
var actor = new ParticleEffect
{
Name = item.ShortName,
ParticleSystem = asset
};
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<SceneAnimation>())
{
var asset = FlaxEngine.Content.LoadAsync<SceneAnimation>(item.ID);
var actor = new SceneAnimationPlayer
{
Name = item.ShortName,
Animation = asset
};
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<MaterialBase>())
{
if (hit is StaticModelNode staticModelNode)
{
var staticModel = (StaticModel)staticModelNode.Actor;
var ray = ConvertMouseToRay(ref location);
if (staticModel.IntersectsEntry(ref ray, out _, out _, out var entryIndex))
{
var material = FlaxEngine.Content.LoadAsync<MaterialBase>(item.ID);
using (new UndoBlock(Undo, staticModel, "Change material"))
staticModel.SetMaterial(entryIndex, material);
}
}
else if (hit is BoxBrushNode.SideLinkNode brushSurfaceNode)
var staticModel = (StaticModel)staticModelNode.Actor;
var ray = ConvertMouseToRay(ref location);
if (staticModel.IntersectsEntry(ref ray, out _, out _, out var entryIndex))
{
var material = FlaxEngine.Content.LoadAsync<MaterialBase>(item.ID);
using (new UndoBlock(Undo, brushSurfaceNode.Brush, "Change material"))
{
var surface = brushSurfaceNode.Surface;
surface.Material = material;
brushSurfaceNode.Surface = surface;
}
using (new UndoBlock(Undo, staticModel, "Change material"))
staticModel.SetMaterial(entryIndex, material);
}
return;
}
if (assetItem.IsOfType<SkinnedModel>())
else if (hit is BoxBrushNode.SideLinkNode brushSurfaceNode)
{
var model = FlaxEngine.Content.LoadAsync<SkinnedModel>(item.ID);
var actor = new AnimatedModel
var material = FlaxEngine.Content.LoadAsync<MaterialBase>(item.ID);
using (new UndoBlock(Undo, brushSurfaceNode.Brush, "Change material"))
{
Name = item.ShortName,
SkinnedModel = model
};
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<Model>())
{
var model = FlaxEngine.Content.LoadAsync<Model>(item.ID);
var actor = new StaticModel
{
Name = item.ShortName,
Model = model
};
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<CollisionData>())
{
var collisionData = FlaxEngine.Content.LoadAsync<CollisionData>(item.ID);
var actor = new MeshCollider
{
Name = item.ShortName,
CollisionData = collisionData
};
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<AudioClip>())
{
var clip = FlaxEngine.Content.LoadAsync<AudioClip>(item.ID);
var actor = new AudioSource
{
Name = item.ShortName,
Clip = clip
};
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<Prefab>())
{
var prefab = FlaxEngine.Content.LoadAsync<Prefab>(item.ID);
var actor = PrefabManager.SpawnPrefab(prefab, null);
actor.Name = item.ShortName;
Spawn(actor, ref hitLocation);
return;
}
if (assetItem.IsOfType<SceneAsset>())
{
Editor.Instance.Scene.OpenScene(item.ID, true);
return;
}
if (assetItem is VisualScriptItem visualScriptItem && new ScriptType(typeof(Actor)).IsAssignableFrom(visualScriptItem.ScriptType) && visualScriptItem.ScriptType.CanCreateInstance)
{
var actor = (Actor)visualScriptItem.ScriptType.CreateInstance();
actor.Name = item.ShortName;
Spawn(actor, ref hitLocation);
return;
var surface = brushSurfaceNode.Surface;
surface.Material = material;
brushSurfaceNode.Surface = surface;
}
}
return;
}
if (item.IsOfType<SceneAsset>())
{
Editor.Instance.Scene.OpenScene(item.ID, true);
return;
}
{
var actor = item.OnEditorDrop(this);
actor.Name = item.ShortName;
Spawn(actor, ref hitLocation);
}
}

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

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Security.Policy;
using FlaxEditor.Content;
using FlaxEditor.Gizmo;
using FlaxEditor.GUI.ContextMenu;
@@ -53,7 +54,7 @@ namespace FlaxEditor.Viewport
private readonly ViewportDebugDrawData _debugDrawData = new ViewportDebugDrawData(32);
private IntPtr _debugDrawContext;
private PrefabSpritesRenderer _spritesRenderer;
private readonly DragAssets _dragAssets = new DragAssets(ValidateDragItem);
private readonly DragAssets _dragAssets;
private readonly DragActorType _dragActorType = new DragActorType(ValidateDragActorType);
private readonly DragHandlers _dragHandlers = new DragHandlers();
@@ -89,6 +90,7 @@ namespace FlaxEditor.Viewport
Undo = window.Undo;
ViewportCamera = new FPSCamera();
_debugDrawContext = DebugDraw.AllocateContext();
_dragAssets = new DragAssets(ValidateDragItem);
// Prepare rendering task
Task.ActorsSource = ActorsSources.CustomActors;
@@ -673,24 +675,14 @@ namespace FlaxEditor.Viewport
return _dragHandlers.OnDragEnter(data);
}
private static bool ValidateDragItem(ContentItem contentItem)
private bool ValidateDragItem(ContentItem contentItem)
{
if (contentItem is AssetItem assetItem)
{
if (assetItem.IsOfType<ParticleSystem>())
if (assetItem.OnEditorDrag(this))
return true;
if (assetItem.IsOfType<MaterialBase>())
return true;
if (assetItem.IsOfType<ModelBase>())
return true;
if (assetItem.IsOfType<CollisionData>())
return true;
if (assetItem.IsOfType<AudioClip>())
return true;
if (assetItem.IsOfType<Prefab>())
return true;
if (assetItem is VisualScriptItem visualScriptItem && new ScriptType(typeof(Actor)).IsAssignableFrom(visualScriptItem.ScriptType) && visualScriptItem.ScriptType.CanCreateInstance)
return true;
}
return false;
@@ -743,17 +735,6 @@ namespace FlaxEditor.Viewport
{
if (item is BinaryAssetItem binaryAssetItem)
{
if (binaryAssetItem.Type == typeof(ParticleSystem))
{
var particleSystem = FlaxEngine.Content.LoadAsync<ParticleSystem>(item.ID);
var actor = new ParticleEffect
{
Name = item.ShortName,
ParticleSystem = particleSystem
};
Spawn(actor, ref hitLocation);
return;
}
if (typeof(MaterialBase).IsAssignableFrom(binaryAssetItem.Type))
{
if (hit is StaticModelNode staticModelNode)
@@ -769,65 +750,11 @@ namespace FlaxEditor.Viewport
}
return;
}
if (typeof(SkinnedModel).IsAssignableFrom(binaryAssetItem.Type))
{
var model = FlaxEngine.Content.LoadAsync<SkinnedModel>(item.ID);
var actor = new AnimatedModel
{
Name = item.ShortName,
SkinnedModel = model
};
Spawn(actor, ref hitLocation);
return;
}
if (typeof(Model).IsAssignableFrom(binaryAssetItem.Type))
{
var model = FlaxEngine.Content.LoadAsync<Model>(item.ID);
var actor = new StaticModel
{
Name = item.ShortName,
Model = model
};
Spawn(actor, ref hitLocation);
return;
}
if (binaryAssetItem.IsOfType<CollisionData>())
{
var collisionData = FlaxEngine.Content.LoadAsync<CollisionData>(item.ID);
var actor = new MeshCollider
{
Name = item.ShortName,
CollisionData = collisionData
};
Spawn(actor, ref hitLocation);
return;
}
if (typeof(AudioClip).IsAssignableFrom(binaryAssetItem.Type))
{
var clip = FlaxEngine.Content.LoadAsync<AudioClip>(item.ID);
var actor = new AudioSource
{
Name = item.ShortName,
Clip = clip
};
Spawn(actor, ref hitLocation);
return;
}
if (typeof(Prefab).IsAssignableFrom(binaryAssetItem.Type))
{
var prefab = FlaxEngine.Content.LoadAsync<Prefab>(item.ID);
var actor = PrefabManager.SpawnPrefab(prefab, null);
actor.Name = item.ShortName;
Spawn(actor, ref hitLocation);
return;
}
}
if (item is VisualScriptItem visualScriptItem && new ScriptType(typeof(Actor)).IsAssignableFrom(visualScriptItem.ScriptType) && visualScriptItem.ScriptType.CanCreateInstance)
{
var actor = (Actor)visualScriptItem.ScriptType.CreateInstance();
var actor = item.OnEditorDrop(this);
actor.Name = item.ShortName;
Spawn(actor, ref hitLocation);
return;
}
}