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

ResourceTree: Use DrawObject as equipment source + CS-ify a bit more

Browse source
This commit is contained in:
Exter-N 2023-10-27 02:13:57 +02:00
parent 00dc5f48b1
commit 5085aa500c
1 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Penumbra/Interop/ResourceTree/ResourceTree.cs
View file

@ -50,9 +50,14 @@ public class ResourceTree
{ {
var character = (Character*)GameObjectAddress; var character = (Character*)GameObjectAddress;
var model = (CharacterBase*)DrawObjectAddress; var model = (CharacterBase*)DrawObjectAddress;
var human = model->GetModelType() == CharacterBase.ModelType.Human ? (Human*)model : null; var modelType = model->GetModelType();
var equipment = new ReadOnlySpan<CharacterArmor>(&character->DrawData.Head, 10); var human = modelType == CharacterBase.ModelType.Human ? (Human*)model : null;
// var customize = new ReadOnlySpan<byte>( character->CustomizeData, 26 ); var equipment = modelType switch
{
CharacterBase.ModelType.Human => new ReadOnlySpan<CharacterArmor>(&human->Head, 10),
CharacterBase.ModelType.DemiHuman => new ReadOnlySpan<CharacterArmor>(&character->DrawData.Head, 10),
_ => ReadOnlySpan<CharacterArmor>.Empty,
};
ModelId = character->CharacterData.ModelCharaId; ModelId = character->CharacterData.ModelCharaId;
CustomizeData = character->DrawData.CustomizeData; CustomizeData = character->DrawData.CustomizeData;
RaceCode = human != null ? (GenderRace)human->RaceSexId : GenderRace.Unknown; RaceCode = human != null ? (GenderRace)human->RaceSexId : GenderRace.Unknown;
@ -91,18 +96,20 @@ public class ResourceTree
private unsafe void AddHumanResources(GlobalResolveContext globalContext, Human* human) private unsafe void AddHumanResources(GlobalResolveContext globalContext, Human* human)
{ {
var firstSubObject = (CharacterBase*)human->CharacterBase.DrawObject.Object.ChildObject;
if (firstSubObject != null)
{
var subObjectNodes = new List<ResourceNode>();
var subObject = firstSubObject;
var subObjectIndex = 0; var subObjectIndex = 0;
do var weaponIndex = 0;
var subObjectNodes = new List<ResourceNode>();
foreach (var baseSubObject in human->CharacterBase.DrawObject.Object.ChildObjects)
{ {
if (baseSubObject->GetObjectType() != FFXIVClientStructs.FFXIV.Client.Graphics.Scene.ObjectType.CharacterBase)
continue;
var subObject = (CharacterBase*)baseSubObject;
var weapon = subObject->GetModelType() == CharacterBase.ModelType.Weapon ? (Weapon*)subObject : null; var weapon = subObject->GetModelType() == CharacterBase.ModelType.Weapon ? (Weapon*)subObject : null;
var subObjectNamePrefix = weapon != null ? "Weapon" : "Fashion Acc."; var subObjectNamePrefix = weapon != null ? "Weapon" : "Fashion Acc.";
// This way to tell apart MainHand and OffHand is not always accurate, but seems good enough for what we're doing with it.
var subObjectContext = globalContext.CreateContext( var subObjectContext = globalContext.CreateContext(
weapon != null ? EquipSlot.MainHand : EquipSlot.Unknown, weapon != null ? (weaponIndex > 0 ? EquipSlot.OffHand : EquipSlot.MainHand) : EquipSlot.Unknown,
weapon != null ? new CharacterArmor(weapon->ModelSetId, (byte)weapon->Variant, (byte)weapon->ModelUnknown) : default weapon != null ? new CharacterArmor(weapon->ModelSetId, (byte)weapon->Variant, (byte)weapon->ModelUnknown) : default
); );
@ -129,12 +136,11 @@ public class ResourceTree
AddSkeleton(subObjectNodes, subObjectContext, subObject->Skeleton, $"{subObjectNamePrefix} #{subObjectIndex}, "); AddSkeleton(subObjectNodes, subObjectContext, subObject->Skeleton, $"{subObjectNamePrefix} #{subObjectIndex}, ");
subObject = (CharacterBase*)subObject->DrawObject.Object.NextSiblingObject;
++subObjectIndex; ++subObjectIndex;
} while (subObject != null && subObject != firstSubObject); if (weapon != null)
++weaponIndex;
Nodes.InsertRange(0, subObjectNodes);
} }
Nodes.InsertRange(0, subObjectNodes);
var context = globalContext.CreateContext(EquipSlot.Unknown, default); var context = globalContext.CreateContext(EquipSlot.Unknown, default);