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

Advanced Editing minor improvements

Browse source
This commit is contained in:
Exter-N 2024-03-29 20:05:25 +01:00
parent 8fa49137b1
commit b4b813fe5e
5 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OtterGui

@ -1 +1 @@
Subproject commit 4e06921da239788331a4527aa6a2943cf0e809fe
Subproject commit b70c7cc2f6c71f80884de30a237cab201d7fe150

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 66687643da2163c938575ad6949c8d0fbd03afe7
Subproject commit 45679aa32cc37b59f5eeb7cf6bf5a3ea36c626e0

3
Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.cs
View file

@ -3,6 +3,7 @@ using Dalamud.Interface.Utility;
using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Widgets;
using Penumbra.GameData.Files;
using Penumbra.String.Classes;
using Penumbra.UI.Classes;
@ -170,7 +171,7 @@ public partial class ModEditWindow
using var t = ImRaii.TreeNode($"Additional Data (Size: {file.AdditionalData.Length})###AdditionalData");
if (t)
ImGuiUtil.TextWrapped(string.Join(' ', file.AdditionalData.Select(c => $"{c:X2}")));
Widget.DrawHexViewer(file.AdditionalData);
}
private void DrawMaterialReassignmentTab()

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

@ -560,7 +560,7 @@ public partial class ModEditWindow
{
using var t = ImRaii.TreeNode($"Additional Data (Size: {_lastFile.RemainingData.Length})###AdditionalData");
if (t)
ImGuiUtil.TextWrapped(string.Join(' ', _lastFile.RemainingData.Select(c => $"{c:X2}")));
Widget.DrawHexViewer(_lastFile.RemainingData);
}
return false;

12
Penumbra/UI/AdvancedWindow/ModEditWindow.ShaderPackages.cs
View file

@ -10,6 +10,7 @@ using Penumbra.GameData.Files;
using Penumbra.GameData.Interop;
using Penumbra.String;
using static Penumbra.GameData.Files.ShpkFile;
using OtterGui.Widgets;
namespace Penumbra.UI.AdvancedWindow;
@ -172,11 +173,16 @@ public partial class ModEditWindow
ret |= DrawShaderPackageResourceArray("Samplers", "slot", false, shader.Samplers, true);
ret |= DrawShaderPackageResourceArray("Unordered Access Views", "slot", true, shader.Uavs, true);
if (shader.AdditionalHeader.Length > 0)
if (shader.DeclaredInputs != 0)
ImRaii.TreeNode($"Declared Inputs: {shader.DeclaredInputs}", ImGuiTreeNodeFlags.Leaf | ImGuiTreeNodeFlags.Bullet).Dispose();
if (shader.UsedInputs != 0)
ImRaii.TreeNode($"Used Inputs: {shader.UsedInputs}", ImGuiTreeNodeFlags.Leaf | ImGuiTreeNodeFlags.Bullet).Dispose();
if (shader.AdditionalHeader.Length > 8)
{
using var t2 = ImRaii.TreeNode($"Additional Header (Size: {shader.AdditionalHeader.Length})###AdditionalHeader");
if (t2)
ImGuiUtil.TextWrapped(string.Join(' ', shader.AdditionalHeader.Select(c => $"{c:X2}")));
Widget.DrawHexViewer(shader.AdditionalHeader);
}
if (tab.Shpk.Disassembled)
@ -549,7 +555,7 @@ public partial class ModEditWindow
{
using var t = ImRaii.TreeNode($"Additional Data (Size: {tab.Shpk.AdditionalData.Length})###AdditionalData");
if (t)
ImGuiUtil.TextWrapped(string.Join(' ', tab.Shpk.AdditionalData.Select(c => $"{c:X2}")));
Widget.DrawHexViewer(tab.Shpk.AdditionalData);
}
}