Merge pull request #9338 from keveleigh/fix-wmr

keveleigh · web-flow · commit 3e3a980ec4f2 · 2021-02-18T15:58:55.000-08:00
Update XR SDK loader checking in data providers
diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs b/Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs
@@ -5,14 +5,16 @@
 using Microsoft.MixedReality.Toolkit.Utilities;
 using Microsoft.MixedReality.Toolkit.XRSDK.Input;
 using System;
-using System.Linq;
-using System.Collections.Generic;
-#if OCULUSINTEGRATION_PRESENT
+using UnityEngine.XR;
+
+#if OCULUS_ENABLED
 using Unity.XR.Oculus;
-#endif
+#endif // OCULUS_ENABLED
+
+#if OCULUSINTEGRATION_PRESENT
+using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.XR;
-using UnityEngine.XR.Management;
+#endif // OCULUSINTEGRATION_PRESENT
 
 namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
 {
@@ -55,14 +57,11 @@ public override void Initialize()
         private OVRCameraRig cameraRig;
 
         private OVRHand rightHand;
-        private OVRMeshRenderer rightMeshRenderer;
         private OVRSkeleton rightSkeleton;
 
         private OVRHand leftHand;
-        private OVRMeshRenderer leftMeshRenderer;
         private OVRSkeleton leftSkeleton;
 
-
         /// <summary>
         /// The profile that contains settings for the Oculus XRSDK Device Manager input data provider.  This profile is nested under 
         /// Input > Input Data Providers > Oculus XRSDK Device Manager in the MixedRealityToolkit object in the hierarchy.
@@ -139,26 +138,50 @@ 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)
             {
+                IsEnabled = false;
                 return;
             }
 
+            base.Enable();
+
+#if OCULUSINTEGRATION_PRESENT
             SetupInput();
             ConfigurePerformancePreferences();
+#endif // OCULUSINTEGRATION_PRESENT
         }
 
-
+#if OCULUSINTEGRATION_PRESENT
         /// <inheritdoc/>
         public override void Update()
         {
+            if (!IsEnabled)
+            {
+                return;
+            }
+
             base.Update();
+
             if (OVRPlugin.GetHandTrackingEnabled())
             {
                 UpdateHands();
@@ -203,7 +226,7 @@ private void SetupInput()
             }
 
             bool useAvatarHands = SettingsProfile.RenderAvatarHandsInsteadOfController;
-            // If using Avatar hands, de-activate ovr controller rendering
+            // If using Avatar hands, deactivate ovr controller rendering
             foreach (var controllerHelper in cameraRig.gameObject.GetComponentsInChildren<OVRControllerHelper>())
             {
                 controllerHelper.gameObject.SetActive(!useAvatarHands);
@@ -280,8 +303,7 @@ private OculusHand GetOrAddHand(Handedness handedness, OVRHand ovrHand)
             var pointers = RequestPointers(SupportedControllerType.ArticulatedHand, handedness);
             var inputSourceType = InputSourceType.Hand;
 
-            IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
-            var inputSource = inputSystem?.RequestNewGenericInputSource($"Oculus Quest {handedness} Hand", pointers, inputSourceType);
+            var inputSource = Service?.RequestNewGenericInputSource($"Oculus Quest {handedness} Hand", pointers, inputSourceType);
 
 
             OculusHand handDevice = new OculusHand(TrackingState.Tracked, handedness, inputSource);
@@ -292,7 +314,7 @@ private OculusHand GetOrAddHand(Handedness handedness, OVRHand ovrHand)
                 handDevice.InputSource.Pointers[i].Controller = handDevice;
             }
 
-            inputSystem?.RaiseSourceDetected(handDevice.InputSource, handDevice);
+            Service?.RaiseSourceDetected(handDevice.InputSource, handDevice);
 
             trackedHands.Add(handedness, handDevice);
 
@@ -330,6 +352,6 @@ private void RemoveHandDevice(OculusHand handDevice)
         }
 
         #endregion
-#endif
+#endif // OCULUSINTEGRATION_PRESENT
     }
 }
diff --git a/Assets/MRTK/Providers/OpenXR/MRTK.OpenXR.asmdef b/Assets/MRTK/Providers/OpenXR/MRTK.OpenXR.asmdef
@@ -5,6 +5,7 @@
         "Microsoft.MixedReality.OpenXR",
         "Microsoft.MixedReality.Toolkit",
         "Microsoft.MixedReality.Toolkit.Providers.XRSDK",
