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

ClientStructs-ify stuff

Browse source
This commit is contained in:
Exter-N 2025-08-09 03:31:17 +02:00 • committed by Ottermandias
parent 46cfbcb115
commit 11cd08a9de
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Penumbra/Interop/ResourceTree/ResourceTree.cs
View file

@ -258,8 +258,7 @@ public class ResourceTree(
for (var i = 0; i < skeleton->PartialSkeletonCount; ++i) for (var i = 0; i < skeleton->PartialSkeletonCount; ++i)
{ {
// TODO ClientStructs-ify (aers/FFXIVClientStructs#1475) var phybHandle = physics != null ? physics->BonePhysicsResourceHandles[i] : null;
var phybHandle = physics != null ? ((ResourceHandle**)((nint)physics + 0x190))[i] : null;
if (context.CreateNodeFromPartialSkeleton(&skeleton->PartialSkeletons[i], phybHandle, (uint)i) is { } sklbNode) if (context.CreateNodeFromPartialSkeleton(&skeleton->PartialSkeletons[i], phybHandle, (uint)i) is { } sklbNode)
{ {
if (context.Global.WithUiData) if (context.Global.WithUiData)

4
Penumbra/Interop/Structs/StructExtensions.cs
View file

@ -36,10 +36,8 @@ internal static class StructExtensions
public static unsafe CiByteString ResolveSkinMtrlPathAsByteString(ref this CharacterBase character, uint slotIndex) public static unsafe CiByteString ResolveSkinMtrlPathAsByteString(ref this CharacterBase character, uint slotIndex)
{ {
// TODO ClientStructs-ify (aers/FFXIVClientStructs#1474)
var vf91 = (delegate* unmanaged<CharacterBase*, byte*, nuint, uint, byte*>)((nint*)character.VirtualTable)[91];
var pathBuffer = stackalloc byte[CharacterBase.PathBufferSize]; var pathBuffer = stackalloc byte[CharacterBase.PathBufferSize];
return ToOwnedByteString(vf91((CharacterBase*)Unsafe.AsPointer(ref character), pathBuffer, CharacterBase.PathBufferSize, slotIndex)); return ToOwnedByteString(character.ResolveSkinMtrlPath(pathBuffer, CharacterBase.PathBufferSize, slotIndex));
} }
public static CiByteString ResolveMaterialPapPathAsByteString(ref this CharacterBase character, uint slotIndex, uint unkSId) public static CiByteString ResolveMaterialPapPathAsByteString(ref this CharacterBase character, uint slotIndex, uint unkSId)