Pulled out Mixed Reality Manager Check and added it to base handler inspector

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Inspectors/Input/Handlers/BaseInputHandlerInspector.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Microsoft.MixedReality.Toolkit.Core.Inspectors.Profiles;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using UnityEditor;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.Inspectors.Input.Handlers
 {
-    public class BaseInputHandlerInspector : Editor
+    public class BaseInputHandlerInspector : BaseMixedRealityInspector
     {
         private SerializedProperty isFocusRequiredProperty;
 

Assets/MixedRealityToolkit-SDK/Inspectors/Input/Handlers/PointerClickHandlerInspector.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Core.Managers;
 using Microsoft.MixedReality.Toolkit.SDK.Input.Handlers;
 using UnityEditor;
 
@@ -22,12 +21,15 @@ protected override void OnEnable()
             pointerDownProperty = serializedObject.FindProperty("onPointerDownActionEvent");
             pointerClickedProperty = serializedObject.FindProperty("onPointerClickedActionEvent");
 
-            MixedRealityManager.ConfirmInitialized();
+            CheckMixedRealityManager(false);
         }
 
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
+
+            if (!CheckMixedRealityManager()) { return; }
+
             serializedObject.Update();
             EditorGUILayout.PropertyField(pointerUpProperty, true);
             EditorGUILayout.PropertyField(pointerDownProperty, true);

Assets/MixedRealityToolkit-SDK/Inspectors/Input/Handlers/SpeechInputHandlerInspector.cs

@@ -28,13 +28,20 @@ protected override void OnEnable()
 
             keywordsProperty = serializedObject.FindProperty("keywords");
             persistentKeywordsProperty = serializedObject.FindProperty("persistentKeywords");
-            registeredKeywords = RegisteredKeywords().Distinct().ToArray();
+
+            if (CheckMixedRealityManager(false))
+            {
+                registeredKeywords = RegisteredKeywords().Distinct().ToArray();
+            }
         }
 
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
-            serializedObject.Update();
+            if (!CheckMixedRealityManager())
+            {
+                return;
+            }
 
             if (!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled)
             {
@@ -49,6 +56,7 @@ public override void OnInspectorGUI()
                 return;
             }
 
+            serializedObject.Update();
             EditorGUILayout.PropertyField(persistentKeywordsProperty);
 
             ShowList(keywordsProperty);
@@ -142,8 +150,7 @@ private void ShowList(SerializedProperty list)
 
         private static IEnumerable<string> RegisteredKeywords()
         {
-            if (!MixedRealityManager.ConfirmInitialized() ||
-                !MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled ||
+            if (!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled ||
                 !MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.IsSpeechCommandsEnabled ||
                  MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile.SpeechCommands.Length == 0)
             {

Assets/MixedRealityToolkit-SDK/Inspectors/MixedRealityToolkit.SDK.Inspectors.asmdef

@@ -3,7 +3,8 @@
     "references": [
         "Microsoft.MixedReality.Toolkit",
         "Microsoft.MixedReality.Toolkit.InputSystem",
-        "Microsoft.MixedReality.Toolkit.SDK"
+        "Microsoft.MixedReality.Toolkit.SDK",
+        "Microsoft.MixedReality.Toolkit.Core.Inspectors"
     ],
     "optionalUnityReferences": [],
     "includePlatforms": [

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

@@ -2,13 +2,12 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Core.Extensions.EditorClassExtensions;
-using Microsoft.MixedReality.Toolkit.Core.Managers;
 using UnityEditor;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Core.Inspectors.Profiles
 {
-    public abstract class MixedRealityBaseConfigurationProfileInspector : Editor
+    public abstract class MixedRealityBaseConfigurationProfileInspector : BaseMixedRealityInspector
     {
         private static readonly GUIContent NewProfileContent = new GUIContent("+", "Create New Profile");
 
@@ -44,41 +43,6 @@ protected void RenderMixedRealityToolkitLogo()
             GUILayout.Space(12f);
         }
 
-        /// <summary>
-        /// Check and make sure we have a Mixed Reality Manager and an active profile.
-        /// </summary>
-        /// <returns>True if the Mixed Reality Manager is properly initialized.</returns>
-        protected bool CheckMixedRealityManager(bool showHelpBox = true)
-        {
-            if (!MixedRealityManager.IsInitialized)
-            {
-                // Search the scene for one, in case we've just hot reloaded the assembly.
-                var managerSearch = FindObjectsOfType<MixedRealityManager>();
-
-                if (managerSearch.Length == 0)
-                {
-                    if (showHelpBox)
-                    {
-                        EditorGUILayout.HelpBox("No Mixed Reality Manager found in scene.", MessageType.Error);
-                    }
-                    return false;
-                }
-
-                MixedRealityManager.ConfirmInitialized();
-            }
-
-            if (!MixedRealityManager.HasActiveProfile)
-            {
-                if (showHelpBox)
-                {
-                    EditorGUILayout.HelpBox("No Active Profile set on the Mixed Reality Manager.", MessageType.Error);
-                }
-                return false;
-            }
-
-            return true;
-        }
-
         protected static bool RenderProfile(SerializedProperty property)
         {
             bool changed = false;