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

remove DrawHooks, use new penumbra IPC calls (otter pls)

Browse Source
This commit is contained in:
Stanley Dimant
2022-06-17 01:08:36 +02:00
parent f643b413f2
commit 176eb2a344
7 changed files with 230 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
MareSynchronos/Managers/CharacterManager.cs
View File

@@ -4,15 +4,21 @@ using Dalamud.Game.ClientState.Objects;
using Dalamud.Logging;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Game.Object;
using MareSynchronos.Hooks;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using FFXIVClientStructs.FFXIV.Client.System.Resource;
using MareSynchronos.Factories;
using MareSynchronos.Models;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
using Newtonsoft.Json;
using Penumbra.GameData.ByteString;
using Penumbra.Interop.Structs;
using Penumbra.PlayerWatch;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
@@ -20,26 +26,37 @@ namespace MareSynchronos.Managers
{
public class CharacterManager : IDisposable
{
private readonly DrawHooks drawHooks;
private readonly ClientState clientState;
private readonly Framework framework;
private readonly ApiController apiController;
private readonly ObjectTable objectTable;
private readonly IpcManager ipcManager;
private Task? drawHookTask = null;
private readonly FileReplacementFactory factory;
private readonly IPlayerWatcher watcher;
private Task? playerChangedTask = null;
public CharacterManager(DrawHooks drawhooks, ClientState clientState, Framework framework, ApiController apiController, ObjectTable objectTable, IpcManager ipcManager)
public CharacterManager(ClientState clientState, Framework framework, ApiController apiController, ObjectTable objectTable, IpcManager ipcManager, FileReplacementFactory factory)
{
this.drawHooks = drawhooks;
this.clientState = clientState;
this.framework = framework;
this.apiController = apiController;
this.objectTable = objectTable;
this.ipcManager = ipcManager;
drawHooks.StartHooks();
this.factory = factory;
watcher = PlayerWatchFactory.Create(framework, clientState, objectTable);
clientState.TerritoryChanged += ClientState_TerritoryChanged;
framework.Update += Framework_Update;
drawhooks.PlayerLoadEvent += Drawhooks_PlayerLoadEvent;
ipcManager.PenumbraRedrawEvent += IpcManager_PenumbraRedrawEvent;
}
private void IpcManager_PenumbraRedrawEvent(object? sender, EventArgs e)
{
var actorName = ((string)sender!);
PluginLog.Debug("Penumbra redraw " + actorName);
if (actorName == GetPlayerName())
{
PlayerChanged(actorName);
}
}
Dictionary<string, string> localPlayers = new();
@@ -81,6 +98,118 @@ namespace MareSynchronos.Managers
}
}
private string GetPlayerName()
{
return clientState.LocalPlayer!.Name.ToString();
}
private void Watcher_PlayerChanged(Dalamud.Game.ClientState.Objects.Types.Character actor)
{
if (actor.Name.ToString() == clientState.LocalPlayer!.Name.ToString())
{
PlayerChanged(actor.Name.ToString());
}
else
{
PluginLog.Debug("PlayerChanged: " + actor.Name.ToString());
}
}
private unsafe void PlayerChanged(string name)
{
//if (sender == null) return;
PluginLog.Debug("Player changed: " + name);
if (playerChangedTask is { IsCompleted: false }) return;
playerChangedTask = Task.Run(() =>
{
var obj = (GameObject*)clientState.LocalPlayer!.Address;
PluginLog.Debug("Waiting for charater to be drawn");
while ((obj->RenderFlags & 0b100000000000) == 0b100000000000) // 0b100000000000 is "still rendering" or something
{
PluginLog.Debug("Waiting for character to finish drawing");
Thread.Sleep(10);
}
PluginLog.Debug("Character finished drawing");
// wait half a second just in case
Thread.Sleep(500);
var cache = CreateFullCharacterCache();
while (!cache.IsCompleted)
{
Thread.Sleep(50);
}
_ = apiController.SendCharacterData(cache.Result);
});
}
public unsafe CharacterCache BuildCharacterCache()
{
var cache = new CharacterCache();
var model = (CharacterBase*)((Character*)clientState.LocalPlayer!.Address)->GameObject.GetDrawObject();
for (var idx = 0; idx < model->SlotCount; ++idx)
{
var mdl = (RenderModel*)model->ModelArray[idx];
if (mdl == null || mdl->ResourceHandle == null || mdl->ResourceHandle->Category != ResourceCategory.Chara)
{
continue;
}
var mdlPath = new Utf8String(mdl->ResourceHandle->FileName()).ToString();
FileReplacement cachedMdlResource = factory.Create();
cachedMdlResource.GamePaths = ipcManager.PenumbraReverseResolvePath(mdlPath, GetPlayerName());
cachedMdlResource.SetResolvedPath(mdlPath);
PluginLog.Verbose("Resolving for model " + mdlPath);
cache.AddAssociatedResource(cachedMdlResource, null!, null!);
var imc = (ResourceHandle*)model->IMCArray[idx];
if (imc != null)
{
byte[] imcData = new byte[imc->Data->DataLength / sizeof(long)];
Marshal.Copy((IntPtr)imc->Data->DataPtr, imcData, 0, (int)imc->Data->DataLength / sizeof(long));
string imcDataStr = BitConverter.ToString(imcData).Replace("-", "");
cachedMdlResource.ImcData = imcDataStr;
}
cache.AddAssociatedResource(cachedMdlResource, null!, null!);
for (int mtrlIdx = 0; mtrlIdx < mdl->MaterialCount; mtrlIdx++)
{
var mtrl = (Material*)mdl->Materials[mtrlIdx];
if (mtrl == null) continue;
//var mtrlFileResource = factory.Create();
var mtrlPath = new Utf8String(mtrl->ResourceHandle->FileName()).ToString().Split("|")[2];
PluginLog.Verbose("Resolving for material " + mtrlPath);
var cachedMtrlResource = factory.Create();
cachedMtrlResource.GamePaths = ipcManager.PenumbraReverseResolvePath(mtrlPath, GetPlayerName());
cachedMtrlResource.SetResolvedPath(mtrlPath);
cache.AddAssociatedResource(cachedMtrlResource, cachedMdlResource, null!);
var mtrlResource = (MtrlResource*)mtrl->ResourceHandle;
for (int resIdx = 0; resIdx < mtrlResource->NumTex; resIdx++)
{
var texPath = new Utf8String(mtrlResource->TexString(resIdx)).ToString();
if (string.IsNullOrEmpty(texPath.ToString())) continue;
PluginLog.Verbose("Resolving for texture " + texPath);
var cachedTexResource = factory.Create();
cachedTexResource.GamePaths = new[] { texPath };
cachedTexResource.SetResolvedPath(ipcManager.PenumbraResolvePath(texPath, GetPlayerName())!);
cache.AddAssociatedResource(cachedTexResource, cachedMdlResource, cachedMtrlResource);
}
}
}
return cache;
}
private void ClientState_TerritoryChanged(object? sender, ushort e)
{
localPlayers.Clear();
@@ -89,46 +218,31 @@ namespace MareSynchronos.Managers
public void Dispose()
{
framework.Update -= Framework_Update;
drawHooks.PlayerLoadEvent -= Drawhooks_PlayerLoadEvent;
clientState.TerritoryChanged -= ClientState_TerritoryChanged;
drawHooks?.Dispose();
watcher.PlayerChanged -= Watcher_PlayerChanged;
watcher?.Dispose();
}
private unsafe void Drawhooks_PlayerLoadEvent(object? sender, EventArgs e)
internal void StartWatchingPlayer()
{
if (sender == null) return;
if (drawHookTask != null && !drawHookTask.IsCompleted) return;
var obj = (GameObject*)(IntPtr)sender;
drawHookTask = Task.Run(() =>
{
PluginLog.Debug("Waiting for charater to be drawn");
while ((obj->RenderFlags & 0b100000000000) == 0b100000000000) // 0b100000000000 is "still rendering" or something
{
Thread.Sleep(10);
}
PluginLog.Debug("Character finished drawing");
// wait one more second just in case
Thread.Sleep(1000);
var cache = CreateFullCharacterCache();
while (!cache.IsCompleted)
{
Task.Delay(50);
}
_ = apiController.SendCharacterData(cache.Result);
});
watcher.AddPlayerToWatch(clientState.LocalPlayer!.Name.ToString());
watcher.PlayerChanged += Watcher_PlayerChanged;
watcher.Enable();
}
public CharacterCache GetCharacterCache() => drawHooks.BuildCharacterCache();
public void StopWatchPlayer(string name)
{
watcher.RemovePlayerFromWatch(name);
}
public void PrintRequestedResources() => drawHooks.PrintRequestedResources();
public void WatchPlayer(string name)
{
watcher.AddPlayerToWatch(name);
}
private async Task<CharacterCache> CreateFullCharacterCache()
{
var cache = drawHooks.BuildCharacterCache();
var cache = BuildCharacterCache();
cache.SetGlamourerData(ipcManager.GlamourerGetCharacterCustomization()!);
cache.JobId = clientState.LocalPlayer!.ClassJob.Id;
await Task.Run(async () =>
@@ -137,6 +251,7 @@ namespace MareSynchronos.Managers
{
await Task.Delay(50);
}
var json = JsonConvert.SerializeObject(cache, Formatting.Indented);
cache.CacheHash = Crypto.GetHash(json);
@@ -145,12 +260,12 @@ namespace MareSynchronos.Managers
return cache;
}
public void DebugJson()
public async Task DebugJson()
{
var cache = CreateFullCharacterCache();
while (!cache.IsCompleted)
{
Task.Delay(50);
await Task.Delay(50);
}
PluginLog.Debug(JsonConvert.SerializeObject(cache.Result, Formatting.Indented));

28
MareSynchronos/Managers/IpcManager.cs
View File

@@ -15,10 +15,14 @@ namespace MareSynchronos.Managers
private ICallGateSubscriber<string, string, object>? glamourerApplyCharacterCustomization;
private ICallGateSubscriber<int> penumbraApiVersion;
private ICallGateSubscriber<int> glamourerApiVersion;
private ICallGateSubscriber<string, string> penumbraObjectIsRedrawn;
private ICallGateSubscriber<string, int, object>? penumbraRedraw;
private ICallGateSubscriber<string, string, string[]>? penumbraReverseResolvePath;
public bool Initialized { get; private set; } = false;
public event EventHandler? PenumbraRedrawEvent;
public IpcManager(DalamudPluginInterface pi)
{
pluginInterface = pi;
@@ -29,9 +33,12 @@ namespace MareSynchronos.Managers
penumbraRedraw = pluginInterface.GetIpcSubscriber<string, int, object>("Penumbra.RedrawObjectByName");
glamourerGetCharacterCustomization = pluginInterface.GetIpcSubscriber<string>("Glamourer.GetCharacterCustomization");
glamourerApplyCharacterCustomization = pluginInterface.GetIpcSubscriber<string, string, object>("Glamourer.ApplyCharacterCustomization");
penumbraReverseResolvePath = pluginInterface.GetIpcSubscriber<string, string, string[]>("Penumbra.ReverseResolvePath");
penumbraApiVersion = pluginInterface.GetIpcSubscriber<int>("Penumbra.ApiVersion");
glamourerApiVersion = pluginInterface.GetIpcSubscriber<int>("Glamourer.ApiVersion");
penumbraInit.Subscribe(() => penumbraRedraw!.InvokeAction("self", 0));
penumbraObjectIsRedrawn = pluginInterface.GetIpcSubscriber<string, string>("Penumbra.ObjectIsRedrawn");
penumbraObjectIsRedrawn.Subscribe(RedrawEvent);
penumbraInit.Subscribe(RedrawSelf);
Initialized = true;
}
@@ -60,16 +67,35 @@ namespace MareSynchronos.Managers
}
}
private void RedrawEvent(string actorName)
{
PenumbraRedrawEvent?.Invoke(actorName, EventArgs.Empty);
}
private void RedrawSelf()
{
penumbraRedraw!.InvokeAction("self", 0);
}
private void Uninitialize()
{
penumbraInit.Unsubscribe(RedrawSelf);
penumbraObjectIsRedrawn.Unsubscribe(RedrawEvent);
penumbraResolvePath = null;
penumbraResolveModDir = null;
glamourerGetCharacterCustomization = null;
glamourerApplyCharacterCustomization = null;
penumbraReverseResolvePath = null;
Initialized = false;
PluginLog.Debug("IPC Manager disposed");
}
public string[] PenumbraReverseResolvePath(string path, string characterName)
{
if (!CheckPenumbraAPI()) return new[] { path };
return penumbraReverseResolvePath!.InvokeFunc(path, characterName);
}
public string? PenumbraResolvePath(string path, string characterName)
{
if (!CheckPenumbraAPI()) return null;