t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust waiting for loading players

Browse Source
This commit is contained in:
rootdarkarchon
2023-02-03 12:47:17 +01:00
parent 9d4d919f0d
commit 53bbda4cf4
7 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -77,8 +77,8 @@ public class CharacterDataFactory
try try
{ {
pathsToForwardResolve.Clear(); _pathsToForwardResolve.Clear();
pathsToReverseResolve.Clear(); _pathsToReverseResolve.Clear();
return CreateCharacterData(previousData, playerRelatedObject, token); return CreateCharacterData(previousData, playerRelatedObject, token);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
@@ -215,7 +215,7 @@ public class CharacterDataFactory
previousData.FileReplacements[objectKind] = new(FileReplacementComparer.Instance); previousData.FileReplacements[objectKind] = new(FileReplacementComparer.Instance);
} }
_dalamudUtil.WaitWhileCharacterIsDrawing(playerRelatedObject.ObjectKind.ToString(), playerRelatedObject.Address, ct: token); _dalamudUtil.WaitWhileCharacterIsDrawing(playerRelatedObject.ObjectKind.ToString(), playerRelatedObject.Address, 30000, ct: token);
Stopwatch st = Stopwatch.StartNew(); Stopwatch st = Stopwatch.StartNew();
@@ -233,7 +233,8 @@ public class CharacterDataFactory
Thread.Sleep(50); Thread.Sleep(50);
} }
var human = (Human*)((Character*)charaPointer)->GameObject.DrawObject; var human = (Human*)((Character*)charaPointer)->GameObject.GetDrawObject();
for (var mdlIdx = 0; mdlIdx < human->CharacterBase.SlotCount; ++mdlIdx) for (var mdlIdx = 0; mdlIdx < human->CharacterBase.SlotCount; ++mdlIdx)
{ {
var mdl = (RenderModel*)human->CharacterBase.ModelArray[mdlIdx]; var mdl = (RenderModel*)human->CharacterBase.ModelArray[mdlIdx];
@@ -281,8 +282,8 @@ public class CharacterDataFactory
Logger.Debug("Handling transient update for " + objectKind); Logger.Debug("Handling transient update for " + objectKind);
_transientResourceManager.ClearTransientPaths(charaPointer, previousData.FileReplacements[objectKind].SelectMany(c => c.GamePaths).ToList()); _transientResourceManager.ClearTransientPaths(charaPointer, previousData.FileReplacements[objectKind].SelectMany(c => c.GamePaths).ToList());
pathsToForwardResolve.Clear(); _pathsToForwardResolve.Clear();
pathsToReverseResolve.Clear(); _pathsToReverseResolve.Clear();
ManageSemiTransientData(objectKind, charaPointer); ManageSemiTransientData(objectKind, charaPointer);
@@ -305,10 +306,10 @@ public class CharacterDataFactory
private Dictionary<string, List<string>> GetFileReplacementsFromPaths() private Dictionary<string, List<string>> GetFileReplacementsFromPaths()
{ {
var forwardPaths = pathsToForwardResolve.ToArray(); var forwardPaths = _pathsToForwardResolve.ToArray();
var reversePaths = pathsToReverseResolve.ToArray(); var reversePaths = _pathsToReverseResolve.ToArray();
Dictionary<string, List<string>> resolvedPaths = new(StringComparer.Ordinal); Dictionary<string, List<string>> resolvedPaths = new(StringComparer.Ordinal);
var result = _ipcManager.PenumbraResolvePaths(pathsToForwardResolve.ToArray(), pathsToReverseResolve.ToArray()); var result = _ipcManager.PenumbraResolvePaths(_pathsToForwardResolve.ToArray(), _pathsToReverseResolve.ToArray());
for (int i = 0; i < forwardPaths.Length; i++) for (int i = 0; i < forwardPaths.Length; i++)
{ {
var filePath = result.forward[i].ToLowerInvariant(); var filePath = result.forward[i].ToLowerInvariant();
@@ -408,10 +409,10 @@ public class CharacterDataFactory
private void AddResolvePath(string path, bool doNotReverseResolve = false) private void AddResolvePath(string path, bool doNotReverseResolve = false)
{ {
if (doNotReverseResolve) pathsToForwardResolve.Add(path.ToLowerInvariant()); if (doNotReverseResolve) _pathsToForwardResolve.Add(path.ToLowerInvariant());
else pathsToReverseResolve.Add(path.ToLowerInvariant()); else _pathsToReverseResolve.Add(path.ToLowerInvariant());
} }
private HashSet<string> pathsToForwardResolve = new(StringComparer.Ordinal); private readonly HashSet<string> _pathsToForwardResolve = new(StringComparer.Ordinal);
private HashSet<string> pathsToReverseResolve = new(StringComparer.Ordinal); private readonly HashSet<string> _pathsToReverseResolve = new(StringComparer.Ordinal);
} }

24
MareSynchronos/Managers/CacheCreationService.cs
View File

@@ -4,27 +4,21 @@ using MareSynchronos.Factories;
using MareSynchronos.Mediator; using MareSynchronos.Mediator;
using MareSynchronos.Models; using MareSynchronos.Models;
using MareSynchronos.Utils; using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
namespace MareSynchronos.Managers; namespace MareSynchronos.Managers;
public class CacheCreationService : MediatorSubscriberBase, IDisposable public class CacheCreationService : MediatorSubscriberBase, IDisposable
{ {
private readonly CharacterDataFactory _characterDataFactory; private readonly CharacterDataFactory _characterDataFactory;
private readonly IpcManager _ipcManager;
private readonly ApiController _apiController;
private Task? _cacheCreationTask; private Task? _cacheCreationTask;
private Dictionary<ObjectKind, GameObjectHandler> _cachesToCreate = new(); private readonly Dictionary<ObjectKind, GameObjectHandler> _cachesToCreate = new();
private CharacterData _lastCreatedData = new(); private readonly CharacterData _lastCreatedData = new();
private CancellationTokenSource cts = new(); private readonly CancellationTokenSource _cts = new();
private List<GameObjectHandler> _playerRelatedObjects = new(); private readonly List<GameObjectHandler> _playerRelatedObjects = new();
public unsafe CacheCreationService(MareMediator mediator, CharacterDataFactory characterDataFactory, IpcManager ipcManager, public unsafe CacheCreationService(MareMediator mediator, CharacterDataFactory characterDataFactory, DalamudUtil dalamudUtil) : base(mediator)
ApiController apiController, DalamudUtil dalamudUtil) : base(mediator)
{ {
_characterDataFactory = characterDataFactory; _characterDataFactory = characterDataFactory;
_ipcManager = ipcManager;
_apiController = apiController;
Mediator.Subscribe<CreateCacheForObjectMessage>(this, (msg) => Mediator.Subscribe<CreateCacheForObjectMessage>(this, (msg) =>
{ {
@@ -35,7 +29,7 @@ public class CacheCreationService : MediatorSubscriberBase, IDisposable
Mediator.Subscribe<CustomizePlusMessage>(this, (msg) => CustomizePlusChanged((CustomizePlusMessage)msg)); Mediator.Subscribe<CustomizePlusMessage>(this, (msg) => CustomizePlusChanged((CustomizePlusMessage)msg));
Mediator.Subscribe<HeelsOffsetMessage>(this, (msg) => HeelsOffsetChanged((HeelsOffsetMessage)msg)); Mediator.Subscribe<HeelsOffsetMessage>(this, (msg) => HeelsOffsetChanged((HeelsOffsetMessage)msg));
Mediator.Subscribe<PalettePlusMessage>(this, (msg) => PalettePlusChanged((PalettePlusMessage)msg)); Mediator.Subscribe<PalettePlusMessage>(this, (msg) => PalettePlusChanged((PalettePlusMessage)msg));
Mediator.Subscribe<PenumbraModSettingChangedMessage>(this, (msg) => _cachesToCreate.Add(ObjectKind.Player, _playerRelatedObjects.First(p => p.ObjectKind == ObjectKind.Player))); Mediator.Subscribe<PenumbraModSettingChangedMessage>(this, (msg) => _cachesToCreate[ObjectKind.Player] = _playerRelatedObjects.First(p => p.ObjectKind == ObjectKind.Player));
_playerRelatedObjects.AddRange(new List<GameObjectHandler>() _playerRelatedObjects.AddRange(new List<GameObjectHandler>()
{ {
@@ -85,7 +79,7 @@ public class CacheCreationService : MediatorSubscriberBase, IDisposable
{ {
foreach (var obj in toCreate) foreach (var obj in toCreate)
{ {
var data = _characterDataFactory.BuildCharacterData(_lastCreatedData, obj.Value, cts.Token); var data = _characterDataFactory.BuildCharacterData(_lastCreatedData, obj.Value, _cts.Token);
} }
Mediator.Publish(new CharacterDataCreatedMessage(_lastCreatedData)); Mediator.Publish(new CharacterDataCreatedMessage(_lastCreatedData));
} }
@@ -98,7 +92,7 @@ public class CacheCreationService : MediatorSubscriberBase, IDisposable
Logger.Debug("Cache Creation complete"); Logger.Debug("Cache Creation complete");
} }
}, cts.Token); }, _cts.Token);
} }
else if (_cachesToCreate.Any()) else if (_cachesToCreate.Any())
{ {
@@ -112,6 +106,6 @@ public class CacheCreationService : MediatorSubscriberBase, IDisposable
{ {
base.Dispose(); base.Dispose();
_playerRelatedObjects.ForEach(p => p.Dispose()); _playerRelatedObjects.ForEach(p => p.Dispose());
cts.Dispose(); _cts.Dispose();
} }
} }

8
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -288,7 +288,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
switch (objectKind) switch (objectKind)
{ {
case ObjectKind.Player: case ObjectKind.Player:
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName!, PlayerCharacter, 10000, ct); _dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName!, PlayerCharacter, 30000, ct);
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
_ipcManager.HeelsSetOffsetForPlayer(_cachedData.HeelsOffset, PlayerCharacter); _ipcManager.HeelsSetOffsetForPlayer(_cachedData.HeelsOffset, PlayerCharacter);
_ipcManager.CustomizePlusSetBodyScale(PlayerCharacter, _cachedData.CustomizePlusData); _ipcManager.CustomizePlusSetBodyScale(PlayerCharacter, _cachedData.CustomizePlusData);
@@ -312,7 +312,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
if (minionOrMount != null) if (minionOrMount != null)
{ {
Logger.Debug($"Request Redraw for Minion/Mount"); Logger.Debug($"Request Redraw for Minion/Mount");
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName! + " minion or mount", (IntPtr)minionOrMount, 10000, ct); _dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName! + " minion or mount", (IntPtr)minionOrMount, 30000, ct);
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
if (_ipcManager.CheckGlamourerApi() && !string.IsNullOrEmpty(glamourerData)) if (_ipcManager.CheckGlamourerApi() && !string.IsNullOrEmpty(glamourerData))
{ {
@@ -364,7 +364,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
if (companion != IntPtr.Zero) if (companion != IntPtr.Zero)
{ {
Logger.Debug("Request Redraw for Companion"); Logger.Debug("Request Redraw for Companion");
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName! + " companion", companion, 10000, ct); _dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName! + " companion", companion, 30000, ct);
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
if (_ipcManager.CheckGlamourerApi() && !string.IsNullOrEmpty(glamourerData)) if (_ipcManager.CheckGlamourerApi() && !string.IsNullOrEmpty(glamourerData))
{ {
@@ -456,7 +456,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
PlayerCharacter = msg.Address; PlayerCharacter = msg.Address;
var cts = new CancellationTokenSource(); var cts = new CancellationTokenSource();
cts.CancelAfter(TimeSpan.FromSeconds(10)); cts.CancelAfter(TimeSpan.FromSeconds(10));
_dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName!, PlayerCharacter, 10000, cts.Token); _dalamudUtil.WaitWhileCharacterIsDrawing(PlayerName!, PlayerCharacter, 30000, cts.Token);
cts.Dispose(); cts.Dispose();
cts = new CancellationTokenSource(); cts = new CancellationTokenSource();
cts.CancelAfter(TimeSpan.FromSeconds(5)); cts.CancelAfter(TimeSpan.FromSeconds(5));

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.7.15</Version> <Version>0.7.16</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

11
MareSynchronos/Models/GameObjectHandler.cs
View File

@@ -10,7 +10,7 @@ namespace MareSynchronos.Models;
public class GameObjectHandler : MediatorSubscriberBase public class GameObjectHandler : MediatorSubscriberBase
{ {
private readonly MareMediator _mediator; private readonly MareMediator _mediator;
private readonly Func<IntPtr> getAddress; private readonly Func<IntPtr> _getAddress;
private readonly bool _sendUpdates; private readonly bool _sendUpdates;
public unsafe Character* Character => (Character*)Address; public unsafe Character* Character => (Character*)Address;
@@ -27,7 +27,7 @@ public class GameObjectHandler : MediatorSubscriberBase
{ {
try try
{ {
return getAddress.Invoke(); return _getAddress.Invoke();
} }
catch catch
{ return IntPtr.Zero; } { return IntPtr.Zero; }
@@ -38,7 +38,7 @@ public class GameObjectHandler : MediatorSubscriberBase
{ {
_mediator = mediator; _mediator = mediator;
ObjectKind = objectKind; ObjectKind = objectKind;
this.getAddress = getAddress; this._getAddress = getAddress;
_sendUpdates = sendUpdates; _sendUpdates = sendUpdates;
_name = string.Empty; _name = string.Empty;
@@ -76,8 +76,11 @@ public class GameObjectHandler : MediatorSubscriberBase
Address = curPtr; Address = curPtr;
DrawObjectAddress = (IntPtr)chara->GameObject.DrawObject; DrawObjectAddress = (IntPtr)chara->GameObject.DrawObject;
if (_sendUpdates && !_doNotSendUpdate) if (_sendUpdates && !_doNotSendUpdate && DrawObjectAddress != IntPtr.Zero)
{
Logger.Debug("Sending CreateCacheObjectMessage for " + ObjectKind);
Mediator.Publish(new CreateCacheForObjectMessage(this)); Mediator.Publish(new CreateCacheForObjectMessage(this));
}
return true; return true;
} }

15
MareSynchronos/UI/CompactUI.cs
View File

@@ -61,20 +61,9 @@ public class CompactUi : WindowMediatorSubscriberBase, IDisposable
{ {
#if DEBUG #if DEBUG
string dateTime = "DEV VERSION"; string dev = "Dev Build";
var ver = Assembly.GetExecutingAssembly().GetName().Version; var ver = Assembly.GetExecutingAssembly().GetName().Version;
this.WindowName = "Mare Synchronos " + ver.Major + "." + ver.Minor + "." + ver.Build + "###MareSynchronosMainUI"; this.WindowName = $"Mare Synchronos {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###MareSynchronosMainUI";
try
{
dateTime = VariousExtensions.GetLinkerTime(Assembly.GetCallingAssembly()).ToString("yyyyMMddHHmmss");
}
catch (Exception ex)
{
Logger.Warn("Could not get assembly name");
Logger.Warn(ex.Message);
Logger.Warn(ex.StackTrace);
}
this.WindowName = $"Mare Synchronos {dateTime} ({ver.Major}.{ver.Minor}.{ver.Build})###MareSynchronosMainUI";
Toggle(); Toggle();
#else #else
var ver = Assembly.GetExecutingAssembly().GetName().Version; var ver = Assembly.GetExecutingAssembly().GetName().Version;

15
MareSynchronos/Utils/DalamudUtil.cs
View File

@@ -5,7 +5,7 @@ using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.SubKinds;
using FFXIVClientStructs.FFXIV.Client.Game.Character; using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Game.Control; using FFXIVClientStructs.FFXIV.Client.Game.Control;
using Lumina.Excel.GeneratedSheets; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using MareSynchronos.Mediator; using MareSynchronos.Mediator;
using GameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject; using GameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject;
@@ -53,7 +53,7 @@ public class DalamudUtil : IDisposable
} }
WorldData = new(() => WorldData = new(() =>
{ {
return gameData.GetExcelSheet<World>(Dalamud.ClientLanguage.English)! return gameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.World>(Dalamud.ClientLanguage.English)!
.Where(w => w.IsPublic && !w.Name.RawData.IsEmpty) .Where(w => w.IsPublic && !w.Name.RawData.IsEmpty)
.ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString()); .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
}); });
@@ -232,16 +232,19 @@ public class DalamudUtil : IDisposable
const int tick = 250; const int tick = 250;
int curWaitTime = 0; int curWaitTime = 0;
// ReSharper disable once LoopVariableIsNeverChangedInsideLoop // ReSharper disable once LoopVariableIsNeverChangedInsideLoop
while ((obj->DrawObject == null || (obj->RenderFlags & 0b100000000000) == 0b100000000000) && (!ct?.IsCancellationRequested ?? true) && curWaitTime < timeOut) // 0b100000000000 is "still rendering" or something while ((((obj->GetDrawObject() == null
|| ((CharacterBase*)obj->GetDrawObject())->HasModelFilesInSlotLoaded != 0
|| ((CharacterBase*)obj->GetDrawObject())->HasModelFilesInSlotLoaded != 0))
|| ((obj->RenderFlags & 0b100000000000) == 0b100000000000))
&& (!ct?.IsCancellationRequested ?? true)
&& curWaitTime < timeOut) // 0b100000000000 is "still rendering" or something
{ {
Logger.Verbose($"Waiting for {name} to finish drawing"); Logger.Verbose($"Waiting for {name} to finish drawing");
curWaitTime += tick; curWaitTime += tick;
Thread.Sleep(tick); Thread.Sleep(tick);
} }
if (ct?.IsCancellationRequested ?? false) return; return;
// wait quarter a second just in case
Thread.Sleep(tick);
} }
public unsafe void DisableDraw(IntPtr characterAddress) public unsafe void DisableDraw(IntPtr characterAddress)