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

Update ocealots code #1.

Browse source
This commit is contained in:
Ottermandias 2024-04-11 21:25:00 +02:00
parent 45b1c55b67
commit eb0e7e2f5f
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
using System.Text.Unicode;
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,7 +57,6 @@ public sealed unsafe class ResolvePathHooksBase : IDisposable
_resolveSklbPathHook = Create<PerSlotResolveDelegate>($"{name}.{nameof(ResolveSklb)}", hooks, vTable[72], type, ResolveSklb, ResolveSklbHuman); _resolveSklbPathHook = Create<PerSlotResolveDelegate>($"{name}.{nameof(ResolveSklb)}", hooks, vTable[72], type, ResolveSklb, ResolveSklbHuman);
_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], type, ResolveVfx, ResolveVfxHuman); _resolveVfxPathHook = Create<VfxResolveDelegate>( $"{name}.{nameof(ResolveVfx)}", hooks, vTable[84], type, ResolveVfx, ResolveVfxHuman);
// @formatter:on // @formatter:on
Enable(); Enable();
@ -183,22 +182,27 @@ public sealed unsafe class ResolvePathHooksBase : IDisposable
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 <= 4) return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); if (slotIndex <= 4)
return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
var changedEquipData = ((Human*)drawObject)->ChangedEquipData;
// Enable vfxs for accessories // Enable vfxs for accessories
var data = Marshal.ReadIntPtr(drawObject + 0xA38); if (changedEquipData == null)
if (data == IntPtr.Zero) return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
var slot = data + 12 * (nint)slotIndex; var slot = (ushort*)(changedEquipData + 12 * (nint)slotIndex);
var model = Marshal.ReadInt16(slot); var model = slot[0];
var variant = Marshal.ReadInt16(slot + 2); var variant = slot[1];
var vfxId = Marshal.ReadInt16(slot + 8); var vfxId = slot[4];
if (model == 0 || variant == 0 || vfxId == 0) return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam); if (model == 0 || variant == 0 || vfxId == 0)
var path = "chara/accessory/a" + model.ToString().PadLeft(4, '0') + "/vfx/eff/va" + vfxId.ToString().PadLeft(4, '0') + ".avfx"; return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
MemoryHelper.WriteString(pathBuffer, path); if (!Utf8.TryWrite(new Span<byte>((void*)pathBuffer, (int)pathBufferSize), $"chara/accessory/a{model:D4}/vfx/eff/va{vfxId:D4}.avfx",
Marshal.WriteIntPtr(unkOutParam, 0x00000004); out _))
return ResolveVfx(drawObject, pathBuffer, pathBufferSize, slotIndex, unkOutParam);
*(ulong*)unkOutParam = 4;
return ResolvePath(drawObject, pathBuffer); return ResolvePath(drawObject, pathBuffer);
} }