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

Update STM and signatures.

Browse source
This commit is contained in:
Ottermandias 2025-03-27 15:53:59 +01:00
parent 586bd9d0cc
commit b8b2127a5d
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.Api

@ -1 +1 @@
Subproject commit 6d262cd3181d44c29891c9473f7c423300320f15
Subproject commit 2cbf4bace53a5749d3eab1ff03025a6e6bd9fc37

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit ab3ee0ee814e170b59e0c13b023bbb8bc9314c74
Subproject commit 9442f1d60578dae7598cbb0a1ff545d24905bdfd

4
Penumbra/Services/StainService.cs
View file

@ -16,7 +16,7 @@ namespace Penumbra.Services;
public class StainService : IService
{
public sealed class StainTemplateCombo<TDyePack>(FilterComboColors[] stainCombos, StmFile<TDyePack> stmFile)
: FilterComboCache<ushort>(stmFile.Entries.Keys.Prepend((ushort)0), MouseWheelType.None, Penumbra.Log)
: FilterComboCache<StmKeyType>(stmFile.Entries.Keys.Prepend(0), MouseWheelType.None, Penumbra.Log)
where TDyePack : unmanaged, IDyePack
{
// FIXME There might be a better way to handle that.
@ -31,7 +31,7 @@ public class StainService : IService
return baseSize + ImGui.GetTextLineHeight() * 3 + ImGui.GetStyle().ItemInnerSpacing.X * 3;
}
protected override string ToString(ushort obj)
protected override string ToString(StmKeyType obj)
=> $"{obj,4}";
protected override void DrawFilter(int currentSelected, float width)

2
Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
View file

@ -607,7 +607,7 @@ public partial class MtrlTab
if (_stainService.GudTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty,
scalarSize + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
{
dye.Template = _stainService.GudTemplateCombo.CurrentSelection;
dye.Template = _stainService.GudTemplateCombo.CurrentSelection.UShort;
ret = true;
}

4
Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs
View file

@ -184,7 +184,7 @@ public partial class MtrlTab
if (_stainService.LegacyTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty, intSize
+ ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
{
dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection;
dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection.UShort;
ret = true;
}
@ -299,7 +299,7 @@ public partial class MtrlTab
if (_stainService.LegacyTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty, intSize
+ ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
{
dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection;
dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection.UShort;
ret = true;
}