AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-12 23:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename variable name to clarify means

Browse Source
This commit is contained in:
Sayamame-beans 2024-10-14 01:57:35 +09:00
parent 6f39151317
commit 14d46b4546
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Editor/HeuristicBoneMapper.cs
View File

@ -308,7 +308,7 @@ namespace nadena.dev.modular_avatar.core.editor
List<Transform> skipped = null, List<Transform> skipped = null,
HashSet<Transform> unassigned = null, HashSet<Transform> unassigned = null,
Animator avatarAnimator = null, Animator avatarAnimator = null,
Dictionary<Transform, HumanBodyBones> humanoidBones = null Dictionary<Transform, HumanBodyBones> outfitHumanoidBones = null
) )
{ {
Dictionary<Transform, Transform> mappings = new Dictionary<Transform, Transform>(); Dictionary<Transform, Transform> mappings = new Dictionary<Transform, Transform>();
@ -360,11 +360,11 @@ namespace nadena.dev.modular_avatar.core.editor
List<HumanBodyBones> bodyBones = null; List<HumanBodyBones> bodyBones = null;
var isMapped = false; var isMapped = false;
if (humanoidBones != null && humanoidBones.TryGetValue(child, out var humanoidBone)) if (outfitHumanoidBones != null && outfitHumanoidBones.TryGetValue(child, out var outfitHumanoidBone))
{ {
if (avatarAnimator != null) if (avatarAnimator != null)
{ {
var avatarBone = avatarAnimator.GetBoneTransform(humanoidBone); var avatarBone = avatarAnimator.GetBoneTransform(outfitHumanoidBone);
if (avatarBone != null && unassigned.Contains(avatarBone)) if (avatarBone != null && unassigned.Contains(avatarBone))
{ {
mappings[child] = avatarBone; mappings[child] = avatarBone;
@ -372,10 +372,10 @@ namespace nadena.dev.modular_avatar.core.editor
lcNameToXform.Remove(NormalizeName(avatarBone.gameObject.name)); lcNameToXform.Remove(NormalizeName(avatarBone.gameObject.name));
isMapped = true; isMapped = true;
} else { } else {
bodyBones = new List<HumanBodyBones> { humanoidBone }; bodyBones = new List<HumanBodyBones> { outfitHumanoidBone };
} }
} else { } else {
bodyBones = new List<HumanBodyBones>() { humanoidBone }; bodyBones = new List<HumanBodyBones>() { outfitHumanoidBone };
} }
} }
@ -434,7 +434,7 @@ namespace nadena.dev.modular_avatar.core.editor
return mappings; return mappings;
} }
internal static void RenameBonesByHeuristic(ModularAvatarMergeArmature config, List<Transform> skipped = null, Dictionary<Transform, HumanBodyBones> humanoidBones = null, Animator avatarAnimator = null) internal static void RenameBonesByHeuristic(ModularAvatarMergeArmature config, List<Transform> skipped = null, Dictionary<Transform, HumanBodyBones> outfitHumanoidBones = null, Animator avatarAnimator = null)
{ {
var target = config.mergeTarget.Get(RuntimeUtil.FindAvatarTransformInParents(config.transform)); var target = config.mergeTarget.Get(RuntimeUtil.FindAvatarTransformInParents(config.transform));
if (target == null) return; if (target == null) return;
@ -445,7 +445,7 @@ namespace nadena.dev.modular_avatar.core.editor
void Traverse(Transform src, Transform dst) void Traverse(Transform src, Transform dst)
{ {
var mappings = AssignBoneMappings(config, src.gameObject, dst.gameObject, skipped: skipped, humanoidBones: humanoidBones, avatarAnimator: avatarAnimator); var mappings = AssignBoneMappings(config, src.gameObject, dst.gameObject, skipped: skipped, outfitHumanoidBones: outfitHumanoidBones, avatarAnimator: avatarAnimator);
foreach (var pair in mappings) foreach (var pair in mappings)
{ {

4
Editor/Inspector/MergeArmatureEditor.cs
View File

@ -133,8 +133,8 @@ namespace nadena.dev.modular_avatar.core.editor
outfitRoot = outfitRoot.parent; outfitRoot = outfitRoot.parent;
} }
var humanoidBones = SetupOutfit.GetOutfitHumanoidBones(outfitRoot, outfitAnimator); var outfitHumanoidBones = SetupOutfit.GetOutfitHumanoidBones(outfitRoot, outfitAnimator);
HeuristicBoneMapper.RenameBonesByHeuristic(target, humanoidBones: humanoidBones, avatarAnimator: avatarAnimator); HeuristicBoneMapper.RenameBonesByHeuristic(target, outfitHumanoidBones: outfitHumanoidBones, avatarAnimator: avatarAnimator);
} }
} }

12
Editor/SetupOutfit.cs
View File

@ -158,10 +158,10 @@ namespace nadena.dev.modular_avatar.core.editor
merge.InferPrefixSuffix(); merge.InferPrefixSuffix();
var outfitAnimator = outfitRoot.GetComponent<Animator>(); var outfitAnimator = outfitRoot.GetComponent<Animator>();
var humanoidBones = GetOutfitHumanoidBones(outfitRoot.transform, outfitAnimator); var outfitHumanoidBones = GetOutfitHumanoidBones(outfitRoot.transform, outfitAnimator);
var avatarAnimator = avatarRoot.GetComponent<Animator>(); var avatarAnimator = avatarRoot.GetComponent<Animator>();
List<Transform> subRoots = new List<Transform>(); List<Transform> subRoots = new List<Transform>();
HeuristicBoneMapper.RenameBonesByHeuristic(merge, skipped: subRoots, humanoidBones: humanoidBones, avatarAnimator: avatarAnimator); HeuristicBoneMapper.RenameBonesByHeuristic(merge, skipped: subRoots, outfitHumanoidBones: outfitHumanoidBones, avatarAnimator: avatarAnimator);
// If the outfit has an UpperChest bone but the avatar doesn't, add an additional MergeArmature to // If the outfit has an UpperChest bone but the avatar doesn't, add an additional MergeArmature to
// help with this // help with this
@ -248,19 +248,19 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
Dictionary<Transform, HumanBodyBones> humanoidBones = null; Dictionary<Transform, HumanBodyBones> outfitHumanoidBones = null;
if (outfitAnimator != null) if (outfitAnimator != null)
{ {
humanoidBones = new Dictionary<Transform, HumanBodyBones>(); outfitHumanoidBones = new Dictionary<Transform, HumanBodyBones>();
foreach (HumanBodyBones boneIndex in Enum.GetValues(typeof(HumanBodyBones))) foreach (HumanBodyBones boneIndex in Enum.GetValues(typeof(HumanBodyBones)))
{ {
var bone = boneIndex != HumanBodyBones.LastBone ? outfitAnimator.GetBoneTransform(boneIndex) : null; var bone = boneIndex != HumanBodyBones.LastBone ? outfitAnimator.GetBoneTransform(boneIndex) : null;
if (bone == null) continue; if (bone == null) continue;
humanoidBones[bone] = boneIndex; outfitHumanoidBones[bone] = boneIndex;
} }
} }
return humanoidBones; return outfitHumanoidBones;
} }
private static void FixAPose(GameObject avatarRoot, Transform outfitArmature) private static void FixAPose(GameObject avatarRoot, Transform outfitArmature)