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

Fix accessory VFX change not working.

Browse source
This commit is contained in:
Ottermandias 2024-10-06 14:51:52 +02:00
parent df0526e6e5
commit 740816f3a6
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Penumbra/Interop/Hooks/Resources/ResolvePathHooksBase.cs
View file

@ -3,6 +3,8 @@ using Dalamud.Hooking;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Services; using OtterGui.Services;
using Penumbra.Collections; using Penumbra.Collections;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.Interop.PathResolving; using Penumbra.Interop.PathResolving;
namespace Penumbra.Interop.Hooks.Resources; namespace Penumbra.Interop.Hooks.Resources;
@ -212,25 +214,39 @@ public sealed unsafe class ResolvePathHooksBase : IDisposable
return ret; return ret;
} }
[StructLayout(LayoutKind.Explicit)]
private struct ChangedEquipData
{
[FieldOffset(0)]
public PrimaryId Model;
[FieldOffset(2)]
public Variant Variant;
[FieldOffset(20)]
public ushort VfxId;
[FieldOffset(22)]
public GenderRace GenderRace;
}
private nint ResolveVfxHuman(nint drawObject, nint pathBuffer, nint pathBufferSize, uint slotIndex, nint unkOutParam) private nint ResolveVfxHuman(nint drawObject, nint pathBuffer, nint pathBufferSize, uint slotIndex, nint unkOutParam)
{ {
if (slotIndex is <= 4 or >= 10) if (slotIndex is <= 4 or >= 10)
return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
var changedEquipData = ((Human*)drawObject)->ChangedEquipData; var changedEquipData = (ChangedEquipData*)((Human*)drawObject)->ChangedEquipData;
// Enable vfxs for accessories // Enable vfxs for accessories
if (changedEquipData == null) if (changedEquipData == null)
return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
var slot = (ushort*)(changedEquipData + 12 * (nint)slotIndex); ref var slot = ref changedEquipData[slotIndex];
var model = slot[0];
var variant = slot[1];
var vfxId = slot[4];
if (model == 0 || variant == 0 || vfxId == 0) if (slot.Model == 0 || slot.Variant == 0 || slot.VfxId == 0)
return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
if (!Utf8.TryWrite(new Span<byte>((void*)pathBuffer, (int)pathBufferSize), $"chara/accessory/a{model:D4}/vfx/eff/va{vfxId:D4}.avfx\0", if (!Utf8.TryWrite(new Span<byte>((void*)pathBuffer, (int)pathBufferSize),
$"chara/accessory/a{slot.Model.Id:D4}/vfx/eff/va{slot.VfxId:D4}.avfx\0",
out _)) out _))
return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);