Merge pull request #3640 from davidkline-ms/serviceRegistrar

Service registrar interface (#3545 part 1)

Author: David Kline

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs

@@ -159,7 +159,7 @@ public void RemoveHandler(IInteractableHandler handler)
         #region InspectorHelpers
         public static bool TryGetInputActions(out string[] descriptionsArray)
         {
-            if (!MixedRealityToolkit.IsInitialized || !MixedRealityToolkit.HasActiveProfile)
+            if (!MixedRealityToolkit.IsInitialized || !MixedRealityToolkit.Instance.HasActiveProfile)
             {
                 descriptionsArray = null;
                 return false;

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

@@ -34,12 +34,12 @@ public void Test01_CreateMixedRealityInputSystem()
             MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile = inputSystemProfile;
 
             // Add Input System
-            MixedRealityToolkit.Instance.RegisterService(typeof(IMixedRealityInputSystem), new MixedRealityInputSystem());
+            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

@@ -95,7 +95,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)
                 {