ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-19 14:27:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Do not check every identifier.

Browse source
This commit is contained in:
Ottermandias 2022-11-18 15:53:40 +01:00
parent 03bbba6735
commit f676bd1889
5 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Collections/IndividualCollections.Access.cs
View file

@ -76,10 +76,10 @@ public sealed partial class IndividualCollections : IReadOnlyList< (string Displ
}
public bool TryGetCollection( GameObject? gameObject, out ModCollection? collection )
=> TryGetCollection( _actorManager.FromObject( gameObject ), out collection );
=> TryGetCollection( _actorManager.FromObject( gameObject, false ), out collection );
public unsafe bool TryGetCollection( FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* gameObject, out ModCollection? collection )
=> TryGetCollection( _actorManager.FromObject( gameObject ), out collection );
=> TryGetCollection( _actorManager.FromObject( gameObject, false ), out collection );
private bool CheckWorlds( ActorIdentifier identifier, out ModCollection? collection )
{

1
Penumbra/Interop/Resolver/PathResolver.DrawObjectState.cs
View file

@ -8,7 +8,6 @@ using FFXIVClientStructs.FFXIV.Client.Game.Object;
using Penumbra.Api;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Classes;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
using Penumbra.String.Classes;

2
Penumbra/Interop/Resolver/PathResolver.Identification.cs
View file

@ -38,7 +38,7 @@ public unsafe partial class PathResolver
}
else
{
var identifier = Penumbra.Actors.FromObject( gameObject );
var identifier = Penumbra.Actors.FromObject( gameObject, false );
var collection = CollectionByIdentifier( identifier )
?? CheckYourself( identifier, gameObject )
?? CollectionByAttributes( gameObject )

2
Penumbra/UI/ConfigWindow.DebugTab.cs
View file

@ -190,7 +190,7 @@ public partial class ConfigWindow
{
ImGuiUtil.DrawTableColumn( $"{( ( GameObject* )obj.Address )->ObjectIndex}" );
ImGuiUtil.DrawTableColumn( $"0x{obj.Address:X}" );
var identifier = Penumbra.Actors.FromObject( obj );
var identifier = Penumbra.Actors.FromObject( obj, true );
ImGuiUtil.DrawTableColumn( Penumbra.Actors.ToString( identifier ) );
ImGuiUtil.DrawTableColumn( identifier.DataId.ToString() );
}