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

Improve mod editor a bit

Browse source
This commit is contained in:
Ottermandias 2023-04-29 12:25:43 +02:00
parent 7d1d6ac829
commit 31338e43d6
4 changed files with 95 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Mods/Editor/ModEditor.cs
View file

@ -42,7 +42,7 @@ public class ModEditor : IDisposable
LoadOption(groupIdx, optionIdx, true); LoadOption(groupIdx, optionIdx, true);
Files.UpdateAll(mod, Option!); Files.UpdateAll(mod, Option!);
SwapEditor.Revert(Option!); SwapEditor.Revert(Option!);
MetaEditor.Load(Option!); MetaEditor.Load(Mod!, Option!);
Duplicates.Clear(); Duplicates.Clear();
} }
@ -51,7 +51,7 @@ public class ModEditor : IDisposable
LoadOption(groupIdx, optionIdx, true); LoadOption(groupIdx, optionIdx, true);
SwapEditor.Revert(Option!); SwapEditor.Revert(Option!);
Files.UpdatePaths(Mod!, Option!); Files.UpdatePaths(Mod!, Option!);
MetaEditor.Load(Option!); MetaEditor.Load(Mod!, Option!);
FileEditor.Clear(); FileEditor.Clear();
Duplicates.Clear(); Duplicates.Clear();
} }

