git is stupid

This commit is contained in:
Ottermandias 2025-09-02 16:22:02 +02:00
parent f5f6dd3246
commit 5a6e06df3b
2 changed files with 2 additions and 3 deletions

View file

@ -434,7 +434,7 @@ public sealed unsafe class ShaderReplacementFixer : IDisposable, IRequiredServic
private static MaterialResourceHandle* GetMaterialResourceHandle(ModelRendererStructs.UnkPayload* unkPayload) private static MaterialResourceHandle* GetMaterialResourceHandle(ModelRendererStructs.UnkPayload* unkPayload)
{ {
// TODO ClientStructs-ify // TODO ClientStructs-ify
var unkPointer = unkPayload->ModelResourceHandle.*(nint*)((nint)unkPayload->ModelResourceHandle + 0xE8) + unkPayload->UnkIndex * 0x24; var unkPointer = *(nint*)((nint)unkPayload->ModelResourceHandle + 0xE8) + unkPayload->UnkIndex * 0x24;
var materialIndex = *(ushort*)(unkPointer + 8); var materialIndex = *(ushort*)(unkPointer + 8);
var material = unkPayload->Params->Model->Materials[materialIndex]; var material = unkPayload->Params->Model->Materials[materialIndex];
if (material == null) if (material == null)

View file

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