ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some rework, add drag & drop.

Browse source
This commit is contained in:
Ottermandias 2024-01-07 23:03:52 +01:00
parent 4c18b747b1
commit a2b92f1296
2 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Penumbra/UI/AdvancedWindow/ModEditWindow.Models.MdlTab.cs
View file

@ -142,13 +142,12 @@ public partial class ModEditWindow
.ContinueWith(task => .ContinueWith(task =>
{ {
IoException = task.Exception?.ToString(); IoException = task.Exception?.ToString();
PendingIo = false; if (task is { IsCompletedSuccessfully: true, Result: not null })
if (task.IsCompletedSuccessfully && task.Result != null)
{ {
Initialize(task.Result); Initialize(task.Result);
_dirty = true; _dirty = true;
} }
PendingIo = false;
}); });
} }

51
Penumbra/UI/AdvancedWindow/ModEditWindow.Models.cs
View file

@ -15,7 +15,7 @@ public partial class ModEditWindow
private const int MdlMaterialMaximum = 4; private const int MdlMaterialMaximum = 4;
private readonly FileEditor<MdlTab> _modelTab; private readonly FileEditor<MdlTab> _modelTab;
private readonly ModelManager _models; private readonly ModelManager _models;
private string _modelNewMaterial = string.Empty; private string _modelNewMaterial = string.Empty;
private readonly List<TagButtons> _subMeshAttributeTagWidgets = []; private readonly List<TagButtons> _subMeshAttributeTagWidgets = [];
@ -55,9 +55,7 @@ public partial class ModEditWindow
if (!ImGui.CollapsingHeader("Import / Export")) if (!ImGui.CollapsingHeader("Import / Export"))
return; return;
var windowWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X; var childSize = new Vector2((ImGui.GetContentRegionAvail().X - ImGui.GetStyle().ItemSpacing.X) / 2, 0);
var childWidth = (windowWidth - ImGui.GetStyle().ItemSpacing.X * 3) / 2;
var childSize = new Vector2(childWidth, 0);
DrawImport(tab, childSize, disabled); DrawImport(tab, childSize, disabled);
ImGui.SameLine(); ImGui.SameLine();
@ -67,21 +65,35 @@ public partial class ModEditWindow
ImGuiUtil.TextWrapped(tab.IoException); ImGuiUtil.TextWrapped(tab.IoException);
} }
private void DrawImport(MdlTab tab, Vector2 size, bool disabled) private void DrawImport(MdlTab tab, Vector2 size, bool _1)
{ {
using var frame = ImRaii.FramedGroup("Import", size); _dragDropManager.CreateImGuiSource("ModelDragDrop",
m => m.Extensions.Any(e => ValidModelExtensions.Contains(e.ToLowerInvariant())), m =>
if (ImGuiUtil.DrawDisabledButton("Import from glTF", Vector2.Zero, "Imports a glTF file, overriding the content of this mdl.", tab.PendingIo))
{
_fileDialog.OpenFilePicker("Load model from glTF.", "glTF{.gltf,.glb}", (success, paths) =>
{ {
if (success && paths.Count > 0) if (!GetFirstModel(m.Files, out var file))
tab.Import(paths[0]); return false;
}, 1, _mod!.ModPath.FullName, false);
ImGui.TextUnformatted($"Dragging model for editing: {Path.GetFileName(file)}");
return true;
});
using (var frame = ImRaii.FramedGroup("Import", size))
{
if (ImGuiUtil.DrawDisabledButton("Import from glTF", Vector2.Zero, "Imports a glTF file, overriding the content of this mdl.",
tab.PendingIo))
_fileDialog.OpenFilePicker("Load model from glTF.", "glTF{.gltf,.glb}", (success, paths) =>
{
if (success && paths.Count > 0)
tab.Import(paths[0]);
}, 1, _mod!.ModPath.FullName, false);
ImGui.Dummy(new Vector2(ImGui.GetFrameHeight()));
} }
if (_dragDropManager.CreateImGuiTarget("ModelDragDrop", out var files, out _) && GetFirstModel(files, out var file))
tab.Import(file);
} }
private void DrawExport(MdlTab tab, Vector2 size, bool disabled) private void DrawExport(MdlTab tab, Vector2 size, bool _)
{ {
using var frame = ImRaii.FramedGroup("Export", size); using var frame = ImRaii.FramedGroup("Export", size);
@ -431,4 +443,15 @@ public partial class ModEditWindow
return false; return false;
} }
private static bool GetFirstModel(IEnumerable<string> files, [NotNullWhen(true)] out string? file)
{
file = files.FirstOrDefault(f => ValidModelExtensions.Contains(Path.GetExtension(f).ToLowerInvariant()));
return file != null;
}
private static readonly string[] ValidModelExtensions =
[
".gltf",
];
} }