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

Add Weapon Reload resolving.

Browse source
This commit is contained in:
Ottermandias 2022-06-06 20:35:29 +02:00
parent 10c4dbc1f8
commit d2b969d996
2 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Penumbra/Interop/Resolver/PathResolver.Data.cs
View file

@ -62,16 +62,34 @@ public unsafe partial class PathResolver
private void EnableDrawDetour( IntPtr gameObject, IntPtr b, IntPtr c, IntPtr d ) private void EnableDrawDetour( IntPtr gameObject, IntPtr b, IntPtr c, IntPtr d )
{ {
var oldObject = LastGameObject;
LastGameObject = ( GameObject* )gameObject; LastGameObject = ( GameObject* )gameObject;
EnableDrawHook!.Original.Invoke( gameObject, b, c, d ); EnableDrawHook!.Original.Invoke( gameObject, b, c, d );
LastGameObject = null; LastGameObject = oldObject;
} }
// Not fully understood. The game object the weapon is loaded for is seemingly found at a1 + 8,
// so we use that.
public delegate void WeaponReloadFunc( IntPtr a1, uint a2, IntPtr a3, byte a4, byte a5, byte a6, byte a7 );
[Signature( "E8 ?? ?? ?? ?? 44 8B 9F" )]
public Hook< WeaponReloadFunc >? WeaponReloadHook;
public void WeaponReloadDetour( IntPtr a1, uint a2, IntPtr a3, byte a4, byte a5, byte a6, byte a7 )
{
var oldGame = LastGameObject;
LastGameObject = *( GameObject** )( a1 + 8 );
WeaponReloadHook!.Original( a1, a2, a3, a4, a5, a6, a7 );
LastGameObject = oldGame;
}
private void EnableDataHooks() private void EnableDataHooks()
{ {
CharacterBaseCreateHook?.Enable(); CharacterBaseCreateHook?.Enable();
EnableDrawHook?.Enable(); EnableDrawHook?.Enable();
CharacterBaseDestructorHook?.Enable(); CharacterBaseDestructorHook?.Enable();
WeaponReloadHook?.Enable();
Penumbra.CollectionManager.CollectionChanged += CheckCollections; Penumbra.CollectionManager.CollectionChanged += CheckCollections;
//CharacterBaseLoadAnimationHook?.Enable(); //CharacterBaseLoadAnimationHook?.Enable();
//RandomPapHook?.Enable(); //RandomPapHook?.Enable();
@ -80,6 +98,7 @@ public unsafe partial class PathResolver
private void DisableDataHooks() private void DisableDataHooks()
{ {
Penumbra.CollectionManager.CollectionChanged -= CheckCollections; Penumbra.CollectionManager.CollectionChanged -= CheckCollections;
WeaponReloadHook?.Disable();
CharacterBaseCreateHook?.Disable(); CharacterBaseCreateHook?.Disable();
EnableDrawHook?.Disable(); EnableDrawHook?.Disable();
CharacterBaseDestructorHook?.Disable(); CharacterBaseDestructorHook?.Disable();
@ -89,7 +108,7 @@ public unsafe partial class PathResolver
private void DisposeDataHooks() private void DisposeDataHooks()
{ {
WeaponReloadHook?.Dispose();
CharacterBaseCreateHook?.Dispose(); CharacterBaseCreateHook?.Dispose();
EnableDrawHook?.Dispose(); EnableDrawHook?.Dispose();
CharacterBaseDestructorHook?.Dispose(); CharacterBaseDestructorHook?.Dispose();

24
Penumbra/Interop/Resolver/PathResolver.Resolve.cs
View file

@ -12,6 +12,7 @@ public unsafe partial class PathResolver
// Humans // Humans
private IntPtr ResolveDecalDetour( IntPtr drawObject, IntPtr path, IntPtr unk3, uint unk4 ) private IntPtr ResolveDecalDetour( IntPtr drawObject, IntPtr path, IntPtr unk3, uint unk4 )
=> ResolvePathDetour( drawObject, ResolveDecalPathHook!.Original( drawObject, path, unk3, unk4 ) ); => ResolvePathDetour( drawObject, ResolveDecalPathHook!.Original( drawObject, path, unk3, unk4 ) );
private IntPtr ResolveEidDetour( IntPtr drawObject, IntPtr path, IntPtr unk3 ) private IntPtr ResolveEidDetour( IntPtr drawObject, IntPtr path, IntPtr unk3 )
=> ResolvePathDetour( drawObject, ResolveEidPathHook!.Original( drawObject, path, unk3 ) ); => ResolvePathDetour( drawObject, ResolveEidPathHook!.Original( drawObject, path, unk3 ) );
@ -149,19 +150,24 @@ public unsafe partial class PathResolver
[MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )]
private IntPtr ResolveWeaponPathDetour( IntPtr drawObject, IntPtr path ) private IntPtr ResolveWeaponPathDetour( IntPtr drawObject, IntPtr path )
{ {
var parent = FindParent( drawObject, out var collection );
if( parent != null )
{
return ResolvePathDetour( collection, path );
}
var parentObject = ( ( DrawObject* )drawObject )->Object.ParentObject; var parentObject = ( ( DrawObject* )drawObject )->Object.ParentObject;
if( parentObject == null && LastGameObject != null ) if( parentObject == null && LastGameObject != null )
{ {
var collection = IdentifyCollection( LastGameObject ); var c2 = IdentifyCollection( LastGameObject );
return ResolvePathDetour( collection, path ); DrawObjectToObject[ drawObject ] = ( c2, LastGameObject->ObjectIndex );
} return ResolvePathDetour( c2, path );
else
{
var parent = FindParent( ( IntPtr )parentObject, out var collection );
return ResolvePathDetour( parent == null
? Penumbra.CollectionManager.Default
: collection, path );
} }
parent = FindParent( ( IntPtr )parentObject, out collection );
return ResolvePathDetour( parent == null
? Penumbra.CollectionManager.Default
: collection, path );
} }
// Just add or remove the resolved path. // Just add or remove the resolved path.