Merge pull request #2926 from StephenHodgson/vNEXT-GestureProfileFixes

Gesture Profile Fixes

Author: StephenHodgson

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs

@@ -2,8 +2,11 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Core.Definitions;
+using Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
@@ -19,16 +22,19 @@ public class MixedRealityGesturesProfileInspector : MixedRealityBaseConfiguratio
         private static readonly GUIContent GestureTypeContent = new GUIContent("Gesture Type", "The type of Gesture that will trigger the action.");
         private static readonly GUIContent ActionContent = new GUIContent("Action", "The action to trigger when a Gesture is recognized.");
 
-        private static GUIContent[] actionLabels;
-        private static int[] actionIds;
-
         private SerializedProperty gestures;
         private SerializedProperty windowsManipulationGestureSettings;
         private SerializedProperty useRailsNavigation;
         private SerializedProperty windowsNavigationGestureSettings;
         private SerializedProperty windowsRailsNavigationGestures;
         private SerializedProperty windowsGestureAutoStart;
 
+        private MixedRealityGesturesProfile thisProfile;
+        private static GUIContent[] allGestureLabels;
+        private static int[] allGestureIds;
+        private static GUIContent[] actionLabels;
+        private static int[] actionIds;
+
         private void OnEnable()
         {
             if (!CheckMixedRealityManager(false)) { return; }
@@ -39,13 +45,42 @@ private void OnEnable()
             windowsNavigationGestureSettings = serializedObject.FindProperty("navigationGestures");
             windowsRailsNavigationGestures = serializedObject.FindProperty("railsNavigationGestures");
             windowsGestureAutoStart = serializedObject.FindProperty("windowsGestureAutoStart");
+            thisProfile = target as MixedRealityGesturesProfile;
+            Debug.Assert(thisProfile != null);
 
             if (MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled &&
                 MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile != null)
             {
-                actionLabels = MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions.Select(action => new GUIContent(action.Description)).Prepend(new GUIContent("None")).ToArray();
-                actionIds = MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions.Select(action => (int)action.Id).Prepend(0).ToArray();
+                actionLabels = MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions
+                    .Select(action => new GUIContent(action.Description))
+                    .Prepend(new GUIContent("None")).ToArray();
+                actionIds = MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions
+                    .Select(action => (int)action.Id)
+                    .Prepend(0).ToArray();
+            }
+
+            UpdateGestureLabels();
+        }
+
+        private void UpdateGestureLabels()
+        {
+            var allGestureTypeNames = Enum.GetNames(typeof(GestureInputType));
+
+            var tempIds = new List<int>();
+            var tempContent = new List<GUIContent>();
+
+            for (int i = 0; i < allGestureTypeNames.Length; i++)
+            {
+                if (allGestureTypeNames[i].Equals("None") ||
+                    thisProfile.Gestures.All(mapping => !allGestureTypeNames[i].Equals(mapping.GestureType.ToString())))
+                {
+                    tempContent.Add(new GUIContent(allGestureTypeNames[i]));
+                    tempIds.Add(i);
+                }
             }
+
+            allGestureIds = tempIds.ToArray();
+            allGestureLabels = tempContent.ToArray();
         }
 
         public override void OnInspectorGUI()
@@ -101,7 +136,7 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
 
-        private static void RenderList(SerializedProperty list)
+        private void RenderList(SerializedProperty list)
         {
             EditorGUILayout.Space();
             GUILayout.BeginVertical();
@@ -112,8 +147,8 @@ private static void RenderList(SerializedProperty list)
                 var speechCommand = list.GetArrayElementAtIndex(list.arraySize - 1);
                 var keyword = speechCommand.FindPropertyRelative("description");
                 keyword.stringValue = string.Empty;
-                var keyCode = speechCommand.FindPropertyRelative("gestureType");
-                keyCode.intValue = (int)KeyCode.None;
+                var gestureType = speechCommand.FindPropertyRelative("gestureType");
+                gestureType.intValue = (int)GestureInputType.None;
                 var action = speechCommand.FindPropertyRelative("action");
                 var actionId = action.FindPropertyRelative("id");
                 actionId.intValue = 0;
@@ -129,6 +164,7 @@ private static void RenderList(SerializedProperty list)
             {
                 EditorGUILayout.HelpBox("Define a new Gesture.", MessageType.Warning);
                 GUILayout.EndVertical();
+                UpdateGestureLabels();
                 return;
             }
 
@@ -149,14 +185,37 @@ private static void RenderList(SerializedProperty list)
                 EditorGUILayout.BeginHorizontal();
                 SerializedProperty gesture = list.GetArrayElementAtIndex(i);
                 var keyword = gesture.FindPropertyRelative("description");
-                EditorGUILayout.PropertyField(keyword, GUIContent.none, GUILayout.ExpandWidth(true));
                 var gestureType = gesture.FindPropertyRelative("gestureType");
-                EditorGUILayout.PropertyField(gestureType, GUIContent.none, GUILayout.Width(80f));
                 var action = gesture.FindPropertyRelative("action");
                 var actionId = action.FindPropertyRelative("id");
                 var actionDescription = action.FindPropertyRelative("description");
                 var actionConstraint = action.FindPropertyRelative("axisConstraint");
 
+                EditorGUILayout.PropertyField(keyword, GUIContent.none, GUILayout.ExpandWidth(true));
+
+                Debug.Assert(allGestureLabels.Length == allGestureIds.Length);
+
+                var gestureLabels = new GUIContent[allGestureLabels.Length + 1];
+                var gestureIds = new int[allGestureIds.Length + 1];
+
+                gestureLabels[0] = new GUIContent(((GestureInputType)gestureType.intValue).ToString());
+                gestureIds[0] = gestureType.intValue;
+
+                for (int j = 0; j < allGestureLabels.Length; j++)
+                {
+                    gestureLabels[j + 1] = allGestureLabels[j];
+                    gestureIds[j + 1] = allGestureIds[j];
+                }
+
+                EditorGUI.BeginChangeCheck();
+                gestureType.intValue = EditorGUILayout.IntPopup(GUIContent.none, gestureType.intValue, gestureLabels, gestureIds, GUILayout.Width(80f));
+
+                if (EditorGUI.EndChangeCheck())
+                {
+                    serializedObject.ApplyModifiedProperties();
+                    UpdateGestureLabels();
+                }
+
                 EditorGUI.BeginChangeCheck();
                 actionId.intValue = EditorGUILayout.IntPopup(GUIContent.none, actionId.intValue, actionLabels, actionIds, GUILayout.Width(64f));
 
@@ -165,11 +224,14 @@ private static void RenderList(SerializedProperty list)
                     MixedRealityInputAction inputAction = actionId.intValue == 0 ? MixedRealityInputAction.None : MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions[actionId.intValue - 1];
                     actionDescription.stringValue = inputAction.Description;
                     actionConstraint.enumValueIndex = (int)inputAction.AxisConstraint;
+                    serializedObject.ApplyModifiedProperties();
                 }
 
                 if (GUILayout.Button(MinusButtonContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))
                 {
                     list.DeleteArrayElementAtIndex(i);
+                    serializedObject.ApplyModifiedProperties();
+                    UpdateGestureLabels();
                 }
 
                 EditorGUILayout.EndHorizontal();