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: hands mask not set when merging if the initial configuration used the default

Browse Source 
Fixed: #349
This commit is contained in:
bd_ 2023-07-30 20:55:07 +09:00
parent 8aba9d4cc7
commit 9138205ace
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Packages/nadena.dev.modular-avatar/Editor/MergeAnimatorProcessor.cs
View File

@ -40,6 +40,8 @@ namespace nadena.dev.modular_avatar.core.editor
private const string SAMPLE_PATH_LEGACY = "Assets/VRCSDK/Examples3/Animation/Controllers"; private const string SAMPLE_PATH_LEGACY = "Assets/VRCSDK/Examples3/Animation/Controllers";
private const string GUID_GESTURE_HANDSONLY_MASK = "b2b8bad9583e56a46a3e21795e96ad92";
private BuildContext _context; private BuildContext _context;
private Dictionary<VRCAvatarDescriptor.AnimLayerType, AnimatorController> defaultControllers_ = private Dictionary<VRCAvatarDescriptor.AnimLayerType, AnimatorController> defaultControllers_ =
@ -72,6 +74,7 @@ namespace nadena.dev.modular_avatar.core.editor
descriptor.baseAnimationLayers = FinishSessions(descriptor.baseAnimationLayers); descriptor.baseAnimationLayers = FinishSessions(descriptor.baseAnimationLayers);
descriptor.specialAnimationLayers = FinishSessions(descriptor.specialAnimationLayers); descriptor.specialAnimationLayers = FinishSessions(descriptor.specialAnimationLayers);
descriptor.customizeAnimationLayers = true;
} }
private void ProcessMergeAnimator(GameObject avatarGameObject, BuildContext context, private void ProcessMergeAnimator(GameObject avatarGameObject, BuildContext context,
@ -121,6 +124,14 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
if (mergeSessions.TryGetValue(layers[i].type, out var session)) if (mergeSessions.TryGetValue(layers[i].type, out var session))
{ {
if (layers[i].type == VRCAvatarDescriptor.AnimLayerType.Gesture && layers[i].isDefault)
{
// We need to set the mask field for the gesture layer on initial configuration
layers[i].mask = AssetDatabase.LoadAssetAtPath<AvatarMask>(
AssetDatabase.GUIDToAssetPath(GUID_GESTURE_HANDSONLY_MASK)
);
}
layers[i].isDefault = false; layers[i].isDefault = false;
layers[i].animatorController = session.Finish(); layers[i].animatorController = session.Finish();
} }