changed VRC Expression Menu UI to use Reorderable List

list.yml

@@ -34,3 +34,6 @@ packages:
 - https://raw.githubusercontent.com/vrchat/packages/3.0.8/packages/com.vrchat.base/package.json
 - https://raw.githubusercontent.com/vrchat/packages/3.0.8/packages/com.vrchat.worlds/package.json
 - https://raw.githubusercontent.com/vrchat/packages/3.0.8/packages/com.vrchat.avatars/package.json
+- https://raw.githubusercontent.com/vrchat/packages/3.0.9/packages/com.vrchat.base/package.json
+- https://raw.githubusercontent.com/vrchat/packages/3.0.9/packages/com.vrchat.worlds/package.json
+- https://raw.githubusercontent.com/vrchat/packages/3.0.9/packages/com.vrchat.avatars/package.json

packages/com.vrchat.avatars/Editor/VRCSDK/SDK3A/Components3/VRCAnimatorLocomotionControlEditor.cs

@@ -1,60 +1,60 @@
-#if VRC_SDK_VRCSDK3
-using UnityEngine;
-using UnityEditor;
-using VRC.SDK3.Avatars.Components;
-
-[CustomEditor(typeof(VRCAnimatorLocomotionControl))]
-public class VRCAnimatorLocomotionControlEditor : Editor
-{
-    VRCAnimatorLocomotionControl control;
-    GUIStyle styleButtonActive;
-    GUIStyle styleButtonInactive;
-
-    public void OnEnable()
-    {
-        if (target == null)
-            return;
-
-        if (control == null)
-            control = (VRCAnimatorLocomotionControl)target;
-
-        styleButtonActive = new GUIStyle(EditorStyles.miniButton);
-        styleButtonInactive = new GUIStyle(EditorStyles.miniButton);
-        styleButtonActive.fixedWidth = 80;
-        styleButtonInactive.fixedWidth = 80;
-        styleButtonActive.normal.textColor = Color.green;
-        styleButtonInactive.normal.textColor = Color.gray;
-
-        serializedObject.ApplyModifiedProperties();
-    }
-
-    public override void OnInspectorGUI()
-    {
-        serializedObject.Update();
-
-        EditorGUILayout.Space();
-        EditorGUILayout.BeginHorizontal();
-        EditorGUILayout.LabelField("Locomotion Control", GUILayout.MaxWidth(150));
-        if (control.disableLocomotion)
-        {
-            GUILayout.Button("Disable", styleButtonActive);
-            if (GUILayout.Button("Enable", styleButtonInactive))
-                control.disableLocomotion = false;
-        }
-        else
-        {
-            if (GUILayout.Button("Disable", styleButtonInactive))
-                control.disableLocomotion = true;
-            GUILayout.Button("Enable", styleButtonActive);
-        }
-        EditorGUILayout.EndHorizontal();
-        EditorGUILayout.Space();
-        control.debugString = EditorGUILayout.TextField("Debug String", control.debugString);
-
-        serializedObject.ApplyModifiedProperties();
-
-        //if (_repaint)
-        //    EditorUtility.SetDirty(target);
-    }
-}
-#endif
+#if VRC_SDK_VRCSDK3
+using UnityEngine;
+using UnityEditor;
+using VRC.SDK3.Avatars.Components;
+
+[CustomEditor(typeof(VRCAnimatorLocomotionControl))]
+public class VRCAnimatorLocomotionControlEditor : Editor
+{
+    VRCAnimatorLocomotionControl control;
+    GUIStyle styleButtonActive;
+    GUIStyle styleButtonInactive;
+
+    public void OnEnable()
+    {
+        if (target == null)
+            return;
+
+        if (control == null)
+            control = (VRCAnimatorLocomotionControl)target;
+
+        styleButtonActive = new GUIStyle(EditorStyles.miniButton);
+        styleButtonInactive = new GUIStyle(EditorStyles.miniButton);
+        styleButtonActive.fixedWidth = 80;
+        styleButtonInactive.fixedWidth = 80;
+        styleButtonActive.normal.textColor = Color.green;
+        styleButtonInactive.normal.textColor = Color.gray;
+
+        serializedObject.ApplyModifiedProperties();
+    }
+
+    public override void OnInspectorGUI()
+    {
+        serializedObject.Update();
+
+        EditorGUILayout.Space();
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField("Locomotion Control", GUILayout.MaxWidth(150));
+        if (control.disableLocomotion)
+        {
+            GUILayout.Button("Disable", styleButtonActive);
+            if (GUILayout.Button("Enable", styleButtonInactive))
+                control.disableLocomotion = false;
+        }
+        else
+        {
+            if (GUILayout.Button("Disable", styleButtonInactive))
+                control.disableLocomotion = true;
+            GUILayout.Button("Enable", styleButtonActive);
+        }
+        EditorGUILayout.EndHorizontal();
+        EditorGUILayout.Space();
+        control.debugString = EditorGUILayout.TextField("Debug String", control.debugString);
+
+        serializedObject.ApplyModifiedProperties();
+
+        //if (_repaint)
+        //    EditorUtility.SetDirty(target);
+    }
+}
+#endif

