ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use UI3DModule for GameObject lookups, avoiding object table scan

Browse source
This commit is contained in:
nebel 2024-07-11 01:37:01 +09:00
parent 9a1a32c03e
commit bceca96998
No known key found for this signature in database
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Game/Gui/NamePlate/NamePlateGui.cs
View file

@ -102,7 +102,7 @@ internal sealed class NamePlateGui : IInternalDisposableService, INamePlateGui
/// <returns>A span containing the free company tag without its surrounding quote characters.</returns> /// <returns>A span containing the free company tag without its surrounding quote characters.</returns>
internal static ReadOnlySpan<byte> StripFreeCompanyTagQuotes(ReadOnlySpan<byte> text) internal static ReadOnlySpan<byte> StripFreeCompanyTagQuotes(ReadOnlySpan<byte> text)
{ {
if (text.Length > 4 && text[..3].SequenceEqual(" «"u8) && text[^2..].SequenceEqual("»"u8)) if (text.Length > 4 && text.StartsWith(" «"u8) && text.EndsWith("»"u8))
{ {
return text[3..^2]; return text[3..^2];
} }
@ -118,7 +118,7 @@ internal sealed class NamePlateGui : IInternalDisposableService, INamePlateGui
/// <returns>A span containing the title without its surrounding quote characters.</returns> /// <returns>A span containing the title without its surrounding quote characters.</returns>
internal static ReadOnlySpan<byte> StripTitleQuotes(ReadOnlySpan<byte> text) internal static ReadOnlySpan<byte> StripTitleQuotes(ReadOnlySpan<byte> text)
{ {
if (text.Length > 5 && text[..3].SequenceEqual("《"u8) && text[^3..].SequenceEqual("》"u8)) if (text.Length > 5 && text.StartsWith("《"u8) && text.EndsWith("》"u8))
{ {
return text[3..^3]; return text[3..^3];
} }

6
Dalamud/Game/Gui/NamePlate/NamePlateUpdateContext.cs
View file

@ -59,6 +59,7 @@ internal unsafe class NamePlateUpdateContext : INamePlateUpdateContext
{ {
this.ObjectTable = objectTable; this.ObjectTable = objectTable;
this.RaptureAtkModule = FFXIVClientStructs.FFXIV.Client.UI.RaptureAtkModule.Instance(); this.RaptureAtkModule = FFXIVClientStructs.FFXIV.Client.UI.RaptureAtkModule.Instance();
this.Ui3DModule = UIModule.Instance()->GetUI3DModule();
this.ResetState(args); this.ResetState(args);
} }
@ -98,6 +99,11 @@ internal unsafe class NamePlateUpdateContext : INamePlateUpdateContext
/// </summary> /// </summary>
internal RaptureAtkModule* RaptureAtkModule { get; } internal RaptureAtkModule* RaptureAtkModule { get; }
/// <summary>
/// Gets the Ui3DModule.
/// </summary>
internal UI3DModule* Ui3DModule { get; }
/// <summary> /// <summary>
/// Gets the ObjectTable. /// Gets the ObjectTable.
/// </summary> /// </summary>

4
Dalamud/Game/Gui/NamePlate/NamePlateUpdateHandler.cs
View file

@ -327,7 +327,9 @@ internal unsafe class NamePlateUpdateHandler : INamePlateUpdateHandler
public ulong GameObjectId => this.gameObjectId ??= this.NamePlateInfo->ObjectId; public ulong GameObjectId => this.gameObjectId ??= this.NamePlateInfo->ObjectId;
/// <inheritdoc/> /// <inheritdoc/>
public IGameObject? GameObject => this.gameObject ??= this.context.ObjectTable.SearchById(this.GameObjectId); public IGameObject? GameObject => this.gameObject ??= this.context.ObjectTable.CreateObjectReference(
(nint)this.context.Ui3DModule->NamePlateObjectInfoPointers[
this.ArrayIndex].Value->GameObject);
/// <inheritdoc/> /// <inheritdoc/>
public IBattleChara? BattleChara => this.GameObject as IBattleChara; public IBattleChara? BattleChara => this.GameObject as IBattleChara;