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

Add accessory vfxs

Browse source
This commit is contained in:
ocealot 2024-04-11 15:00:54 -04:00 • committed by Ottermandias
parent c0ee80629d
commit 45b1c55b67
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
using Dalamud.Hooking; using Dalamud.Hooking;
using Dalamud.Memory;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Classes; using OtterGui.Classes;
using OtterGui.Services; using OtterGui.Services;
@ -57,6 +58,7 @@ public sealed unsafe class ResolvePathHooksBase : IDisposable
_resolveSkpPathHook = Create<PerSlotResolveDelegate>($"{name}.{nameof(ResolveSkp)}", hooks, vTable[74], type, ResolveSkp, ResolveSkpHuman); _resolveSkpPathHook = Create<PerSlotResolveDelegate>($"{name}.{nameof(ResolveSkp)}", hooks, vTable[74], type, ResolveSkp, ResolveSkpHuman);
_resolveTmbPathHook = Create<TmbResolveDelegate>( $"{name}.{nameof(ResolveTmb)}", hooks, vTable[77], ResolveTmb); _resolveTmbPathHook = Create<TmbResolveDelegate>( $"{name}.{nameof(ResolveTmb)}", hooks, vTable[77], ResolveTmb);
_resolveVfxPathHook = Create<VfxResolveDelegate>( $"{name}.{nameof(ResolveVfx)}", hooks, vTable[84], ResolveVfx); _resolveVfxPathHook = Create<VfxResolveDelegate>( $"{name}.{nameof(ResolveVfx)}", hooks, vTable[84], ResolveVfx);
_resolveVfxPathHook = Create<VfxResolveDelegate>( $"{name}.{nameof(ResolveVfx)}", hooks, vTable[84], type, ResolveVfx, ResolveVfxHuman);
// @formatter:on // @formatter:on
Enable(); Enable();
} }
@ -179,6 +181,27 @@ public sealed unsafe class ResolvePathHooksBase : IDisposable
return ResolvePath(data, _resolveSkpPathHook.Original(drawObject, pathBuffer, pathBufferSize, partialSkeletonIndex)); return ResolvePath(data, _resolveSkpPathHook.Original(drawObject, pathBuffer, pathBufferSize, partialSkeletonIndex));
} }
private nint ResolveVfxHuman(nint drawObject, nint pathBuffer, nint pathBufferSize, uint slotIndex, nint unkOutParam)
{
if (slotIndex <= 4) return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
// Enable vfxs for accessories
var data = Marshal.ReadIntPtr(drawObject + 0xA38);
if (data == IntPtr.Zero) return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
var slot = data + 12 * (nint)slotIndex;
var model = Marshal.ReadInt16(slot);
var variant = Marshal.ReadInt16(slot + 2);
var vfxId = Marshal.ReadInt16(slot + 8);
if (model == 0 || variant == 0 || vfxId == 0) return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
var path = "chara/accessory/a" + model.ToString().PadLeft(4, '0') + "/vfx/eff/va" + vfxId.ToString().PadLeft(4, '0') + ".avfx";
MemoryHelper.WriteString(pathBuffer, path);
Marshal.WriteIntPtr(unkOutParam, 0x00000004);
return ResolvePath(drawObject, pathBuffer);
}
private DisposableContainer GetEstChanges(nint drawObject, out ResolveData data) private DisposableContainer GetEstChanges(nint drawObject, out ResolveData data)
{ {
data = _parent.CollectionResolver.IdentifyCollection((DrawObject*)drawObject, true); data = _parent.CollectionResolver.IdentifyCollection((DrawObject*)drawObject, true);