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

feat: add Util.ShowGameObjectStruct, switch target data viewer

Browse source
This commit is contained in:
goat 2021-12-07 22:29:51 +01:00
parent 2e20ee7a4a
commit ca52a8c9e4
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
4 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
View file

@ -62,6 +62,6 @@ namespace Dalamud.Game.ClientState.Objects.Types
/// <summary>
/// Gets the underlying structure.
/// </summary>
internal protected new FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara*)this.Address;
protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara*)this.Address;
}
}

16
Dalamud/Interface/ImGuiHelpers.cs
View file

@ -112,14 +112,6 @@ namespace Dalamud.Interface
/// <returns><see cref="Vector2"/> with the size of the button.</returns>
public static Vector2 GetButtonSize(string text) => ImGui.CalcTextSize(text) + (ImGui.GetStyle().FramePadding * 2);
/// <summary>
/// Get data needed for each new frame.
/// </summary>
internal static void NewFrame()
{
GlobalScale = ImGui.GetIO().FontGlobalScale;
}
/// <summary>
/// Print out text that can be copied when clicked.
/// </summary>
@ -137,5 +129,13 @@ namespace Dalamud.Interface
if (ImGui.IsItemClicked()) ImGui.SetClipboardText($"{textCopy}");
}
/// <summary>
/// Get data needed for each new frame.
/// </summary>
internal static void NewFrame()
{
GlobalScale = ImGui.GetIO().FontGlobalScale;
}
}
}

5
Dalamud/Interface/Internal/Windows/DataWindow.cs
View file

@ -1019,15 +1019,16 @@ namespace Dalamud.Interface.Internal.Windows
this.PrintGameObject(targetMgr.Target, "CurrentTarget");
ImGui.Text("Target");
Util.ShowObject(targetMgr.Target);
Util.ShowGameObjectStruct(targetMgr.Target);
var tot = targetMgr.Target.TargetObject;
if (tot != null)
{
ImGuiHelpers.ScaledDummy(10);
ImGui.Separator();
ImGui.Text("ToT");
Util.ShowObject(tot);
Util.ShowGameObjectStruct(tot);
}
ImGuiHelpers.ScaledDummy(10);

23
Dalamud/Utility/Util.cs
View file

@ -13,6 +13,7 @@ using System.Text;
using Dalamud.Configuration.Internal;
using Dalamud.Game;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Interface;
using Dalamud.Interface.Colors;
using ImGuiNET;
@ -243,6 +244,26 @@ namespace Dalamud.Utility
}
}
/// <summary>
/// Show a GameObject's internal data in an ImGui-context.
/// </summary>
/// <param name="go">The GameObject to show.</param>
public static unsafe void ShowGameObjectStruct(GameObject go)
{
switch (go)
{
case BattleChara bchara:
ShowStruct(*bchara.Struct, (ulong)bchara.Address);
break;
case Character chara:
ShowStruct(*chara.Struct, (ulong)chara.Address);
break;
default:
ShowStruct(*go.Struct, (ulong)go.Address);
break;
}
}
/// <summary>
/// Show all properties and fields of the provided object via ImGui.
/// </summary>
@ -402,7 +423,7 @@ namespace Dalamud.Utility
return Check1() || Check2() || Check3();
}
private static unsafe void ShowValue(ulong addr, IEnumerable<string> path, Type type, object value)
{
if (type.IsPointer)