friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix my own mistakes

Browse Source
This commit is contained in:
rootdarkarchon
2024-03-30 00:07:14 +01:00
parent c1f70cd47c
commit f25f2cb861
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs
View File

@@ -139,6 +139,7 @@ public class PlayerDataFactory
await Task.Delay(50, token).ConfigureAwait(false);
totalWaitTime -= 50;
}
var boneIndices = await _dalamudUtil.RunOnFrameworkThread(() => _modelAnalyzer.GetSkeletonBoneIndices(charaPointer)).ConfigureAwait(false);
DateTime start = DateTime.UtcNow;
@@ -236,7 +237,14 @@ public class PlayerDataFactory
if (objectKind == ObjectKind.Player)
{
await VerifyPlayerAnimationBones(previousData, objectKind, charaPointer).ConfigureAwait(false);
try
{
await VerifyPlayerAnimationBones(boneIndices, previousData, objectKind).ConfigureAwait(false);
}
catch (Exception e)
{
_logger.LogWarning(e, "Failed to verify player animations, continuing");
}
}
_logger.LogInformation("Building character data for {obj} took {time}ms", objectKind, TimeSpan.FromTicks(DateTime.UtcNow.Ticks - start.Ticks).TotalMilliseconds);
@@ -244,14 +252,13 @@ public class PlayerDataFactory
return previousData;
}
private async Task VerifyPlayerAnimationBones(CharacterData previousData, ObjectKind objectKind, nint charaPointer)
private async Task VerifyPlayerAnimationBones(Dictionary<string, List<ushort>>? boneIndices, CharacterData previousData, ObjectKind objectKind)
{
var boneIndices = _modelAnalyzer.GetSkeletonBoneIndices(charaPointer);
if (boneIndices != null)
{
foreach (var kvp in boneIndices)
{
_logger.LogDebug("Found {skellyname} ({idx} bone indices) on player: {bones}", kvp.Key, kvp.Value.Max(), string.Join(',', kvp.Value));
_logger.LogDebug("Found {skellyname} ({idx} bone indices) on player: {bones}", kvp.Key, kvp.Value.Any() ? kvp.Value.Max() : 0, string.Join(',', kvp.Value));
}
if (boneIndices.All(u => u.Value.Count == 0)) return;

19
MareSynchronos/Services/XivDataAnalyzer.cs
View File

@@ -35,15 +35,14 @@ public sealed class XivDataAnalyzer
var resHandles = chara->Skeleton->SkeletonResourceHandles;
int i = 0;
Dictionary<string, List<ushort>> outputIndices = [];
while (*(resHandles + i) != null)
try
{
string skeletonName = "unknown";
try
while (*(resHandles + i) != null)
{
var handle = *(resHandles + i);
var curBones = handle->BoneCount;
skeletonName = handle->ResourceHandle.FileName.ToString();
var skeletonName = handle->ResourceHandle.FileName.ToString();
if (string.IsNullOrEmpty(skeletonName)) continue;
outputIndices[skeletonName] = new();
for (ushort boneIdx = 0; boneIdx < curBones; boneIdx++)
{
@@ -53,12 +52,12 @@ public sealed class XivDataAnalyzer
outputIndices[skeletonName].Add(boneIdx);
}
i++;
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Could procss skeleton {skl}", skeletonName);
}
i++;
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Could not process skeleton data");
}
return outputIndices;