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

Bump ClientStructs and apply fixes

Browse source
This commit is contained in:
Raymond 2021-08-09 10:00:14 -04:00
parent 7cb1f3b2f9
commit 7f4720ceb6
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Interface/Internal/UiDebug.cs
View file

@ -273,8 +273,11 @@ namespace Dalamud.Interface.Internal
ImGui.Text($"texture type: {texType} part_id={imageNode->PartId} part_id_count={imageNode->PartsList->PartCount}"); ImGui.Text($"texture type: {texType} part_id={imageNode->PartId} part_id_count={imageNode->PartsList->PartCount}");
if (texType == TextureType.Resource) if (texType == TextureType.Resource)
{ {
var texFileNamePtr = textureInfo->AtkTexture.Resource->TexFileResourceHandle->ResourceHandle.FileName; var texFileNameStdString = &textureInfo->AtkTexture.Resource->TexFileResourceHandle->ResourceHandle.FileName;
var texString = Marshal.PtrToStringAnsi(new IntPtr(texFileNamePtr)); var texString = texFileNameStdString->Length < 16
? Marshal.PtrToStringAnsi((IntPtr)texFileNameStdString->Buffer)
: Marshal.PtrToStringAnsi((IntPtr)texFileNameStdString->BufferPtr);
ImGui.Text($"texture path: {texString}"); ImGui.Text($"texture path: {texString}");
var kernelTexture = textureInfo->AtkTexture.Resource->KernelTextureObject; var kernelTexture = textureInfo->AtkTexture.Resource->KernelTextureObject;
@ -327,7 +330,7 @@ namespace Dalamud.Interface.Internal
var childCount = componentInfo.NodeListCount; var childCount = componentInfo.NodeListCount;
var objectInfo = (ULDComponentInfo*)componentInfo.Objects; var objectInfo = (AtkUldComponentInfo*)componentInfo.Objects;
if (ImGui.TreeNode($"{treePrefix}{objectInfo->ComponentType} Component Node (ptr = {(long)node:X}, component ptr = {(long)compNode->Component:X}) child count = {childCount} ###{(long)node}")) if (ImGui.TreeNode($"{treePrefix}{objectInfo->ComponentType} Component Node (ptr = {(long)node:X}, component ptr = {(long)compNode->Component:X}) child count = {childCount} ###{(long)node}"))
{ {
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit e3bec118909b0eafdd0ee7c3312c646ce0c3f3dd Subproject commit cbbea8ea911dda876d4a996f214f337e4db88a01