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

Make Dynamis IPC working.

Browse source
This commit is contained in:
Ottermandias 2025-05-08 23:44:16 +02:00
parent 8a9877bb01
commit 9abd7f2767
5 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Glamourer/Gui/Equipment/ItemCopyService.cs
View file

@ -1,18 +1,13 @@
using Dalamud.Game.ClientState.Keys;
using Dalamud.Plugin.Services;
using Glamourer.Services;
using Glamourer.Services;
using ImGuiNET;
using OtterGui.OtterGuiInternal.Enums;
using OtterGui.Services;
using OtterGuiInternal;
using Penumbra.GameData.Data;
using Penumbra.GameData.DataContainers;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
namespace Glamourer.Gui.Equipment;
public class ItemCopyService(ItemManager items, IKeyState keyState, DictStain stainData) : IUiService
public class ItemCopyService(ItemManager items, DictStain stainData) : IUiService
{
public EquipItem? Item { get; private set; }
public Stain? Stain { get; private set; }

2
Glamourer/Gui/Tabs/DebugTab/DebugTabHeader.cs
View file

@ -1,5 +1,4 @@
using Glamourer.Gui.Tabs.DebugTab.IpcTester;
using ImGuiNET;
using Microsoft.Extensions.DependencyInjection;
using OtterGui.Raii;
using Penumbra.GameData.Gui.Debug;
@ -36,6 +35,7 @@ public class DebugTabHeader(string label, params IGameDataDrawer[] subTrees)
provider.GetRequiredService<ModelEvaluationPanel>(),
provider.GetRequiredService<ObjectManagerPanel>(),
provider.GetRequiredService<PenumbraPanel>(),
provider.GetRequiredService<DynamisPanel>(),
provider.GetRequiredService<IpcTesterPanel>(),
provider.GetRequiredService<DatFilePanel>(),
provider.GetRequiredService<GlamourPlatePanel>(),

16
Glamourer/Gui/Tabs/DebugTab/DynamisPanel.cs Normal file
View file

@ -0,0 +1,16 @@
using OtterGui.Services;
using Penumbra.GameData.Gui.Debug;
namespace Glamourer.Gui.Tabs.DebugTab;
public class DynamisPanel(DynamisIpc dynamis) : IGameDataDrawer
{
public string Label
=> "Dynamis Interop";
public void Draw()
=> dynamis.DrawDebugInfo();
public bool Disabled
=> false;
}

6
Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs
View file

@ -61,7 +61,7 @@ public unsafe class PenumbraPanel(PenumbraService _penumbra, PenumbraChangedItem
ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
ImGui.InputInt("##CutsceneIndex", ref _gameObjectIndex, 0, 0);
ImGuiUtil.DrawTableColumn(_penumbra.Available
? _penumbra.CutsceneParent((ushort) _gameObjectIndex).ToString()
? _penumbra.CutsceneParent((ushort)_gameObjectIndex).ToString()
: "Penumbra Unavailable");
ImGuiUtil.DrawTableColumn("Redraw Object");
@ -76,7 +76,9 @@ public unsafe class PenumbraPanel(PenumbraService _penumbra, PenumbraChangedItem
}
ImGuiUtil.DrawTableColumn("Last Tooltip Date");
ImGuiUtil.DrawTableColumn(_penumbraTooltip.LastTooltip > DateTime.MinValue ? $"{_penumbraTooltip.LastTooltip.ToLongTimeString()} ({_penumbraTooltip.LastType} {_penumbraTooltip.LastId})" : "Never");
ImGuiUtil.DrawTableColumn(_penumbraTooltip.LastTooltip > DateTime.MinValue
? $"{_penumbraTooltip.LastTooltip.ToLongTimeString()} ({_penumbraTooltip.LastType} {_penumbraTooltip.LastId})"
: "Never");
ImGui.TableNextColumn();
ImGuiUtil.DrawTableColumn("Last Click Date");

2
OtterGui

@ -1 +1 @@
Subproject commit 9235599dd6efd17067a06ad98066a6c0d5b625e0
Subproject commit ce8f88ee892536016756769e86bdf48132351d80