Improve enabled state checking for XR SDK

Author: keveleigh

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

@@ -7,11 +7,12 @@
 using System;
 using UnityEngine.XR;
 
-#if OCULUSINTEGRATION_PRESENT
-using System.Collections.Generic;
 #if OCULUS_ENABLED
 using Unity.XR.Oculus;
 #endif // OCULUS_ENABLED
+
+#if OCULUSINTEGRATION_PRESENT
+using System.Collections.Generic;
 using UnityEngine;
 #endif // OCULUSINTEGRATION_PRESENT
 
@@ -137,7 +138,6 @@ protected override SupportedControllerType GetCurrentControllerType(InputDevice
 
         #endregion Controller Utilities
 
-#if OCULUSINTEGRATION_PRESENT
         private bool? isActiveLoader = null;
         private bool IsActiveLoader
         {
@@ -159,16 +159,19 @@ public override void Enable()
         {
             if (!IsActiveLoader)
             {
+                IsEnabled = false;
                 return;
             }
 
             base.Enable();
 
+#if OCULUSINTEGRATION_PRESENT
             SetupInput();
             ConfigurePerformancePreferences();
+#endif // OCULUSINTEGRATION_PRESENT
         }
 
-
+#if OCULUSINTEGRATION_PRESENT
         /// <inheritdoc/>
         public override void Update()
         {
@@ -349,6 +352,6 @@ private void RemoveHandDevice(OculusHand handDevice)
         }
 
         #endregion
-#endif
+#endif // OCULUSINTEGRATION_PRESENT
     }
 }

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

@@ -50,36 +50,30 @@ 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");
+                    isActiveLoader = IsLoaderActive("Windows MR Loader");
                 }
 
                 return isActiveLoader ?? false;
             }
         }
-#endif // WMR_ENABLED
 
         #region IMixedRealityDeviceManager Interface
 
-#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
-        private IMixedRealityGazeProviderHeadOverride mixedRealityGazeProviderHeadOverride = null;
-
         /// <inheritdoc />
         public override void Enable()
         {
-#if WMR_ENABLED
             if (!IsActiveLoader)
             {
+                IsEnabled = false;
                 return;
             }
-#endif // WMR_ENABLED
 
             base.Enable();
 
@@ -88,7 +82,9 @@ public override void Enable()
                 WindowsMixedRealityUtilities.UtilitiesProvider = new XRSDKWindowsMixedRealityUtilitiesProvider();
             }
 
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
             mixedRealityGazeProviderHeadOverride = Service?.GazeProvider as IMixedRealityGazeProviderHeadOverride;
+#endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
 
 #if HP_CONTROLLER_ENABLED
             // Listens to events to track the HP Motion Controller
@@ -99,6 +95,9 @@ public override void Enable()
 #endif // HP_CONTROLLER_ENABLED
         }
 
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+        private IMixedRealityGazeProviderHeadOverride mixedRealityGazeProviderHeadOverride = null;
+
         /// <inheritdoc />
         public override void Update()
         {
@@ -186,13 +185,6 @@ public override bool CheckCapability(MixedRealityCapability capability)
 
         protected override GenericXRSDKController GetOrAddController(InputDevice inputDevice)
         {
-#if WMR_ENABLED
-            if (!IsActiveLoader)
-            {
-                return null;
-            }
-#endif // WMR_ENABLED
-
             using (GetOrAddControllerPerfMarker.Auto())
             {
                 GenericXRSDKController detectedController = base.GetOrAddController(inputDevice);
@@ -265,13 +257,6 @@ private uint GetControllerId(InputDevice inputDevice)
         /// <inheritdoc />
         protected override Type GetControllerType(SupportedControllerType supportedControllerType)
         {
-#if WMR_ENABLED
-            if (!IsActiveLoader)
-            {
-                return null;
-            }
-#endif // WMR_ENABLED
-
             switch (supportedControllerType)
             {
                 case SupportedControllerType.WindowsMixedReality:

Assets/MRTK/Providers/XRSDK/XRSDKDeviceManager.cs

@@ -79,6 +79,11 @@ public override void Update()
         {
             using (UpdatePerfMarker.Auto())
             {
+                if (!IsEnabled)
+                {
+                    return;
+                }
+
                 base.Update();
 
                 if (XRSubsystemHelpers.InputSubsystem == null || !XRSubsystemHelpers.InputSubsystem.running)