Merge pull request #2747 from StephenHodgson/vNEXT-GetComponentSimplification

Fixed MixedRealityManager bugs

Author: keveleigh

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

@@ -1,6 +1,7 @@
 // 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 UnityEditor;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.Inspectors.Input.Handlers
@@ -11,6 +12,7 @@ public class BaseInputHandlerInspector : Editor
 
         protected virtual void OnEnable()
         {
+            MixedRealityManager.ConfirmInitialized();
             isFocusRequiredProperty = serializedObject.FindProperty("isFocusRequired");
         }
 

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

@@ -36,9 +36,15 @@ public override void OnInspectorGUI()
             base.OnInspectorGUI();
             serializedObject.Update();
 
-            if (registeredKeywords == null || registeredKeywords.Length == 0)
+            if (!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled)
             {
+                EditorGUILayout.HelpBox("No input system is enabled, or you need to specify the type in the main configuration profile.", MessageType.Error);
+                return;
+            }
 
+            if (registeredKeywords == null || registeredKeywords.Length == 0)
+            {
+                registeredKeywords = RegisteredKeywords().Distinct().ToArray();
                 EditorGUILayout.HelpBox("No keywords registered.\n\nKeywords can be registered via Speech Commands Profile on the Mixed Reality Manager's Configuration Profile.", MessageType.Error);
                 return;
             }
@@ -136,7 +142,7 @@ private void ShowList(SerializedProperty list)
 
         private static IEnumerable<string> RegisteredKeywords()
         {
-            if (!MixedRealityManager.HasActiveProfile ||
+            if (!MixedRealityManager.ConfirmInitialized() ||
                 !MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled ||
                 !MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.IsSpeechCommandsEnabled ||
                  MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile.SpeechCommands.Length == 0)

Assets/MixedRealityToolkit/_Core/Managers/BaseManager.cs

@@ -16,7 +16,7 @@ public class BaseManager : Interfaces.IMixedRealityManager
         /// <summary>
         /// Optional Priority to reorder registered managers based on their respective priority, reduces the risk of race conditions by prioritizing the order in which managers are evaluated.
         /// </summary>
-        public virtual uint Priority { get; set; }
+        public virtual uint Priority { get; set; } = 5;
 
         /// <summary>
         /// The initialize function is used to setup the manager once created.

Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs

@@ -140,6 +140,8 @@ private void Initialize()
                 }
                 else
                 {
+                    mixedRealityComponentsCount = 0;
+                    MixedRealityComponents.Clear();
                     ActiveProfile.ActiveManagers.Clear();
                 }
             }
@@ -192,7 +194,6 @@ private void Initialize()
                 for (int i = 0; i < ActiveProfile.RegisteredComponentsProfile.Configurations?.Length; i++)
                 {
                     var configuration = ActiveProfile.RegisteredComponentsProfile.Configurations[i];
-
 #if UNITY_EDITOR
                     if (UnityEditor.EditorUserBuildSettings.activeBuildTarget.IsPlatformSupported(configuration.RuntimePlatform))
 #else
@@ -485,6 +486,11 @@ public IMixedRealityManager GetManager(Type type)
                 throw new ArgumentNullException($"Unable to get {nameof(type)} Manager as the Mixed Reality Manager has no Active Profile.");
             }
 
+            if (!IsInitialized)
+            {
+                throw new ArgumentNullException($"Unable to get {nameof(type)} Manager as the Mixed Reality Manager has not been initialized!");
+            }
+
             if (type == null) { throw new ArgumentNullException(nameof(type)); }
 
             IMixedRealityManager manager;
@@ -558,7 +564,12 @@ public void RemoveManager(Type type)
             }
             else
             {
-                MixedRealityComponents.RemoveAll(tuple => tuple.Item1.Name == type.Name);
+                IMixedRealityManager manager;
+                GetComponentByType(type, out manager);
+                if (manager != null)
+                {
+                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityManager>(type, manager));
+                }
             }
         }
 
@@ -584,7 +595,12 @@ public void RemoveManager(Type type, string managerName)
             }
             else
             {
-                MixedRealityComponents.RemoveAll(tuple => tuple.Item1.Name == type.Name && tuple.Item2.Name == managerName);
+                IMixedRealityManager manager;
+                GetComponentByTypeAndName(type, managerName, out manager);
+                if (manager != null)
+                {
+                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityManager>(type, manager));
+                }
             }
         }
 
@@ -869,6 +885,7 @@ private bool IsCoreManagerType(Type type)
             if (type == null) { throw new ArgumentNullException(nameof(type)); }
 
             return type == typeof(IMixedRealityInputSystem) ||
+                   type == typeof(IMixedRealityTeleportSystem) ||
                    type == typeof(IMixedRealityBoundarySystem);
         }
 
@@ -896,6 +913,17 @@ private void GetComponentByTypeAndName(Type type, string managerName, out IMixed
 
             manager = null;
 
+            if (isMixedRealityManagerInitializing)
+            {
+                Debug.LogWarning("Unable to get a manager while initializing!");
+                return;
+            }
+
+            if (mixedRealityComponentsCount != MixedRealityComponents.Count)
+            {
+                Initialize();
+            }
+
             for (int i = 0; i < mixedRealityComponentsCount; i++)
             {
                 if (CheckComponentMatch(type, managerName, MixedRealityComponents[i]))
@@ -926,26 +954,22 @@ private void GetComponentsByTypeAndName(Type type, string managerName, ref List<
             }
         }
 
-        private bool CheckComponentMatch(Type type, string managerName, Tuple<Type, IMixedRealityManager> managerTuple)
+        private static bool CheckComponentMatch(Type type, string managerName, Tuple<Type, IMixedRealityManager> managerTuple)
         {
             if ((managerTuple.Item1.Name == type.Name ||
                 managerTuple.Item2.GetType().Name == type.Name) &&
-                (string.IsNullOrEmpty(managerName) ? true :
-                managerTuple.Item2.Name == managerName))
+                (string.IsNullOrEmpty(managerName) || managerTuple.Item2.Name == managerName))
             {
                 return true;
             }
-            else
+
+            var interfaces = managerTuple.Item2.GetType().GetInterfaces();
+            for (int i = 0; i < interfaces.Length; i++)
             {
-                var interfaces = managerTuple.Item2.GetType().GetInterfaces();
-                for (int j = 0; j < interfaces.Length; j++)
+                if (interfaces[i].Name == type.Name &&
+                    (string.IsNullOrEmpty(managerName) || managerTuple.Item2.Name == managerName))
                 {
-                    if (interfaces[j].Name == type.Name &&
-                        (string.IsNullOrEmpty(managerName) ? true :
-                        managerTuple.Item2.Name == managerName))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }