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

fix: incorrect first layer weights in Merge Animator (#1473)

Browse Source 
Unity ignores the weight of the first layer in a controller, and forces it to one; here, we replicate that behavior in Merge Animator.

Note that we choose to do this here rather than in NDMF - this is because NDMF-level APIs are trying to accurately represent the data in the animator, and should be able to round-trip even "garbage" data there.

Closes: https://github.com/bdunderscore/ndmf/issues/534
Closes: #1472
This commit is contained in:
bd_ 2025-03-07 18:41:26 -08:00 committed by GitHub
parent 70dd38e970
commit e471df8860
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/MergeAnimatorProcessor.cs
View File

@ -121,6 +121,10 @@ namespace nadena.dev.modular_avatar.core.editor
basePath = "";
}
var firstLayer = clonedController.Layers.FirstOrDefault();
// the first layer in an animator controller always has weight 1.0f (regardless of what is serialized)
if (firstLayer != null) firstLayer.DefaultWeight = 1.0f;
foreach (var l in clonedController.Layers)
{
if (initialWriteDefaults != null)

41
UnitTests~/MergeAnimatorTests/MergeSingleTests.cs
View File

@ -7,7 +7,9 @@ using nadena.dev.modular_avatar.core.editor;
using nadena.dev.ndmf;
using nadena.dev.ndmf.animator;
using NUnit.Framework;
using UnityEditor.Animations;
using UnityEngine;
using VRC.SDK3.Avatars.Components;
using BuildContext = nadena.dev.ndmf.BuildContext;
namespace UnitTests.MergeAnimatorTests
@ -59,6 +61,45 @@ namespace UnitTests.MergeAnimatorTests
var state = FindStateInLayer(findFxLayer(av, "Target"), "Anim1");
Assert.IsTrue(state.motion.name.StartsWith("Anim2"));
}
[Test]
public void MergeAnimation_ForcesFirstLayerToWeightOne()
{
var av = CreateRoot("root");
var controller = new AnimatorController();
var stateMachine = new AnimatorStateMachine();
stateMachine.name = "test machine";
controller.AddLayer(new AnimatorControllerLayer()
{
name = "Base",
stateMachine = stateMachine,
defaultWeight = 0
});
var merge = av.AddComponent<ModularAvatarMergeAnimator>();
merge.animator = controller;
merge.layerType = VRCAvatarDescriptor.AnimLayerType.FX;
var ctx = new BuildContext(av, null);
ctx.ActivateExtensionContext<ModularAvatarContext>();
ctx.ActivateExtensionContextRecursive<AnimatorServicesContext>();
var errors = ErrorReport.CaptureErrors(() =>
{
new MergeAnimatorProcessor().OnPreprocessAvatar(av, ctx);
ctx.DeactivateAllExtensionContexts();
});
ctx.DeactivateAllExtensionContexts();
Assert.IsEmpty(errors);
var layer = ((AnimatorController) FindFxController(av).animatorController).layers[^1];
Assert.AreEqual(1, layer.defaultWeight);
}
}
}