packages/com.vrchat.avatars/Editor/VRCSDK/SDK3A/Components3/VRCAnimatorRemeasureAvatarEditor.cs

@@ -1,36 +1,36 @@
-#if VRC_SDK_VRCSDK3
-using UnityEngine;
-using UnityEditor;
-using VRC.SDK3.Avatars.Components;
-
-//Will be revisiting this, removed temporarily Kiro - Aug/5/2020
-/*[CustomEditor(typeof(VRCAnimatorRemeasureAvatar))]
-public class VRCAnimatorRemeasureAvatarEditor : Editor
-{
-    VRCAnimatorRemeasureAvatar view;
-
-    public void OnEnable()
-    {
-        if (target == null) return;
-
-        if (view == null)
-            view = (VRCAnimatorRemeasureAvatar)target;
-
-        serializedObject.ApplyModifiedProperties();
-    }
-
-    public override void OnInspectorGUI()
-    {
-        serializedObject.Update();
-
-        EditorGUILayout.PropertyField(serializedObject.FindProperty("fixedDelay"));
-        EditorGUILayout.PropertyField(serializedObject.FindProperty("delayTime"), new GUIContent(view.fixedDelay ? "Delay Time (s)" : "Delay Time (%)"));
-        EditorGUILayout.PropertyField(serializedObject.FindProperty("debugString"));
-
-        serializedObject.ApplyModifiedProperties();
-
-        //if (_repaint)
-        //    EditorUtility.SetDirty(target);
-    }
-}*/
-#endif
+#if VRC_SDK_VRCSDK3
+using UnityEngine;
+using UnityEditor;
+using VRC.SDK3.Avatars.Components;
+
+//Will be revisiting this, removed temporarily Kiro - Aug/5/2020
+/*[CustomEditor(typeof(VRCAnimatorRemeasureAvatar))]
+public class VRCAnimatorRemeasureAvatarEditor : Editor
+{
+    VRCAnimatorRemeasureAvatar view;
+
+    public void OnEnable()
+    {
+        if (target == null) return;
+
+        if (view == null)
+            view = (VRCAnimatorRemeasureAvatar)target;
+
+        serializedObject.ApplyModifiedProperties();
+    }
+
+    public override void OnInspectorGUI()
+    {
+        serializedObject.Update();
+
+        EditorGUILayout.PropertyField(serializedObject.FindProperty("fixedDelay"));
+        EditorGUILayout.PropertyField(serializedObject.FindProperty("delayTime"), new GUIContent(view.fixedDelay ? "Delay Time (s)" : "Delay Time (%)"));
+        EditorGUILayout.PropertyField(serializedObject.FindProperty("debugString"));
+
+        serializedObject.ApplyModifiedProperties();
+
+        //if (_repaint)
+        //    EditorUtility.SetDirty(target);
+    }
+}*/
+#endif

packages/com.vrchat.avatars/Editor/VRCSDK/SDK3A/Components3/VRCAnimatorTemporaryPoseSpaceEditor.cs

