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

Test not redrawing while the fishing rod is out.

Browse source
This commit is contained in:
Ottermandias 2023-12-01 13:49:29 +01:00
parent e497414cb7
commit 07e20fb670
2 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra/EphemeralConfig.cs
View file

@ -3,7 +3,6 @@ using Newtonsoft.Json;
using OtterGui.Classes; using OtterGui.Classes;
using Penumbra.Api.Enums; using Penumbra.Api.Enums;
using Penumbra.Enums; using Penumbra.Enums;
using Penumbra.Interop.Services;
using Penumbra.Services; using Penumbra.Services;
using Penumbra.UI; using Penumbra.UI;
using Penumbra.UI.ResourceWatcher; using Penumbra.UI.ResourceWatcher;

44
Penumbra/Interop/Services/RedrawService.cs
View file

@ -11,6 +11,7 @@ using Penumbra.Api.Enums;
using Penumbra.GameData; using Penumbra.GameData;
using Penumbra.GameData.Actors; using Penumbra.GameData.Actors;
using Penumbra.Interop.Structs; using Penumbra.Interop.Structs;
using Character = FFXIVClientStructs.FFXIV.Client.Game.Character.Character;
namespace Penumbra.Interop.Services; namespace Penumbra.Interop.Services;
@ -248,8 +249,15 @@ public sealed unsafe partial class RedrawService : IDisposable
{ {
if (idx < 0) if (idx < 0)
{ {
WriteInvisible(obj); if (DelayRedraw(obj))
_queue[numKept++] = ObjectTableIndex(obj); {
_queue[numKept++] = ~ObjectTableIndex(obj);
}
else
{
WriteInvisible(obj);
_queue[numKept++] = ObjectTableIndex(obj);
}
} }
else else
{ {
@ -261,6 +269,30 @@ public sealed unsafe partial class RedrawService : IDisposable
_queue.RemoveRange(numKept, _queue.Count - numKept); _queue.RemoveRange(numKept, _queue.Count - numKept);
} }
private static uint GetCurrentAnimationId(GameObject obj)
{
var gameObj = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)obj.Address;
if (gameObj == null || !gameObj->IsCharacter())
return 0;
var chara = (Character*)gameObj;
var ptr = (byte*)&chara->ActionTimelineManager + 0xF0;
return *(uint*)ptr;
}
private static bool DelayRedraw(GameObject obj)
=> ((Character*)obj.Address)->Mode switch
{
(Character.CharacterModes)6 => // fishing
GetCurrentAnimationId(obj) switch
{
278 => true, // line out.
283 => true, // reeling in
_ => false,
},
_ => false,
};
private void HandleAfterGPose() private void HandleAfterGPose()
{ {
if (_afterGPoseQueue.Count == 0 || InGPose) if (_afterGPoseQueue.Count == 0 || InGPose)
@ -369,10 +401,11 @@ public sealed unsafe partial class RedrawService : IDisposable
private void DisableFurniture() private void DisableFurniture()
{ {
var housingManager = HousingManager.Instance(); var housingManager = HousingManager.Instance();
if (housingManager == null) if (housingManager == null)
return; return;
var currentTerritory = housingManager->CurrentTerritory; var currentTerritory = housingManager->CurrentTerritory;
if (currentTerritory == null) if (currentTerritory == null)
return; return;
if (!housingManager->IsInside()) if (!housingManager->IsInside())
return; return;
@ -380,8 +413,9 @@ public sealed unsafe partial class RedrawService : IDisposable
foreach (var f in currentTerritory->FurnitureSpan.PointerEnumerator()) foreach (var f in currentTerritory->FurnitureSpan.PointerEnumerator())
{ {
var gameObject = f->Index >= 0 ? currentTerritory->HousingObjectManager.ObjectsSpan[f->Index].Value : null; var gameObject = f->Index >= 0 ? currentTerritory->HousingObjectManager.ObjectsSpan[f->Index].Value : null;
if (gameObject == null) if (gameObject == null)
continue; continue;
gameObject->DisableDraw(); gameObject->DisableDraw();
} }
} }