+        "Unity.XR.Management",
         "Unity.XR.OpenXR"
     ],
     "includePlatforms": [
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRDeviceManager.cs b/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRDeviceManager.cs
@@ -8,6 +8,10 @@
 using Unity.Profiling;
 using UnityEngine.XR;
 
+#if UNITY_OPENXR
+using UnityEngine.XR.OpenXR;
+#endif // UNITY_OPENXR
+
 namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR
 {
     [MixedRealityDataProvider(
@@ -29,6 +33,34 @@ public OpenXRDeviceManager(
             uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(inputSystem, name, priority, profile) { }
 
+        private bool? isActiveLoader = null;
+        private bool IsActiveLoader
+        {
+            get
+            {
+#if UNITY_OPENXR
+                if (!isActiveLoader.HasValue)
+                {
+                    isActiveLoader = IsLoaderActive<OpenXRLoader>();
+                }
+#endif // UNITY_OPENXR
+
+                return isActiveLoader ?? false;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Enable()
+        {
+            if (!IsActiveLoader)
+            {
+                IsEnabled = false;
+                return;
+            }
+
+            base.Enable();
+        }
+
         #region Controller Utilities
 
         private static readonly ProfilerMarker GetOrAddControllerPerfMarker = new ProfilerMarker("[MRTK] OpenXRDeviceManager.GetOrAddController");
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/MRTK.WMR.XRSDK.asmdef b/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",
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityDeviceManager.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityDeviceManager.cs
@@ -4,23 +4,16 @@
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using Microsoft.MixedReality.Toolkit.Windows.Utilities;
+using Microsoft.MixedReality.Toolkit.WindowsMixedReality;
 using Microsoft.MixedReality.Toolkit.XRSDK.Input;
 using System;
-using System.Linq;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEngine.XR;
-using UnityEngine.XR.Management;
-#if WMR_ENABLED
-using UnityEngine.XR.WindowsMR;
-#endif
-using Unity.Profiling;
-using Microsoft.MixedReality.Toolkit.WindowsMixedReality;
 
 #if HP_CONTROLLER_ENABLED
 using Microsoft.MixedReality.Input;
 using MotionControllerHandedness = Microsoft.MixedReality.Input.Handedness;
-using Handedness = Microsoft.MixedReality.Toolkit.Utilities.Handedness;
+using System.Collections.Generic;
+using Unity.Profiling;
 #endif
 
 #if WINDOWS_UWP
@@ -57,42 +50,64 @@ public WindowsMixedRealityDeviceManager(
             uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(inputSystem, name, priority, profile) { }
 
-        #region IMixedRealityDeviceManager Interface
+        private bool? isActiveLoader = null;
+        private bool IsActiveLoader
+        {
+            get
+            {
+#if WMR_ENABLED
+                if (!isActiveLoader.HasValue)
+                {
+                    isActiveLoader = IsLoaderActive("Windows MR Loader");
+                }
+#endif // WMR_ENABLED
 
-#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
-        private IMixedRealityGazeProviderHeadOverride mixedRealityGazeProviderHeadOverride = null;
+                return isActiveLoader ?? false;
+            }
+        }
+
+        #region IMixedRealityDeviceManager Interface
 
         /// <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)
             {
+                IsEnabled = false;
                 return;
             }
-#endif
+
+            base.Enable();
 
             if (WindowsMixedRealityUtilities.UtilitiesProvider == null)
             {
                 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
             motionControllerWatcher = new MotionControllerWatcher();
             motionControllerWatcher.MotionControllerAdded += AddTrackedMotionController;
             motionControllerWatcher.MotionControllerRemoved += RemoveTrackedMotionController;
             var nowait = motionControllerWatcher.StartAsync();
-#endif
+#endif // HP_CONTROLLER_ENABLED
         }
 
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+        private IMixedRealityGazeProviderHeadOverride mixedRealityGazeProviderHeadOverride = null;
+
         /// <inheritdoc />
         public override void Update()
         {
+            if (!IsEnabled)
+            {
+                return;
+            }
+
             // Override gaze before base.Update() updates the controllers
             if (mixedRealityGazeProviderHeadOverride != null && mixedRealityGazeProviderHeadOverride.UseHeadGazeOverride && WindowsMixedRealityUtilities.SpatialCoordinateSystem != null)
             {
@@ -152,6 +167,10 @@ public override bool CheckCapability(MixedRealityCapability capability)
             return false;
         }
 
+        #endregion IMixedRealityCapabilityCheck Implementation
+
+        #region Controller Utilities
+
 #if HP_CONTROLLER_ENABLED
         private MotionControllerWatcher motionControllerWatcher;
 
@@ -161,24 +180,11 @@ public override bool CheckCapability(MixedRealityCapability capability)
         private readonly Dictionary<uint, MotionControllerState> trackedMotionControllerStates = new Dictionary<uint, MotionControllerState>();
 
         private readonly Dictionary<uint, GenericXRSDKController> activeMotionControllers = new Dictionary<uint, GenericXRSDKController>();
-#endif
-
-        #endregion IMixedRealityCapabilityCheck Implementation
-
-        #region Controller Utilities
 
-#if HP_CONTROLLER_ENABLED
         private static readonly ProfilerMarker GetOrAddControllerPerfMarker = new ProfilerMarker("[MRTK] WindwosMixedRealityXRSDKDeviceManager.GetOrAddController");
 
         protected override GenericXRSDKController GetOrAddController(InputDevice inputDevice)
         {
-#if WMR_ENABLED
-            if (!XRGeneralSettings.Instance.Manager.loaders.Any(l => l is WindowsMRLoader loader && loader.displaySubsystem != null))
-            {
-                return null;
-            }
-#endif
-
             using (GetOrAddControllerPerfMarker.Auto())
             {
                 GenericXRSDKController detectedController = base.GetOrAddController(inputDevice);
@@ -228,39 +234,29 @@ private void RemoveTrackedMotionController(object sender, MotionController motio
                 }
             }
         }
-#endif
 
-#if HP_CONTROLLER_ENABLED
-        // Creates a unique key for the controller based on it's vendor ID, product ID, version number, and handedness
+        // Creates a unique key for the controller based on its vendor ID, product ID, version number, and handedness
         private uint GetControllerId(uint handedness)
         {
             return handedness;
         }
 
-#if HP_CONTROLLER_ENABLED
         private uint GetControllerId(MotionController mc)
         {
-            var handedness = ((uint)(mc.Handedness == MotionControllerHandedness.Right ? 2 : (mc.Handedness == MotionControllerHandedness.Left ? 1 : 0)));
+            var handedness = (uint)(mc.Handedness == MotionControllerHandedness.Right ? 2 : (mc.Handedness == MotionControllerHandedness.Left ? 1 : 0));
             return GetControllerId(handedness);
         }
-#endif
 
         private uint GetControllerId(InputDevice inputDevice)
         {
-            var handedness = ((uint)(inputDevice.characteristics.HasFlag(InputDeviceCharacteristics.Right) ? 2 : inputDevice.characteristics.HasFlag(InputDeviceCharacteristics.Left) ? 1 : 0));
+            var handedness = (uint)(inputDevice.characteristics.HasFlag(InputDeviceCharacteristics.Right) ? 2 : (inputDevice.characteristics.HasFlag(InputDeviceCharacteristics.Left) ? 1 : 0));
             return GetControllerId(handedness);
         }
-#endif
+#endif // HP_CONTROLLER_ENABLED
 
         /// <inheritdoc />
         protected override Type GetControllerType(SupportedControllerType supportedControllerType)
         {
-#if WMR_ENABLED
-            if (!XRGeneralSettings.Instance.Manager.loaders.Any(l => l is WindowsMRLoader loader && loader.displaySubsystem != null))
-            {
-                return null;
-            }
-#endif
             switch (supportedControllerType)
             {
                 case SupportedControllerType.WindowsMixedReality:
diff --git a/Assets/MRTK/Providers/XRSDK/MRTK.XRSDK.asmdef b/Assets/MRTK/Providers/XRSDK/MRTK.XRSDK.asmdef
@@ -2,6 +2,7 @@
     "name": "Microsoft.MixedReality.Toolkit.Providers.XRSDK",
     "references": [
         "Microsoft.MixedReality.Toolkit",
+        "Unity.XR.Management",
         "UnityEngine.SpatialTracking"
     ],
     "includePlatforms": [],
@@ -18,6 +19,11 @@
             "name": "com.unity.xr.legacyinputhelpers",
             "expression": "",
             "define": "SPATIALTRACKING_ENABLED"
+        },
+        {
+            "name": "com.unity.xr.management",
+            "expression": "",
+            "define": "XR_MANAGEMENT_ENABLED"
         }
     ],
     "noEngineReferences": false
diff --git a/Assets/MRTK/Providers/XRSDK/XRSDKDeviceManager.cs b/Assets/MRTK/Providers/XRSDK/XRSDKDeviceManager.cs
