Merge pull request #3001 from SimonDarksideJ/mrtk_development_InputSystemProfileTidy

Tidying up the Input System profile

Author: David Kline

Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs

@@ -28,18 +28,6 @@ public MixedRealityInputActionsProfile InputActionsProfile
             private set { inputActionsProfile = value; }
         }
 
-        [SerializeField]
-        [Tooltip("Gesture Mapping Profile for recognizing gestures across all platforms.")]
-        private MixedRealityGesturesProfile gesturesProfile;
-
-        /// <summary>
-        /// Gesture Mapping Profile for recognizing gestures across all platforms.
-        /// </summary>
-        public MixedRealityGesturesProfile GesturesProfile
-        {
-            get { return gesturesProfile; }
-            private set { gesturesProfile = value; }
-        }
 
         [SerializeField]
         [Tooltip("Input Action Rules Profile for raising actions based on specific criteria.")]
@@ -67,6 +55,20 @@ public MixedRealityPointerProfile PointerProfile
             private set { pointerProfile = value; }
         }
 
+        [SerializeField]
+        [Tooltip("Gesture Mapping Profile for recognizing gestures across all platforms.")]
+        private MixedRealityGesturesProfile gesturesProfile;
+
+        /// <summary>
+        /// Gesture Mapping Profile for recognizing gestures across all platforms.
+        /// </summary>
+        public MixedRealityGesturesProfile GesturesProfile
+        {
+            get { return gesturesProfile; }
+            private set { gesturesProfile = value; }
+        }
+
+
         private IMixedRealitySpeechSystem speechSystem;
 
         /// <summary>
@@ -143,4 +145,4 @@ public MixedRealityControllerVisualizationProfile ControllerVisualizationProfile
             private set { controllerVisualizationProfile = value; }
         }
     }
-}
+}

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

@@ -13,13 +13,13 @@ namespace Microsoft.MixedReality.Toolkit.Core.Inspectors.Profiles
     public class MixedRealityInputSystemProfileInspector : MixedRealityBaseConfigurationProfileInspector
     {
         private SerializedProperty inputActionsProfile;
-        private SerializedProperty gesturesProfile;
         private SerializedProperty inputActionRulesProfile;
         private SerializedProperty pointerProfile;
+        private SerializedProperty gesturesProfile;
         private SerializedProperty speechCommandsProfile;
-        private SerializedProperty controllerVisualizationProfile;
         private SerializedProperty enableControllerMapping;
         private SerializedProperty controllerMappingProfile;
+        private SerializedProperty controllerVisualizationProfile;
 
         private void OnEnable()
         {
@@ -34,13 +34,13 @@ private void OnEnable()
             }
 
             inputActionsProfile = serializedObject.FindProperty("inputActionsProfile");
-            gesturesProfile = serializedObject.FindProperty("gesturesProfile");
             inputActionRulesProfile = serializedObject.FindProperty("inputActionRulesProfile");
             pointerProfile = serializedObject.FindProperty("pointerProfile");
+            gesturesProfile = serializedObject.FindProperty("gesturesProfile");
             speechCommandsProfile = serializedObject.FindProperty("speechCommandsProfile");
-            controllerVisualizationProfile = serializedObject.FindProperty("controllerVisualizationProfile");
-            enableControllerMapping = serializedObject.FindProperty("enableControllerMapping");
             controllerMappingProfile = serializedObject.FindProperty("controllerMappingProfile");
+            enableControllerMapping = serializedObject.FindProperty("enableControllerMapping");
+            controllerVisualizationProfile = serializedObject.FindProperty("controllerVisualizationProfile");
         }
 
         public override void OnInspectorGUI()
@@ -73,13 +73,13 @@ public override void OnInspectorGUI()
             bool changed = false;
 
             changed |= RenderProfile(inputActionsProfile);
-            changed |= RenderProfile(gesturesProfile);
             changed |= RenderProfile(inputActionRulesProfile);
             changed |= RenderProfile(pointerProfile);
+            changed |= RenderProfile(gesturesProfile);
             changed |= RenderProfile(speechCommandsProfile);
-            changed |= RenderProfile(controllerVisualizationProfile);
             EditorGUILayout.PropertyField(enableControllerMapping);
             changed |= RenderProfile(controllerMappingProfile);
+            changed |= RenderProfile(controllerVisualizationProfile);
 
             if (!changed)
             {