Update Oculus and WMR with IsActiveLoader pattern

Author: keveleigh

Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs

@@ -5,7 +5,6 @@
 using Microsoft.MixedReality.Toolkit.Utilities;
 using Microsoft.MixedReality.Toolkit.XRSDK.Input;
 using System;
-using System.Linq;
 using UnityEngine.XR;
 
 #if OCULUSINTEGRATION_PRESENT
@@ -14,7 +13,6 @@
 using Unity.XR.Oculus;
 #endif // OCULUS_ENABLED
 using UnityEngine;
-using UnityEngine.XR.Management;
 #endif // OCULUSINTEGRATION_PRESENT
 
 namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
@@ -140,16 +138,32 @@ protected override SupportedControllerType GetCurrentControllerType(InputDevice
         #endregion Controller Utilities
 
 #if OCULUSINTEGRATION_PRESENT
+        private bool? isActiveLoader = null;
+        private bool IsActiveLoader
+        {
+            get
+            {
+#if OCULUS_ENABLED
+                if (!isActiveLoader.HasValue)
+                {
+                    isActiveLoader = IsLoaderActive<OculusLoader>();
+                }
+#endif // OCULUS_ENABLED
+
+                return isActiveLoader ?? false;
+            }
+        }
+
         /// <inheritdoc/>
         public override void Enable()
         {
-            base.Enable();
-            if (!XRGeneralSettings.Instance.Manager.loaders.Any(l => l is OculusLoader loader && loader.displaySubsystem != null))
-
+            if (!IsActiveLoader)
             {
                 return;
             }
 
+            base.Enable();
+
             SetupInput();
             ConfigurePerformancePreferences();
         }
@@ -158,6 +172,11 @@ public override void Enable()
         /// <inheritdoc/>
         public override void Update()
         {
+            if (!IsEnabled)
+            {
+                return;
+            }
+
             base.Update();
 
             if (OVRPlugin.GetHandTrackingEnabled())

Assets/MRTK/Providers/WindowsMixedReality/XRSDK/MRTK.WMR.XRSDK.asmdef

@@ -4,8 +4,7 @@
         "Microsoft.MixedReality.Toolkit",
         "Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality.Shared",
         "Microsoft.MixedReality.Toolkit.Providers.XRSDK",
-        "Unity.XR.WindowsMixedReality",
-        "Unity.XR.Management"
+        "Unity.XR.WindowsMixedReality"
     ],
     "includePlatforms": [
         "Editor",

Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityDeviceManager.cs

@@ -50,6 +50,22 @@ public WindowsMixedRealityDeviceManager(
             uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(inputSystem, name, priority, profile) { }
 
+#if WMR_ENABLED
+        private bool? isActiveLoader = null;
+        private bool IsActiveLoader
+        {
+            get
+            {
+                if (!isActiveLoader.HasValue)
+                {
+                    isActiveLoader = IsLoaderActive("WindowsMRLoader");
+                }
+
+                return isActiveLoader ?? false;
+            }
+        }
+#endif // WMR_ENABLED
+
         #region IMixedRealityDeviceManager Interface
 
 #if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
@@ -58,15 +74,15 @@ public WindowsMixedRealityDeviceManager(
         /// <inheritdoc />
         public override void Enable()
         {
-            base.Enable();
-
 #if WMR_ENABLED
-            if (!XRGeneralSettings.Instance.Manager.loaders.Any(l => l is WindowsMRLoader loader && loader.displaySubsystem != null))
+            if (!IsActiveLoader)
             {
                 return;
             }
 #endif // WMR_ENABLED
 
+            base.Enable();
+
             if (WindowsMixedRealityUtilities.UtilitiesProvider == null)
             {
                 WindowsMixedRealityUtilities.UtilitiesProvider = new XRSDKWindowsMixedRealityUtilitiesProvider();
@@ -86,6 +102,11 @@ public override void Enable()
         /// <inheritdoc />
         public override void Update()
         {
+            if (!IsEnabled)
+            {
+                return;
+            }
+
             // Override gaze before base.Update() updates the controllers
             if (mixedRealityGazeProviderHeadOverride != null && mixedRealityGazeProviderHeadOverride.UseHeadGazeOverride && WindowsMixedRealityUtilities.SpatialCoordinateSystem != null)
             {
@@ -166,7 +187,7 @@ public override bool CheckCapability(MixedRealityCapability capability)
         protected override GenericXRSDKController GetOrAddController(InputDevice inputDevice)
         {
 #if WMR_ENABLED
-            if (!XRGeneralSettings.Instance.Manager.loaders.Any(l => l is WindowsMRLoader loader && loader.displaySubsystem != null))
+            if (!IsActiveLoader)
             {
                 return null;
             }
@@ -245,7 +266,7 @@ private uint GetControllerId(InputDevice inputDevice)
         protected override Type GetControllerType(SupportedControllerType supportedControllerType)
         {
 #if WMR_ENABLED
-            if (!XRGeneralSettings.Instance.Manager.loaders.Any(l => l is WindowsMRLoader loader && loader.displaySubsystem != null))
+            if (!IsActiveLoader)
             {
                 return null;
             }