Empty to match layer masks more consistently

lyuma · Jul 14, 2020 · 9f5ae1b · 9f5ae1b
1 parent eec74d0
commit 9f5ae1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Editor/LyumaAv3EditorSupport.cs b/Editor/LyumaAv3EditorSupport.cs
@@ -46,11 +46,11 @@ public static class LyumaAv3EditorSupport
         {VRCAvatarDescriptor.AnimLayerType.TPose, "vrc_MusclesOnly"},
         {VRCAvatarDescriptor.AnimLayerType.IKPose, "vrc_MusclesOnly"},
         {VRCAvatarDescriptor.AnimLayerType.SpecialIK, "vrc_MusclesOnly"},
-        {VRCAvatarDescriptor.AnimLayerType.Base, "LyumaFullMask"},
-        {VRCAvatarDescriptor.AnimLayerType.Sitting, "LyumaFullMask"},
-        {VRCAvatarDescriptor.AnimLayerType.Additive, "LyumaFullMask"},
-        {VRCAvatarDescriptor.AnimLayerType.FX, "LyumaEmptyMask"},
-        {VRCAvatarDescriptor.AnimLayerType.Action,"vrc_MusclesOnly"},
+        {VRCAvatarDescriptor.AnimLayerType.Base, null},//"LyumaFullMask"},
+        {VRCAvatarDescriptor.AnimLayerType.Sitting, null},//"LyumaFullMask"},
+        {VRCAvatarDescriptor.AnimLayerType.Additive, null},//"LyumaFullMask"},
+        {VRCAvatarDescriptor.AnimLayerType.FX, "LyumaEmptyMask"}, // TODO
+        {VRCAvatarDescriptor.AnimLayerType.Action, null},//"vrc_MusclesOnly"},
         {VRCAvatarDescriptor.AnimLayerType.Gesture, "vrc_HandsOnly"},
     };
 

diff --git a/Scripts/LyumaAv3Runtime.cs b/Scripts/LyumaAv3Runtime.cs
@@ -668,7 +668,7 @@ void Update()
         }
         if (Seated != PrevSeated && sittingIndex >= 0)
         {
-            playableBlendingStates[sittingIndex].StartBlend(playableMixer.GetInputWeight(sittingIndex), Seated ? 1f : 0f, 0.5f);
+            playableBlendingStates[sittingIndex].StartBlend(playableMixer.GetInputWeight(sittingIndex), Seated ? 1f : 0f, 0.25f);
             PrevSeated = Seated;
         }
         if (VisemeI != Viseme) {