51
Penumbra/Mods/Editor/ModMetaEditor.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Penumbra.Meta.Manipulations; using Penumbra.Meta.Manipulations;
@ -16,6 +17,14 @@ public class ModMetaEditor
private readonly HashSet<EstManipulation> _est = new(); private readonly HashSet<EstManipulation> _est = new();
private readonly HashSet<RspManipulation> _rsp = new(); private readonly HashSet<RspManipulation> _rsp = new();
public int OtherImcCount { get; private set; }
public int OtherEqpCount { get; private set; }
public int OtherEqdpCount { get; private set; }
public int OtherGmpCount { get; private set; }
public int OtherEstCount { get; private set; }
public int OtherRspCount { get; private set; }
public ModMetaEditor(ModManager modManager) public ModMetaEditor(ModManager modManager)
=> _modManager = modManager; => _modManager = modManager;
@ -102,8 +111,46 @@ public class ModMetaEditor
Changes = true; Changes = true;
} }
public void Load(ISubMod mod) public void Load(Mod mod, ISubMod currentOption)
=> Split(mod.Manipulations); {
OtherImcCount = 0;
OtherEqpCount = 0;
OtherEqdpCount = 0;
OtherGmpCount = 0;
OtherEstCount = 0;
OtherRspCount = 0;
foreach (var option in mod.AllSubMods)
{
if (option == currentOption)
continue;
foreach (var manip in option.Manipulations)
{
switch (manip.ManipulationType)
{
case MetaManipulation.Type.Imc:
++OtherImcCount;
break;
case MetaManipulation.Type.Eqdp:
++OtherEqdpCount;
break;
case MetaManipulation.Type.Eqp:
++OtherEqpCount;
break;
case MetaManipulation.Type.Est:
++OtherEstCount;
break;
case MetaManipulation.Type.Gmp:
++OtherGmpCount;
break;
case MetaManipulation.Type.Rsp:
++OtherRspCount;
break;
}
}
}
Split(currentOption.Manipulations);
}
public void Apply(Mod mod, int groupIdx, int optionIdx) public void Apply(Mod mod, int groupIdx, int optionIdx)
{ {

34
Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
View file

@ -53,7 +53,7 @@ public partial class ModEditWindow
ImGui.SameLine(); ImGui.SameLine();
tt = setsEqual ? "No changes staged." : "Revert all currently staged changes."; tt = setsEqual ? "No changes staged." : "Revert all currently staged changes.";
if (ImGuiUtil.DrawDisabledButton("Revert Changes", Vector2.Zero, tt, setsEqual)) if (ImGuiUtil.DrawDisabledButton("Revert Changes", Vector2.Zero, tt, setsEqual))
_editor.MetaEditor.Load(_editor.Option!); _editor.MetaEditor.Load(_editor.Mod!, _editor.Option!);
ImGui.SameLine(); ImGui.SameLine();
AddFromClipboardButton(); AddFromClipboardButton();
@ -69,21 +69,33 @@ public partial class ModEditWindow
if (!child) if (!child)
return; return;
DrawEditHeader(_editor.MetaEditor.Eqp, "Equipment Parameter Edits (EQP)###EQP", 5, EqpRow.Draw, EqpRow.DrawNew); DrawEditHeader(_editor.MetaEditor.Eqp, "Equipment Parameter Edits (EQP)###EQP", 5, EqpRow.Draw, EqpRow.DrawNew , _editor.MetaEditor.OtherEqpCount);
DrawEditHeader(_editor.MetaEditor.Eqdp, "Racial Model Edits (EQDP)###EQDP", 7, EqdpRow.Draw, EqdpRow.DrawNew); DrawEditHeader(_editor.MetaEditor.Eqdp, "Racial Model Edits (EQDP)###EQDP", 7, EqdpRow.Draw, EqdpRow.DrawNew, _editor.MetaEditor.OtherEqdpCount);
DrawEditHeader(_editor.MetaEditor.Imc, "Variant Edits (IMC)###IMC", 10, ImcRow.Draw, ImcRow.DrawNew); DrawEditHeader(_editor.MetaEditor.Imc, "Variant Edits (IMC)###IMC", 10, ImcRow.Draw, ImcRow.DrawNew , _editor.MetaEditor.OtherImcCount);
DrawEditHeader(_editor.MetaEditor.Est, "Extra Skeleton Parameters (EST)###EST", 7, EstRow.Draw, EstRow.DrawNew); DrawEditHeader(_editor.MetaEditor.Est, "Extra Skeleton Parameters (EST)###EST", 7, EstRow.Draw, EstRow.DrawNew , _editor.MetaEditor.OtherEstCount);
DrawEditHeader(_editor.MetaEditor.Gmp, "Visor/Gimmick Edits (GMP)###GMP", 7, GmpRow.Draw, GmpRow.DrawNew); DrawEditHeader(_editor.MetaEditor.Gmp, "Visor/Gimmick Edits (GMP)###GMP", 7, GmpRow.Draw, GmpRow.DrawNew , _editor.MetaEditor.OtherGmpCount);
DrawEditHeader(_editor.MetaEditor.Rsp, "Racial Scaling Edits (RSP)###RSP", 5, RspRow.Draw, RspRow.DrawNew); DrawEditHeader(_editor.MetaEditor.Rsp, "Racial Scaling Edits (RSP)###RSP", 5, RspRow.Draw, RspRow.DrawNew , _editor.MetaEditor.OtherRspCount);
} }
/// <summary> The headers for the different meta changes all have basically the same structure for different types.</summary> /// <summary> The headers for the different meta changes all have basically the same structure for different types.</summary>
private void DrawEditHeader<T>(IReadOnlyCollection<T> items, string label, int numColumns, Action<MetaFileManager, T, ModEditor, Vector2> draw, private void DrawEditHeader<T>(IReadOnlyCollection<T> items, string label, int numColumns, Action<MetaFileManager, T, ModEditor, Vector2> draw,
Action<MetaFileManager, ModEditor, Vector2> drawNew) Action<MetaFileManager, ModEditor, Vector2> drawNew, int otherCount)
{ {
const ImGuiTableFlags flags = ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.BordersInnerV; const ImGuiTableFlags flags = ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.BordersInnerV;
if (!ImGui.CollapsingHeader($"{items.Count} {label}"))
var oldPos = ImGui.GetCursorPosY();
var header = ImGui.CollapsingHeader($"{items.Count} {label}");
var newPos = ImGui.GetCursorPos();
if (otherCount > 0)
{
var text = $"{otherCount} Edits in other Options";
var size = ImGui.CalcTextSize(text).X;
ImGui.SetCursorPos(new Vector2(ImGui.GetContentRegionAvail().X - size, oldPos + ImGui.GetStyle().FramePadding.Y));
ImGuiUtil.TextColored(ColorId.RedundantAssignment.Value() | 0xFF000000, text);
ImGui.SetCursorPos(newPos);
}
if (!header)
return; return;
using (var table = ImRaii.Table(label, numColumns, flags)) using (var table = ImRaii.Table(label, numColumns, flags))

33
Penumbra/UI/AdvancedWindow/ModEditWindow.cs
View file

@ -367,9 +367,9 @@ public partial class ModEditWindow : Window, IDisposable
{ {
const string defaultOption = "Default Option"; const string defaultOption = "Default Option";
using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero).Push(ImGuiStyleVar.FrameRounding, 0); using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero).Push(ImGuiStyleVar.FrameRounding, 0);
var width = new Vector2(ImGui.GetWindowWidth() / 3, 0); var width = new Vector2(ImGui.GetContentRegionAvail().X / 3, 0);
if (ImGuiUtil.DrawDisabledButton(defaultOption, width, "Switch to the default option for the mod.\nThis resets unsaved changes.", if (ImGuiUtil.DrawDisabledButton(defaultOption, width, "Switch to the default option for the mod.\nThis resets unsaved changes.",
_editor!.Option!.IsDefault)) _editor.Option!.IsDefault))
_editor.LoadOption(-1, 0); _editor.LoadOption(-1, 0);
ImGui.SameLine(); ImGui.SameLine();
@ -377,12 +377,14 @@ public partial class ModEditWindow : Window, IDisposable
_editor.LoadMod(_editor.Mod!, _editor.GroupIdx, _editor.OptionIdx); _editor.LoadMod(_editor.Mod!, _editor.GroupIdx, _editor.OptionIdx);
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetNextItemWidth(width.X);
using var combo = ImRaii.Combo("##optionSelector", _editor.Option.FullName, ImGuiComboFlags.NoArrowButton); style.Push(ImGuiStyleVar.FrameBorderSize, ImGuiHelpers.GlobalScale);
using var color = ImRaii.PushColor(ImGuiCol.Border, ColorId.FolderLine.Value());
using var combo = ImRaii.Combo("##optionSelector", _editor.Option.FullName);
if (!combo) if (!combo)
return; return;
foreach (var option in _mod!.AllSubMods.Cast<SubMod>()) foreach (var option in _mod!.AllSubMods)
{ {
if (ImGui.Selectable(option.FullName, option == _editor.Option)) if (ImGui.Selectable(option.FullName, option == _editor.Option))
_editor.LoadOption(option.GroupIdx, option.OptionIdx); _editor.LoadOption(option.GroupIdx, option.OptionIdx);
@ -411,6 +413,13 @@ public partial class ModEditWindow : Window, IDisposable
if (ImGuiUtil.DrawDisabledButton("Revert Changes", Vector2.Zero, tt, setsEqual)) if (ImGuiUtil.DrawDisabledButton("Revert Changes", Vector2.Zero, tt, setsEqual))
_editor.SwapEditor.Revert(_editor.Option!); _editor.SwapEditor.Revert(_editor.Option!);
var otherSwaps = _editor.Mod!.TotalSwapCount - _editor.SwapEditor.Swaps.Count;
if (otherSwaps > 0)
{
ImGui.SameLine();
ImGuiUtil.DrawTextButton($"There are {otherSwaps} file swaps configured in other options.", Vector2.Zero, ColorId.RedundantAssignment.Value());
}
using var child = ImRaii.Child("##swaps", -Vector2.One, true); using var child = ImRaii.Child("##swaps", -Vector2.One, true);
if (!child) if (!child)
return; return;
@ -434,18 +443,18 @@ public partial class ModEditWindow : Window, IDisposable
_editor.SwapEditor.Remove(gamePath); _editor.SwapEditor.Remove(gamePath);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
var tmp = gamePath.Path.ToString(); var tmp = file.FullName;
ImGui.SetNextItemWidth(-1);
if (ImGui.InputText("##value", ref tmp, Utf8GamePath.MaxGamePathLength) && tmp.Length > 0)
_editor.SwapEditor.Change(gamePath, new FullPath(tmp));
ImGui.TableNextColumn();
tmp = gamePath.Path.ToString();
ImGui.SetNextItemWidth(-1); ImGui.SetNextItemWidth(-1);
if (ImGui.InputText("##key", ref tmp, Utf8GamePath.MaxGamePathLength) if (ImGui.InputText("##key", ref tmp, Utf8GamePath.MaxGamePathLength)
&& Utf8GamePath.FromString(tmp, out var path) && Utf8GamePath.FromString(tmp, out var path)
&& !_editor.SwapEditor.Swaps.ContainsKey(path)) && !_editor.SwapEditor.Swaps.ContainsKey(path))
_editor.SwapEditor.Change(gamePath, path); _editor.SwapEditor.Change(gamePath, path);
ImGui.TableNextColumn();
tmp = file.FullName;
ImGui.SetNextItemWidth(-1);
if (ImGui.InputText("##value", ref tmp, Utf8GamePath.MaxGamePathLength) && tmp.Length > 0)
_editor.SwapEditor.Change(gamePath, new FullPath(tmp));
} }
ImGui.TableNextColumn(); ImGui.TableNextColumn();