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

Fix association of vfx game objects for ID-less objects.

Browse source
This commit is contained in:
Ottermandias 2023-01-03 17:35:34 +01:00
parent 8df4bb0781
commit 2dda954806
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.String

@ -1 +1 @@
Subproject commit 944e712d404c22ef4ce945ff35cf08af3f67ca12 Subproject commit e8fad7976e3a156a9d3f0c7f9b2a03267bd3c772

37
Penumbra/Interop/Resolver/PathResolver.AnimationState.cs
View file

@ -217,11 +217,14 @@ public unsafe partial class PathResolver
[FieldOffset( 0x118 )] [FieldOffset( 0x118 )]
public uint GameObjectId; public uint GameObjectId;
[FieldOffset( 0x11C )]
public byte GameObjectType;
[FieldOffset( 0xD0 )] [FieldOffset( 0xD0 )]
public ushort TargetCount; public ushort TargetCount;
[FieldOffset( 0x120 )] [FieldOffset( 0x120 )]
public fixed uint Target[16]; public fixed ulong Target[16];
} }
private delegate IntPtr LoadCharacterVfxDelegate( byte* vfxPath, VfxParams* vfxParams, byte unk1, byte unk2, float unk3, int unk4 ); private delegate IntPtr LoadCharacterVfxDelegate( byte* vfxPath, VfxParams* vfxParams, byte unk1, byte unk2, float unk3, int unk4 );
@ -229,20 +232,33 @@ public unsafe partial class PathResolver
[Signature( "E8 ?? ?? ?? ?? 48 8B F8 48 8D 93", DetourName = nameof( LoadCharacterVfxDetour ) )] [Signature( "E8 ?? ?? ?? ?? 48 8B F8 48 8D 93", DetourName = nameof( LoadCharacterVfxDetour ) )]
private readonly Hook< LoadCharacterVfxDelegate > _loadCharacterVfxHook = null!; private readonly Hook< LoadCharacterVfxDelegate > _loadCharacterVfxHook = null!;
private global::Dalamud.Game.ClientState.Objects.Types.GameObject? GetOwnedObject( uint id )
{
var owner = Dalamud.Objects.SearchById( id );
if( owner == null )
{
return null;
}
var idx = ( ( GameObject* )owner.Address )->ObjectIndex;
return Dalamud.Objects[ idx + 1 ];
}
private IntPtr LoadCharacterVfxDetour( byte* vfxPath, VfxParams* vfxParams, byte unk1, byte unk2, float unk3, int unk4 ) private IntPtr LoadCharacterVfxDetour( byte* vfxPath, VfxParams* vfxParams, byte unk1, byte unk2, float unk3, int unk4 )
{ {
var last = _animationLoadData; var last = _animationLoadData;
if( vfxParams != null && vfxParams->GameObjectId != unchecked( ( uint )-1 ) ) if( vfxParams != null && vfxParams->GameObjectId != unchecked( ( uint )-1 ) )
{ {
var obj = Dalamud.Objects.SearchById( vfxParams->GameObjectId ); var obj = vfxParams->GameObjectType switch
if( obj != null )
{ {
_animationLoadData = IdentifyCollection( ( GameObject* )obj.Address, true ); 0 => Dalamud.Objects.SearchById( vfxParams->GameObjectId ),
} 2 => Dalamud.Objects[ ( int )vfxParams->GameObjectId ],
else 4 => GetOwnedObject( vfxParams->GameObjectId ),
{ _ => null,
_animationLoadData = ResolveData.Invalid; };
} _animationLoadData = obj != null
? IdentifyCollection( ( GameObject* )obj.Address, true )
: ResolveData.Invalid;
} }
else else
{ {
@ -251,8 +267,9 @@ public unsafe partial class PathResolver
var ret = _loadCharacterVfxHook.Original( vfxPath, vfxParams, unk1, unk2, unk3, unk4 ); var ret = _loadCharacterVfxHook.Original( vfxPath, vfxParams, unk1, unk2, unk3, unk4 );
#if DEBUG #if DEBUG
var path = new ByteString( vfxPath );
Penumbra.Log.Verbose( Penumbra.Log.Verbose(
$"Load Character VFX: {new ByteString( vfxPath )} {vfxParams->GameObjectId:X} {vfxParams->TargetCount} {unk1} {unk2} {unk3} {unk4} -> {ret:X} {_animationLoadData.ModCollection.Name} {_animationLoadData.AssociatedGameObject} {last.ModCollection.Name} {last.AssociatedGameObject}" ); $"Load Character VFX: {path} {vfxParams->GameObjectId:X} {vfxParams->TargetCount} {unk1} {unk2} {unk3} {unk4} -> {ret:X} {_animationLoadData.ModCollection.Name} {_animationLoadData.AssociatedGameObject} {last.ModCollection.Name} {last.AssociatedGameObject}" );
#endif #endif
_animationLoadData = last; _animationLoadData = last;
return ret; return ret;