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

fix: duplicate registrations for bone names break HBM (#651)

Browse Source
This commit is contained in:
bd_ 2024-02-05 21:52:34 +09:00 committed by GitHub
parent 3d2052d8ff
commit 0030012e17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Editor/HeuristicBoneMapper.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
@ -236,13 +237,13 @@ namespace nadena.dev.modular_avatar.core.editor
return PAT_END_NUMBER.Replace(name, ""); return PAT_END_NUMBER.Replace(name, "");
} }
internal static readonly ImmutableDictionary<string, HumanBodyBones> NameToBoneMap; internal static readonly ImmutableDictionary<string, List<HumanBodyBones>> NameToBoneMap;
internal static readonly ImmutableDictionary<HumanBodyBones, ImmutableList<string>> BoneToNameMap; internal static readonly ImmutableDictionary<HumanBodyBones, ImmutableList<string>> BoneToNameMap;
static HeuristicBoneMapper() static HeuristicBoneMapper()
{ {
var pat_end_side = new Regex(@"[_\.]([LR])$"); var pat_end_side = new Regex(@"[_\.]([LR])$");
var nameToBoneMap = new Dictionary<string, HumanBodyBones>(); var nameToBoneMap = new Dictionary<string, List<HumanBodyBones>>();
var boneToNameMap = new Dictionary<HumanBodyBones, ImmutableList<string>>(); var boneToNameMap = new Dictionary<HumanBodyBones, ImmutableList<string>>();
for (int i = 0; i < boneNamePatterns.Length; i++) for (int i = 0; i < boneNamePatterns.Length; i++)
@ -263,7 +264,13 @@ namespace nadena.dev.modular_avatar.core.editor
void RegisterNameForBone(string name, HumanBodyBones bone) void RegisterNameForBone(string name, HumanBodyBones bone)
{ {
nameToBoneMap[name] = bone; if (!nameToBoneMap.TryGetValue(name, out var list))
{
list = new List<HumanBodyBones>();
nameToBoneMap[name] = list;
}
list.Add(bone);
if (!boneToNameMap.TryGetValue(bone, out var names)) if (!boneToNameMap.TryGetValue(bone, out var names))
{ {
names = ImmutableList<string>.Empty; names = ImmutableList<string>.Empty;
@ -334,12 +341,12 @@ namespace nadena.dev.modular_avatar.core.editor
childName.Length - config.prefix.Length - config.suffix.Length); childName.Length - config.prefix.Length - config.suffix.Length);
if (!NameToBoneMap.TryGetValue( if (!NameToBoneMap.TryGetValue(
NormalizeName(targetObjectName.ToLowerInvariant()), out var bodyBone)) NormalizeName(targetObjectName.ToLowerInvariant()), out var bodyBones))
{ {
continue; continue;
} }
foreach (var otherName in BoneToNameMap[bodyBone]) foreach (var otherName in bodyBones.SelectMany(bone => BoneToNameMap[bone]))
{ {
if (lcNameToXform.TryGetValue(otherName, out var targetObject)) if (lcNameToXform.TryGetValue(otherName, out var targetObject))
{ {