max/Nerfed
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

switched back to imgui dragdrop

Browse Source
This commit is contained in:
max 2024-10-15 23:17:58 +02:00
parent 86b54e1521
commit 9387bfa59c
2 changed files with 30 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Nerfed.Editor/Components/HierachyComponents.cs
View File

@ -2,5 +2,3 @@
public readonly record struct SelectedInHierachy; public readonly record struct SelectedInHierachy;
public readonly record struct ClickedInHierachy; public readonly record struct ClickedInHierachy;
public readonly record struct PayloadSourceInHierachy;
public readonly record struct PayloadTargetInHierachy;

120
Nerfed.Editor/Systems/EditorHierarchyWindow.cs
View File

@ -17,7 +17,6 @@ internal class EditorHierarchyWindow : MoonTools.ECS.DebugSystem
private readonly Filter rootEntitiesFilter; private readonly Filter rootEntitiesFilter;
private readonly EditorHierachySelectionSystem hierachySelectionSystem; private readonly EditorHierachySelectionSystem hierachySelectionSystem;
private readonly EditorHierachyDragAndDropSystem hierachyDragAndDropSystem;
public EditorHierarchyWindow(World world) : base(world) public EditorHierarchyWindow(World world) : base(world)
{ {
@ -34,7 +33,6 @@ public EditorHierarchyWindow(World world) : base(world)
// Or a EditorComponent, just a component that always gets added when in editor mode. // Or a EditorComponent, just a component that always gets added when in editor mode.
hierachySelectionSystem = new EditorHierachySelectionSystem(world); hierachySelectionSystem = new EditorHierachySelectionSystem(world);
hierachyDragAndDropSystem = new EditorHierachyDragAndDropSystem(world);
} }
public override void Update(TimeSpan delta) public override void Update(TimeSpan delta)
@ -46,23 +44,23 @@ public override void Update(TimeSpan delta)
if (ImGui.TreeNodeEx("World", flags)) if (ImGui.TreeNodeEx("World", flags))
{ {
//if (ImGui.BeginDragDropTarget()) if (ImGui.BeginDragDropTarget())
//{ {
// unsafe unsafe
// { {
// ImGuiPayloadPtr payload = ImGui.AcceptDragDropPayload($"{nameof(EditorHierarchyWindow)}"); ImGuiPayloadPtr payload = ImGui.AcceptDragDropPayload($"{nameof(EditorHierarchyWindow)}");
// if (payload.NativePtr != null) if (payload.NativePtr != null)
// { {
// Entity* data = (Entity*)payload.Data; Entity* data = (Entity*)payload.Data;
// Entity child = data[0]; Entity child = data[0];
// Log.Info($"Dropped {child.ID}"); Log.Info($"Dropped {child.ID}");
// Transform.RemoveParent(World, child); Transform.RemoveParent(World, child);
// } }
// } }
// ImGui.EndDragDropTarget(); ImGui.EndDragDropTarget();
//} }
//foreach (Entity entity in rootEntitiesWithTransformFilter.Entities) //foreach (Entity entity in rootEntitiesWithTransformFilter.Entities)
//{ //{
@ -80,7 +78,6 @@ public override void Update(TimeSpan delta)
ImGui.End(); ImGui.End();
hierachySelectionSystem.Update(delta); hierachySelectionSystem.Update(delta);
hierachyDragAndDropSystem.Update(delta);
} }
private void DrawEntityAndChildren(in Entity entity) private void DrawEntityAndChildren(in Entity entity)
@ -108,44 +105,31 @@ private void DrawEntityAndChildren(in Entity entity)
// Drag and drop. // Drag and drop.
if (ImGui.BeginDragDropSource()) if (ImGui.BeginDragDropSource())
{ {
ImGui.SetDragDropPayload($"{nameof(EditorHierarchyWindow)}", nint.Zero, 0); unsafe
Set(entity, new PayloadSourceInHierachy()); {
Log.Info($"SetSource {entity.ID}"); fixed (Entity* payload = &entity)
{
//unsafe ImGui.SetDragDropPayload($"{nameof(EditorHierarchyWindow)}", (IntPtr)payload, (uint)sizeof(Entity));
//{ }
// fixed (Entity* payload = &entity) }
// {
// ImGui.SetDragDropPayload($"{nameof(EditorHierarchyWindow)}", (IntPtr)payload, (uint)sizeof(Entity));
// }
//}
ImGui.EndDragDropSource(); ImGui.EndDragDropSource();
} }
if (ImGui.BeginDragDropTarget()) if (ImGui.BeginDragDropTarget())
{ {
ImGuiPayloadPtr payload = ImGui.AcceptDragDropPayload($"{nameof(EditorHierarchyWindow)}");
unsafe unsafe
{ {
ImGuiPayloadPtr payload = ImGui.AcceptDragDropPayload($"{nameof(EditorHierarchyWindow)}");
if (payload.NativePtr != null) if (payload.NativePtr != null)
{ {
Log.Info($"SetTarget {entity.ID}"); Entity ent = *(Entity*)payload.Data;
Set(entity, new PayloadTargetInHierachy());
Log.Info($"Dropped {ent.ID}");
Transform.SetParent(World, ent, entity);
} }
} }
//unsafe
//{
// ImGuiPayloadPtr payload = ImGui.AcceptDragDropPayload($"{nameof(EditorHierarchyWindow)}");
// if (payload.NativePtr != null)
// {
// Entity ent = *(Entity*)payload.Data;
// Log.Info($"Dropped {ent.ID}");
// Transform.SetParent(World, ent, entity);
// }
//}
ImGui.EndDragDropTarget(); ImGui.EndDragDropTarget();
} }
@ -200,53 +184,5 @@ public override void Update(TimeSpan delta)
} }
} }
} }
private class EditorHierachyDragAndDropSystem : MoonTools.ECS.System
{
private readonly Filter sourceEntities;
private readonly Filter targetEntities;
public EditorHierachyDragAndDropSystem(World world) : base(world)
{
sourceEntities = FilterBuilder.Include<PayloadSourceInHierachy>().Build();
targetEntities = FilterBuilder.Include<PayloadTargetInHierachy>().Build();
}
public override void Update(TimeSpan delta)
{
if (!targetEntities.Empty)
{
Entity target = GetSingletonEntity<PayloadTargetInHierachy>();
foreach (Entity source in sourceEntities.Entities)
{
Transform.SetParent(World, source, target);
}
}
bool clear = false;
unsafe
{
ImGuiPayloadPtr payload = ImGui.GetDragDropPayload();
if (payload.NativePtr == null)
{
clear = true;
}
}
if (clear)
{
foreach (Entity source in targetEntities.Entities)
{
Remove<PayloadTargetInHierachy>(source);
}
foreach (Entity source in sourceEntities.Entities)
{
Remove<PayloadSourceInHierachy>(source);
}
}
}
}
} }
} }