AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-03-09 23:34:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: broken humanoid rigs can break assumptions made in EasySetupOutfit (#737)

Browse Source 
Closes: #735
This commit is contained in:
bd_ 2024-03-06 00:51:43 -08:00 committed by GitHub
parent c67d28ca1b
commit 6cc687d1fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Editor/EasySetupOutfit.cs
View File

@ -154,7 +154,7 @@ namespace nadena.dev.modular_avatar.core.editor
var parentTransform = subConfig.transform.parent;
var parentConfig = parentTransform.GetComponentInParent<ModularAvatarMergeArmature>();
var parentMapping = parentConfig.MapBone(parentTransform);
subConfig.mergeTarget = new AvatarObjectReference();
subConfig.mergeTarget.referencePath =
RuntimeUtil.RelativePath(avatarRoot, parentMapping.gameObject);
@ -316,7 +316,7 @@ namespace nadena.dev.modular_avatar.core.editor
};
return false;
}
if (nearestAvatarTransform == xform)
{
errorMessageGroups = new string[]
@ -386,6 +386,14 @@ namespace nadena.dev.modular_avatar.core.editor
outfitHips = outfitAnimator.isHuman
? outfitAnimator.GetBoneTransform(HumanBodyBones.Hips)?.gameObject
: null;
if (outfitHips.transform.parent == outfitRoot.transform)
{
// Sometimes broken rigs can have the hips as a direct child of the root, instead of having
// an intermediate Armature object. We do not currently support this kind of rig, and so we'll
// assume the outfit's humanoid rig is broken and move on to heuristic matching.
outfitHips = null;
}
}
var hipsCandidates = new List<string>();