@@ -1,55 +1,55 @@
-#if VRC_SDK_VRCSDK3
-using UnityEngine;
-using UnityEditor;
-using VRC.SDK3.Avatars.Components;
-
-[CustomEditor(typeof(VRCAnimatorTemporaryPoseSpace))]
-public class VRCAnimatorSetViewEditor : Editor
-{
-    VRCAnimatorTemporaryPoseSpace view;
-    GUIStyle styleButtonActive;
-    GUIStyle styleButtonInactive;
-
-    public void OnEnable()
-    {
-        if (target == null) return;
-
-        if (view == null)
-            view = (VRCAnimatorTemporaryPoseSpace)target;
-
-        styleButtonActive = new GUIStyle(EditorStyles.miniButton);
-        styleButtonInactive = new GUIStyle(EditorStyles.miniButton);
-        styleButtonActive.fixedWidth = 50;
-        styleButtonInactive.fixedWidth = 50;
-        styleButtonActive.normal.textColor = Color.green;
-        styleButtonInactive.normal.textColor = Color.gray;
-
-        serializedObject.ApplyModifiedProperties();
-    }
-
-    public override void OnInspectorGUI()
-    {
-        serializedObject.Update();
-
-        EditorGUILayout.Space();
-        EditorGUILayout.BeginHorizontal();
-        EditorGUILayout.LabelField(new GUIContent("Pose Space", "Enter or exit a pose space based on the avatar's current pose."), GUILayout.MaxWidth(150));
-
-        if (GUILayout.Button("Enter", view.enterPoseSpace ? styleButtonActive : styleButtonInactive))
-            view.enterPoseSpace = true;
-        if (GUILayout.Button("Exit", !view.enterPoseSpace ? styleButtonActive : styleButtonInactive))
-            view.enterPoseSpace = false;
-
-        EditorGUILayout.EndHorizontal();
-        EditorGUILayout.Space();
-        EditorGUILayout.PropertyField(serializedObject.FindProperty("fixedDelay"));
-        EditorGUILayout.PropertyField(serializedObject.FindProperty("delayTime"), new GUIContent(view.fixedDelay ? "Delay Time (s)" : "Delay Time (%)"));
-        EditorGUILayout.PropertyField(serializedObject.FindProperty("debugString"));
-
-        serializedObject.ApplyModifiedProperties();
-
-        //if (_repaint)
-        //    EditorUtility.SetDirty(target);
-    }
-}
-#endif
+#if VRC_SDK_VRCSDK3
+using UnityEngine;
+using UnityEditor;
+using VRC.SDK3.Avatars.Components;
+
+[CustomEditor(typeof(VRCAnimatorTemporaryPoseSpace))]
+public class VRCAnimatorSetViewEditor : Editor
+{
+    VRCAnimatorTemporaryPoseSpace view;
+    GUIStyle styleButtonActive;
+    GUIStyle styleButtonInactive;
+
+    public void OnEnable()
+    {
+        if (target == null) return;
+
+        if (view == null)
+            view = (VRCAnimatorTemporaryPoseSpace)target;
+
+        styleButtonActive = new GUIStyle(EditorStyles.miniButton);
+        styleButtonInactive = new GUIStyle(EditorStyles.miniButton);
+        styleButtonActive.fixedWidth = 50;
+        styleButtonInactive.fixedWidth = 50;
+        styleButtonActive.normal.textColor = Color.green;
+        styleButtonInactive.normal.textColor = Color.gray;
+
+        serializedObject.ApplyModifiedProperties();
+    }
+
+    public override void OnInspectorGUI()
+    {
+        serializedObject.Update();
+
+        EditorGUILayout.Space();
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField(new GUIContent("Pose Space", "Enter or exit a pose space based on the avatar's current pose."), GUILayout.MaxWidth(150));
+
+        if (GUILayout.Button("Enter", view.enterPoseSpace ? styleButtonActive : styleButtonInactive))
+            view.enterPoseSpace = true;
+        if (GUILayout.Button("Exit", !view.enterPoseSpace ? styleButtonActive : styleButtonInactive))
+            view.enterPoseSpace = false;
+
+        EditorGUILayout.EndHorizontal();
+        EditorGUILayout.Space();
+        EditorGUILayout.PropertyField(serializedObject.FindProperty("fixedDelay"));
+        EditorGUILayout.PropertyField(serializedObject.FindProperty("delayTime"), new GUIContent(view.fixedDelay ? "Delay Time (s)" : "Delay Time (%)"));
+        EditorGUILayout.PropertyField(serializedObject.FindProperty("debugString"));
+
+        serializedObject.ApplyModifiedProperties();
+
+        //if (_repaint)
+        //    EditorUtility.SetDirty(target);
+    }
+}
+#endif