svc locator now using non-data provider IMixedRealityServiceRegistrar methods

Author: David Kline (ANALOG)

Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs

@@ -39,7 +39,7 @@ float IMixedRealityFocusProvider.GlobalPointingExtent
         {
             get
             {
-                if (MixedRealityToolkit.HasActiveProfile &&
+                if (MixedRealityToolkit.Instance.HasActiveProfile &&
                     MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
                     MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile != null)
                 {
@@ -59,7 +59,7 @@ public LayerMask[] FocusLayerMasks
             {
                 if (focusLayerMasks == null)
                 {
-                    if (MixedRealityToolkit.HasActiveProfile &&
+                    if (MixedRealityToolkit.Instance.HasActiveProfile &&
                         MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
                         MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile != null)
                     {

Assets/MixedRealityToolkit.Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs

@@ -59,7 +59,7 @@ public override void Enable()
             }
 
             // Get the collection of registered observers.
-            List<Core.Interfaces.IMixedRealityService> services = MixedRealityToolkit.Instance.GetActiveServices(typeof(IMixedRealitySpatialAwarenessObserver));
+            IReadOnlyList<IMixedRealitySpatialAwarenessObserver> services = MixedRealityToolkit.Instance.GetServices<IMixedRealitySpatialAwarenessObserver>();
             for (int i = 0; i < services.Count; i++)
             {
                 observers.Add(services[i] as IMixedRealitySpatialAwarenessObserver);

Assets/MixedRealityToolkit.Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs

@@ -37,9 +37,9 @@ public void Test01_CreateMixedRealityInputSystem()
             MixedRealityToolkit.Instance.RegisterService<IMixedRealityInputSystem>(new MixedRealityInputSystem());
 
             // Tests
-            Assert.IsNotEmpty(MixedRealityToolkit.ActiveSystems);
-            Assert.AreEqual(1, MixedRealityToolkit.ActiveSystems.Count);
-            Assert.AreEqual(0, MixedRealityToolkit.RegisteredMixedRealityServices.Count);
+            Assert.IsNotEmpty(MixedRealityToolkit.Instance.ActiveSystems);
+            Assert.AreEqual(1, MixedRealityToolkit.Instance.ActiveSystems.Count);
+            Assert.AreEqual(0, MixedRealityToolkit.Instance.RegisteredMixedRealityServices.Count);
         }
 
         [Test]

Assets/MixedRealityToolkit.Tests/InputSystem/TestFixture_03_InputSystemTests.cs

@@ -33,7 +33,7 @@ public static void InitializeMixedRealityToolkitScene(bool useDefaultProfile = f
             // Tests
             Assert.IsTrue(MixedRealityToolkit.IsInitialized);
             Assert.IsNotNull(MixedRealityToolkit.Instance);
-            Assert.IsFalse(MixedRealityToolkit.HasActiveProfile);
+            Assert.IsFalse(MixedRealityToolkit.Instance.HasActiveProfile);
 
             var configuration = useDefaultProfile
                 ? GetDefaultMixedRealityProfile<MixedRealityToolkitConfigurationProfile>()

Assets/MixedRealityToolkit.Tests/TestUtilities.cs

@@ -89,7 +89,7 @@ protected override void OnEnable()
                 return;
             }
 
-            if (!MixedRealityToolkit.HasActiveProfile)
+            if (!MixedRealityToolkit.Instance.HasActiveProfile)
             {
                 return;
             }

Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityToolkitConfigurationProfileInspector.cs

@@ -19,7 +19,7 @@ public class InputActionPropertyDrawer : PropertyDrawer
 
         public override void OnGUI(Rect rect, SerializedProperty property, GUIContent content)
         {
-            if (!MixedRealityToolkit.IsInitialized || !MixedRealityToolkit.HasActiveProfile)
+            if (!MixedRealityToolkit.IsInitialized || !MixedRealityToolkit.Instance.HasActiveProfile)
             {
                 profile = null;
                 actionLabels = new[] { new GUIContent("Missing Mixed Reality Toolkit") };

Assets/MixedRealityToolkit/Inspectors/PropertyDrawers/InputActionPropertyDrawer.cs

@@ -23,7 +23,7 @@ public class CanvasEditorExtension : Editor
 
         private bool hasUtility = false;
 
-        private static bool IsUtilityValid => MixedRealityToolkit.HasActiveProfile && MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled && MixedRealityToolkit.InputSystem?.FocusProvider != null;
+        private static bool IsUtilityValid => MixedRealityToolkit.Instance.HasActiveProfile && MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled && MixedRealityToolkit.InputSystem?.FocusProvider != null;
 
         private void OnEnable()
         {

Assets/MixedRealityToolkit/Inspectors/Utilities/CanvasEditorExtension.cs

@@ -43,7 +43,7 @@ public static bool CheckMixedRealityConfigured(bool showHelpBox = true)
                 MixedRealityToolkit.ConfirmInitialized();
             }
 
-            if (!MixedRealityToolkit.HasActiveProfile)
+            if (!MixedRealityToolkit.Instance.HasActiveProfile)
             {
                 if (showHelpBox)
                 {

Assets/MixedRealityToolkit/Inspectors/Utilities/MixedRealityInspectorUtility.cs

@@ -19,7 +19,7 @@ public interface IMixedRealityServiceRegistrar
         /// </summary>
         /// <typeparam name="T">The interface type of the service to be registered (ex: IMixedRealityBoundarySystem).</typeparam>
         /// <param name="serviceInstance">An instance of the service to be registered.</param>
-        bool RegisterService<T>(IMixedRealityService serviceInstance) where T : IMixedRealityService;
+        bool RegisterService<T>(T serviceInstance) where T : IMixedRealityService;
 
         /// <summary>
         /// Registers a service of the specified type.
@@ -68,18 +68,13 @@ bool RegisterService<T>(
         /// <returns>The registered service instance as the requested type.</returns>
         T GetService<T>(string name = null, bool showLogs = true) where T : IMixedRealityService;
 
-        /// <summary>
-        /// Gets the collection of the registered service instances matching the requested type.
-        /// </summary>
-        /// <returns>Read-only collection of the service instances, as IMixedRealityService.</returns>
-        IReadOnlyList<IMixedRealityService> GetServices();
-
         /// <summary>
         /// Gets the collection of the registered service instances matching the requested type.
         /// </summary>
         /// <typeparam name="T">The interface type of the service (ex: IMixedRealityBoundarySystem).
+        /// <param name="name">Friendly name of the service.</param>
         /// <returns>Read-only collection of the service instances, as tye requested type.</returns>
-        IReadOnlyList<T> GetServices<T>() where T : IMixedRealityService;
+        IReadOnlyList<T> GetServices<T>(string name = null) where T : IMixedRealityService;
 
         #endregion IMixedRealityServce registration