fix: shape changer doesn't set the correct initial state for blendshapes it controls (#904)

Closes: #872
2025-01-30 10:12:59 +08:00 · 2024-06-24 12:04:29 +09:00 · 2024-06-24 12:04:29 +09:00 · 02ca58a3a9
commit 02ca58a3a9
parent b3142d7f11
15 changed files with 1020 additions and 1 deletions
--- a/Editor/PluginDefinition/PluginDefinition.cs
+++ b/Editor/PluginDefinition/PluginDefinition.cs
@ -48,6 +48,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
                seq.Run(MeshSettingsPluginPass.Instance);
                seq.Run(ScaleAdjusterPass.Instance).PreviewingWith(new ScaleAdjusterPreview());
 #if MA_VRCSDK3_AVATARS
+                seq.Run(ShapeChangerPrePass.Instance);
                seq.Run(RenameParametersPluginPass.Instance);
                seq.Run(MergeBlendTreePass.Instance);
                seq.Run(MergeAnimatorPluginPass.Instance);
--- a/Editor/ShapeChanger/RemoveBlendShapeFromMesh.cs
+++ b/Editor/ShapeChanger/RemoveBlendShapeFromMesh.cs
@ -144,6 +144,8 @@ namespace nadena.dev.modular_avatar.core.editor
            List<BoneWeight1> boneWeights = new(origBoneWeights.Length);
            List<byte> bonesPerVertex = new(origBonesPerVertex.Length);

+            if (bonesPerVertex.Count == 0) return; // no bones in this mesh
+
            int ptr = 0;
            for (int i = 0; i < toRetain.Length; i++)
            {
--- a/Editor/ShapeChanger/ShapeChangerPass.cs
+++ b/Editor/ShapeChanger/ShapeChangerPass.cs
@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using nadena.dev.modular_avatar.animation;
+using nadena.dev.ndmf;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
@ -14,6 +15,51 @@ using VRC.SDK3.Avatars.Components;

 namespace nadena.dev.modular_avatar.core.editor
 {
+    /// <summary>
+    ///     Reserve an animator layer for Shape Changer's use. We do this here so that we can take advantage of MergeAnimator's
+    ///     layer reference correction logic; this can go away once we have a more unified animation services API.
+    /// </summary>
+    internal class ShapeChangerPrePass : Pass<ShapeChangerPrePass>
+    {
+        internal const string TAG_PATH = "__MA/ShapeChanger/PrepassPlaceholder";
+
+        protected override void Execute(ndmf.BuildContext context)
+        {
+            if (context.AvatarRootObject.GetComponentInChildren<ModularAvatarShapeChanger>() != null)
+            {
+                var clip = new AnimationClip();
+                clip.name = "MA Shape Changer Defaults";
+
+                var curve = new AnimationCurve();
+                curve.AddKey(0, 0);
+                clip.SetCurve(TAG_PATH, typeof(Transform), "localPosition.x", curve);
+
+                // Merge using a null blend tree. This also ensures that we initialize the Merge Blend Tree system.
+                var bt = new BlendTree();
+                bt.name = "MA Shape Changer Defaults";
+                bt.blendType = BlendTreeType.Direct;
+                bt.children = new[]
+                {
+                    new ChildMotion
+                    {
+                        motion = clip,
+                        timeScale = 1,
+                        cycleOffset = 0,
+                        directBlendParameter = MergeBlendTreePass.ALWAYS_ONE
+                    }
+                };
+                bt.useAutomaticThresholds = false;
+
+                // This is a hack and a half - put in a dummy path so we can find the cloned clip later on...
+                var obj = new GameObject("MA SC Defaults");
+                obj.transform.SetParent(context.AvatarRootTransform);
+                var mambt = obj.AddComponent<ModularAvatarMergeBlendTree>();
+                mambt.BlendTree = bt;
+                mambt.PathMode = MergeAnimatorPathMode.Absolute;
+            }
+        }
+    }
+    
    internal class ShapeChangerPass
    {
        struct ShapeKey
@ -48,6 +94,7 @@ namespace nadena.dev.modular_avatar.core.editor
            public string DeleteParam { get; set; }

            public bool alwaysDeleted;
+            public float currentState;

            // Objects which trigger deletion of this shape key. 
            public List<GameObject> deletionObjects = new List<GameObject>();
@ -56,6 +103,9 @@ namespace nadena.dev.modular_avatar.core.editor
            public ShapeKeyInfo(ShapeKey key)
            {
                ShapeKey = key;
+                currentState = (EditorUtility.InstanceIDToObject(key.RendererInstanceId) as SkinnedMeshRenderer)
+                               ?.GetBlendShapeWeight(key.ShapeIndex)
+                               ?? 0;
            }
        }
        
@ -132,6 +182,8 @@ namespace nadena.dev.modular_avatar.core.editor
        private readonly ndmf.BuildContext context;
        private Dictionary<string, float> initialValues = new();

+        private AnimationClip _initialStateClip;
+        
        public ShapeChangerPass(ndmf.BuildContext context)
        {
            this.context = context;
@ -141,6 +193,8 @@ namespace nadena.dev.modular_avatar.core.editor
        {
            Dictionary<ShapeKey, ShapeKeyInfo> shapes = FindShapes(context);

+            ProcessInitialStates(shapes);
+            
            foreach (var groups in shapes.Values)
            {
                ProcessShapeKey(groups);
@ -149,6 +203,36 @@ namespace nadena.dev.modular_avatar.core.editor
            ProcessMeshDeletion(shapes);
        }

+        private void ProcessInitialStates(Dictionary<ShapeKey, ShapeKeyInfo> shapes)
+        {
+            var clips = context.Extension<AnimationServicesContext>().AnimationDatabase;
+            var initialStateHolder = clips.ClipsForPath(ShapeChangerPrePass.TAG_PATH).FirstOrDefault();
+            if (initialStateHolder == null) return;
+
+            _initialStateClip = new AnimationClip();
+            _initialStateClip.name = "MA Shape Changer Defaults";
+            initialStateHolder.CurrentClip = _initialStateClip;
+
+            foreach (var (key, info) in shapes)
+            {
+                if (info.alwaysDeleted) continue;
+
+                var curve = new AnimationCurve();
+                curve.AddKey(0, info.currentState);
+                curve.AddKey(1, info.currentState);
+
+                var renderer = (SkinnedMeshRenderer)EditorUtility.InstanceIDToObject(key.RendererInstanceId);
+
+                var binding = EditorCurveBinding.FloatCurve(
+                    RuntimeUtil.RelativePath(context.AvatarRootObject, renderer.gameObject),
+                    typeof(SkinnedMeshRenderer),
+                    $"blendShape.{key.ShapeKeyName}"
+                );
+
+                AnimationUtility.SetEditorCurve(_initialStateClip, binding, curve);
+            }
+        }
+
        #region Mesh processing

        private void ProcessMeshDeletion(Dictionary<ShapeKey, ShapeKeyInfo> shapes)
@ -565,9 +649,12 @@ namespace nadena.dev.modular_avatar.core.editor
                    }

                    var action = new ActionGroupKey(asc, key, changer.gameObject, shape);
+                    var isCurrentlyActive = changer.gameObject.activeInHierarchy;

                    if (action.IsDelete)
                    {
+                        if (isCurrentlyActive) info.currentState = 100;
+
                        if (action.ControllingObject == null)
                        {
                            // always active?
@ -580,7 +667,9 @@ namespace nadena.dev.modular_avatar.core.editor

                        continue;
                    }
-                    
+
+                    if (changer.gameObject.activeInHierarchy) info.currentState = action.Value;
+
                    // TODO: lift controlling object resolution out of loop?
                    if (action.ControllingObject == null)
                    {
--- a/UnitTests~/ShapeChanger.meta
+++ b/UnitTests~/ShapeChanger.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9bacff15fcc8e664da19460d90dde622
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ShapeChanger/InitialStates.meta
+++ b/UnitTests~/ShapeChanger/InitialStates.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9b0deddc373fa364e8091ac24965ffbd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.controller
+++ b/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.controller
@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SCDefaultAnimation
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1915927467537037891}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &1915927467537037891
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates: []
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 0}
--- a/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.controller.meta
+++ b/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 42c8c1410dd27314d80feb6d95204538
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.cs
+++ b/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.cs
@ -0,0 +1,62 @@
+using modular_avatar_tests;
+using nadena.dev.modular_avatar.animation;
+using nadena.dev.modular_avatar.core.editor;
+using NUnit.Framework;
+using UnityEditor;
+using UnityEditor.Animations;
+using UnityEngine;
+
+namespace ShapeChangerTests
+{
+    public class SCDefaultAnimation : TestBase
+    {
+        [Test]
+        public void SetsCorrectInitialStatesAndAnimations()
+        {
+            var root = CreatePrefab("SCDefaultAnimation.prefab");
+            AvatarProcessor.ProcessAvatar(root);
+
+            var fx = (AnimatorController) FindFxController(root).animatorController;
+            var baseLayer = fx.layers[0];
+            
+            var bt = baseLayer.stateMachine.states[0].state.motion as BlendTree;
+            Assert.NotNull(bt);
+            var subBt = bt.children[0].motion as BlendTree;
+            Assert.NotNull(subBt);
+            var clip = subBt.children[0].motion as AnimationClip;
+            Assert.NotNull(clip);
+
+            var bindings = AnimationUtility.GetCurveBindings(clip);
+            var curve = AnimationUtility.GetEditorCurve(clip, EditorCurveBinding.FloatCurve(
+                "test mesh",
+                typeof(SkinnedMeshRenderer),
+                "blendShape.key1"
+            ));
+            Assert.AreEqual(10.0f, curve.keys[0].value, 0.1f);
+            Assert.AreEqual(10.0f, curve.keys[1].value, 0.1f);
+            
+            curve = AnimationUtility.GetEditorCurve(clip, EditorCurveBinding.FloatCurve(
+                "test mesh",
+                typeof(SkinnedMeshRenderer),
+                "blendShape.key2"
+            ));
+            // Always-on delete, no curve should be generated
+            Assert.IsNull(curve);
+            
+            curve = AnimationUtility.GetEditorCurve(clip, EditorCurveBinding.FloatCurve(
+                "test mesh",
+                typeof(SkinnedMeshRenderer),
+                "blendShape.key3"
+            ));
+            Assert.AreEqual(100.0f, curve.keys[0].value, 0.1f);
+            Assert.AreEqual(100.0f, curve.keys[1].value, 0.1f);
+            
+            // Check actual blendshape states
+            var smr = root.transform.Find("test mesh").GetComponent<SkinnedMeshRenderer>();
+            var sharedMesh = smr.sharedMesh;
+            Assert.AreEqual(10.0f, smr.GetBlendShapeWeight(sharedMesh.GetBlendShapeIndex("key1")), 0.1f);
+            Assert.AreEqual(0.0f, smr.GetBlendShapeWeight(sharedMesh.GetBlendShapeIndex("key2")), 0.1f);
+            Assert.AreEqual(100.0f, smr.GetBlendShapeWeight(sharedMesh.GetBlendShapeIndex("key3")), 0.1f);
+        }
+    }
+}
--- a/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.cs.meta
+++ b/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 882eec70bf364a8391617350c0740534
+timeCreated: 1719194190
--- a/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.prefab
+++ b/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.prefab
@ -0,0 +1,618 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1307328145036867423
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7471115643889882934}
+  - component: {fileID: 2015798673852064281}
+  m_Layer: 0
+  m_Name: AlwaysOnDelete
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7471115643889882934
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1307328145036867423}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8936933457054072598}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2015798673852064281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1307328145036867423}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2db441f589c3407bb6fb5f02ff8ab541, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_targetRenderer:
+    referencePath: test mesh
+  m_shapes:
+  - ShapeName: key2
+    ChangeType: 0
+    Value: 100
+--- !u!1 &2598725701317979415
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1861262250770563182}
+  - component: {fileID: 8866671501173891171}
+  m_Layer: 0
+  m_Name: Toggled
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1861262250770563182
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2598725701317979415}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8936933457054072598}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8866671501173891171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2598725701317979415}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2db441f589c3407bb6fb5f02ff8ab541, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_targetRenderer:
+    referencePath: test mesh
+  m_shapes:
+  - ShapeName: key1
+    ChangeType: 1
+    Value: 10
+--- !u!1 &2845086157653980983
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 110069860838053623}
+  - component: {fileID: 8218581995269956798}
+  m_Layer: 0
+  m_Name: AlwaysOnSet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &110069860838053623
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2845086157653980983}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8936933457054072598}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8218581995269956798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2845086157653980983}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2db441f589c3407bb6fb5f02ff8ab541, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_targetRenderer:
+    referencePath: test mesh
+  m_shapes:
+  - ShapeName: key3
+    ChangeType: 1
+    Value: 100
+--- !u!1 &6385483934583485188
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 569625391371299408}
+  - component: {fileID: 3841502665919975468}
+  m_Layer: 0
+  m_Name: InitialOffToggled
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &569625391371299408
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6385483934583485188}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8936933457054072598}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3841502665919975468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6385483934583485188}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2db441f589c3407bb6fb5f02ff8ab541, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_targetRenderer:
+    referencePath: test mesh
+  m_shapes:
+  - ShapeName: key1
+    ChangeType: 1
+    Value: 20
+--- !u!1 &6855505756433160176
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8936933457054072598}
+  - component: {fileID: 6580323041906195452}
+  - component: {fileID: 146169679456758165}
+  - component: {fileID: 5146811121193962360}
+  m_Layer: 0
+  m_Name: SCDefaultAnimation
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8936933457054072598
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855505756433160176}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.0024816, y: 0.25853348, z: -0.63345385}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1861262250770563182}
+  - {fileID: 7471115643889882934}
+  - {fileID: 110069860838053623}
+  - {fileID: 569625391371299408}
+  - {fileID: 1326682634762807916}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &6580323041906195452
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855505756433160176}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &146169679456758165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855505756433160176}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  ViewPosition: {x: 0, y: 1.6, z: 0.2}
+  Animations: 0
+  ScaleIPD: 1
+  lipSync: 0
+  lipSyncJawBone: {fileID: 0}
+  lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1}
+  lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1}
+  VisemeSkinnedMesh: {fileID: 0}
+  MouthOpenBlendShapeName: Facial_Blends.Jaw_Down
+  VisemeBlendShapes: []
+  unityVersion: 
+  portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
+  portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
+  networkIDs: []
+  customExpressions: 0
+  expressionsMenu: {fileID: 0}
+  expressionParameters: {fileID: 0}
+  enableEyeLook: 0
+  customEyeLookSettings:
+    eyeMovement:
+      confidence: 0.5
+      excitement: 0.5
+    leftEye: {fileID: 0}
+    rightEye: {fileID: 0}
+    eyesLookingStraight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingUp:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingDown:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingLeft:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingRight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidType: 0
+    upperLeftEyelid: {fileID: 0}
+    upperRightEyelid: {fileID: 0}
+    lowerLeftEyelid: {fileID: 0}
+    lowerRightEyelid: {fileID: 0}
+    eyelidsDefault:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsClosed:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingUp:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingDown:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsSkinnedMesh: {fileID: 0}
+    eyelidsBlendshapes: 
+  customizeAnimationLayers: 0
+  baseAnimationLayers:
+  - isEnabled: 0
+    type: 0
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 4
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 5
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  specialAnimationLayers:
+  - isEnabled: 0
+    type: 6
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 7
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 8
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  AnimationPreset: {fileID: 0}
+  animationHashSet: []
+  autoFootsteps: 1
+  autoLocomotion: 1
+  collider_head:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_torso:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &5146811121193962360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855505756433160176}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  launchedFromSDKPipeline: 0
+  completedSDKPipeline: 0
+  blueprintId: 
+  contentType: 0
+  assetBundleUnityVersion: 
+  fallbackStatus: 0
+--- !u!1001 &1577363430154308999
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8936933457054072598}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -3887185075125053422, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -3887185075125053422, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -3887185075125053422, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: cd28f61dacdc2424d951194ff69ba154,
+        type: 3}
+      propertyPath: m_Name
+      value: test mesh
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cd28f61dacdc2424d951194ff69ba154, type: 3}
+--- !u!4 &1326682634762807916 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cd28f61dacdc2424d951194ff69ba154,
+    type: 3}
+  m_PrefabInstance: {fileID: 1577363430154308999}
+  m_PrefabAsset: {fileID: 0}
--- a/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.prefab.meta
+++ b/UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c526de796b67f8245b901540ed91fb05
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ShapeChanger/InitialStates/Toggle.anim
+++ b/UnitTests~/ShapeChanger/InitialStates/Toggle.anim
@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Toggle
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/UnitTests~/ShapeChanger/InitialStates/Toggle.anim.meta
+++ b/UnitTests~/ShapeChanger/InitialStates/Toggle.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa9d3e3f6f1c97142ab173f9a537a35f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ShapeChanger/InitialStates/shape
+++ b/UnitTests~/ShapeChanger/InitialStates/shape
--- a/UnitTests~/ShapeChanger/InitialStates/shape
+++ b/UnitTests~/ShapeChanger/InitialStates/shape
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: cd28f61dacdc2424d951194ff69ba154
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: