Merge pull request #28 from VRLabs/fix/default-parameters

Small fixes to default VRChat parameters
VRLabs · Nov 19, 2023 · 37e1c2b · 37e1c2b
2 parents 9bb5132 + cfe0098
commit 37e1c2b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Editor/AV3Manager.cs b/Editor/AV3Manager.cs
@@ -29,6 +29,7 @@ public class AV3Manager : EditorWindow
             //VRC Defaults
             "IsLocal",
             "Viseme",
+            "Voice",
             "GestureLeft",
             "GestureRight",
             "GestureLeftWeight",
@@ -37,6 +38,7 @@ public class AV3Manager : EditorWindow
             "VelocityX",
             "VelocityY",
             "VelocityZ",
+            "VelocityMagnitude",
             "Upright",
             "Grounded",
             "Seated",
@@ -45,10 +47,18 @@ public class AV3Manager : EditorWindow
             "VRMode",
             "MuteSelf",
             "InStation",
+            "Earmuffs",
             "Supine",
             "GroundProximity",
+            "ScaleModified",
+            "ScaleFactor",
+            "ScaleFactorInverse",
+            "EyeHeightAsMeters",
+            "EyeHeightAsPercent",
 
             //VRLabs Defaults
+            //IsMirror is legacy, MirrorDetection/IsMirror is current
+            "MirrorDetection/IsMirror",
             "IsMirror"
         };
 

diff --git a/Editor/Elements/AnimatorMergerElement.cs b/Editor/Elements/AnimatorMergerElement.cs
@@ -73,7 +73,7 @@ public AnimatorMergerElement(VrcAnimationLayer layer)
                     var suffixField = new TextField(p.Name).ChildOf(itemContainer);
                     suffixField.tooltip = p.Name;
                     
-                    if (AV3Manager.VrcParameters.Any(x => x.Contains(param.name)))
+                    if (AV3Manager.VrcParameters.Any(x => x == param.name))
                     {
                         new Label("Parameter is a default one, by default it will be added to the parameters, but not listed in the synced parameters, you should not add any affix unless you know what you're doing")
                             .WithClass("warning-label")