Refactor out IWindowsMixedRealityUtilitiesProvider

for Unity backend-specific implementations

Author: keveleigh

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Definitions/HolographicFrameNativeData.cs

@@ -24,12 +24,12 @@ public struct HolographicFrameNativeData
         public uint MaxNumberOfCameras;
 
         /// <summary>
-        /// The current native root <see href="https://docs.microsoft.com/uwp/api/windows.perception.spatial.spatialcoordinatesystem">ISpatialCoordinateSystem</see>).
+        /// The current native root <see href="https://docs.microsoft.com/uwp/api/windows.perception.spatial.spatialcoordinatesystem">ISpatialCoordinateSystem</see>.
         /// </summary>
         public IntPtr ISpatialCoordinateSystemPtr;
 
         /// <summary>
-        /// The current native <see href="https://docs.microsoft.com/uwp/api/Windows.Graphics.Holographic.HolographicFrame">IHolographicFrame</see>).
+        /// The current native <see href="https://docs.microsoft.com/uwp/api/Windows.Graphics.Holographic.HolographicFrame">IHolographicFrame</see>.
         /// </summary>
         public IntPtr IHolographicFramePtr;
 

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/Definitions/IWindowsMixedRealityUtilitiesProvider.cs

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+
+namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
+{
+    public interface IWindowsMixedRealityUtilitiesProvider
+    {
+        /// <summary>
+        /// The current native root <see href="https://docs.microsoft.com/uwp/api/windows.perception.spatial.spatialcoordinatesystem">ISpatialCoordinateSystem</see>.
+        /// </summary>
+        IntPtr ISpatialCoordinateSystemPtr { get; }
+
+        /// <summary>
+        /// The current native <see href="https://docs.microsoft.com/uwp/api/Windows.Graphics.Holographic.HolographicFrame">IHolographicFrame</see>.
+        /// </summary>
+        IntPtr IHolographicFramePtr { get; }
+    }
+}

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/Definitions/IWindowsMixedRealityUtilitiesProvider.cs.meta

@@ -31,7 +31,7 @@ private void OnPostRender()
             if (isDepthReprojectionModeSupported &&
                 (ReprojectionMethod == HolographicDepthReprojectionMethod.AutoPlanar))
             {
-                Microsoft.Windows.Graphics.Holographic.HolographicFrame frame = Input.WindowsMixedRealityUtilities.CurrentHolographicFrame;
+                Microsoft.Windows.Graphics.Holographic.HolographicFrame frame = WindowsMixedRealityUtilities.CurrentHolographicFrame;
                 foreach (var cameraPose in frame?.CurrentPrediction.CameraPoses)
                 {
                     if (CameraSupportsAutoPlanar(cameraPose.HolographicCamera))

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/WindowsMixedRealityReprojectionUpdater.cs

@@ -7,7 +7,6 @@
 using Microsoft.MixedReality.Toolkit.Windows.Utilities;
 using UnityEngine;
 using System;
-using Microsoft.MixedReality.Toolkit.Utilities.Editor;
 
 #if UNITY_WSA
 using System.Collections.Generic;
@@ -321,6 +320,8 @@ public override void Enable()
 
             if (InputSystemProfile == null) { return; }
 
+            WindowsMixedRealityUtilities.WmrUtilitiesProvider = new WindowsMixedRealityUtilitiesProvider();
+
             if (InputSystemProfile.GesturesProfile != null)
             {
                 var gestureProfile = InputSystemProfile.GesturesProfile;

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs

@@ -4,7 +4,6 @@
 #if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
 using System;
 using System.Runtime.InteropServices;
-using UnityEngine.XR.WSA;
 #if WINDOWS_UWP
 using Windows.Perception.Spatial;
 #if DOTNETWINRT_PRESENT
@@ -18,7 +17,7 @@
 #endif
 #endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
 
-namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
+namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
 {
     public static class WindowsMixedRealityUtilities
     {
@@ -51,6 +50,8 @@ private static SpatialCoordinateSystem GetSpatialCoordinateSystem(IntPtr nativeP
         }
 #endif //ENABLE_DOTNET
 
+        public static IWindowsMixedRealityUtilitiesProvider WmrUtilitiesProvider { get; set; } = null;
+
         /// <summary>
         /// Access the underlying native spatial coordinate system.
         /// </summary>
@@ -62,18 +63,17 @@ public static SpatialCoordinateSystem SpatialCoordinateSystem
         {
             get
             {
+                if (spatialCoordinateSystem == null && WmrUtilitiesProvider != null)
+                {
 #if ENABLE_DOTNET
-                return spatialCoordinateSystem ?? (spatialCoordinateSystem = GetSpatialCoordinateSystem(WorldManager.GetNativeISpatialCoordinateSystemPtr()));
+                    spatialCoordinateSystem = GetSpatialCoordinateSystem(WmrUtilitiesProvider.ISpatialCoordinateSystemPtr);
 #elif WINDOWS_UWP
-                return spatialCoordinateSystem ?? (spatialCoordinateSystem = Marshal.GetObjectForIUnknown(WorldManager.GetNativeISpatialCoordinateSystemPtr()) as SpatialCoordinateSystem);
+                    spatialCoordinateSystem = Marshal.GetObjectForIUnknown(WmrUtilitiesProvider.ISpatialCoordinateSystemPtr) as SpatialCoordinateSystem;
 #elif DOTNETWINRT_PRESENT
-                var spatialCoordinateSystemPtr = WorldManager.GetNativeISpatialCoordinateSystemPtr();
-                if (spatialCoordinateSystem == null && spatialCoordinateSystemPtr != IntPtr.Zero)
-                {
-                    spatialCoordinateSystem = SpatialCoordinateSystem.FromNativePtr(WorldManager.GetNativeISpatialCoordinateSystemPtr());
+                    spatialCoordinateSystem = SpatialCoordinateSystem.FromNativePtr(WmrUtilitiesProvider.ISpatialCoordinateSystemPtr);
+#endif
                 }
                 return spatialCoordinateSystem;
-#endif
             }
         }
 
@@ -88,14 +88,15 @@ public static HolographicFrame CurrentHolographicFrame
         {
             get
             {
+                if (WmrUtilitiesProvider == null)
+                {
+                    return null;
+                }
+
 #if DOTNETWINRT_PRESENT
-                IntPtr nativePtr = UnityEngine.XR.XRDevice.GetNativePtr();
-                HolographicFrameNativeData hfd = Marshal.PtrToStructure<HolographicFrameNativeData>(nativePtr);
-                return HolographicFrame.FromNativePtr(hfd.IHolographicFramePtr);
+                return HolographicFrame.FromNativePtr(WmrUtilitiesProvider.IHolographicFramePtr);
 #elif WINDOWS_UWP
-                IntPtr nativePtr = UnityEngine.XR.XRDevice.GetNativePtr();
-                HolographicFrameNativeData hfd = Marshal.PtrToStructure<HolographicFrameNativeData>(nativePtr);
-                return Marshal.GetObjectForIUnknown(hfd.IHolographicFramePtr) as HolographicFrame;
+                return Marshal.GetObjectForIUnknown(WmrUtilitiesProvider.IHolographicFramePtr) as HolographicFrame;
 #else
                 return null;
 #endif
@@ -105,13 +106,13 @@ public static HolographicFrame CurrentHolographicFrame
         private static SpatialCoordinateSystem spatialCoordinateSystem = null;
 #endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
 
-        [System.Obsolete("Use the System.Numerics.Vector3 extension method ToUnityVector3 instead.")]
+        [Obsolete("Use the System.Numerics.Vector3 extension method ToUnityVector3 instead.")]
         public static UnityEngine.Vector3 SystemVector3ToUnity(System.Numerics.Vector3 vector)
         {
             return vector.ToUnityVector3();
         }
 
-        [System.Obsolete("Use the System.Numerics.Quaternion extension method ToUnityQuaternion instead.")]
+        [Obsolete("Use the System.Numerics.Quaternion extension method ToUnityQuaternion instead.")]
         public static UnityEngine.Quaternion SystemQuaternionToUnity(System.Numerics.Quaternion quaternion)
         {
             return quaternion.ToUnityQuaternion();

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityUtilities.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Runtime.InteropServices;
+using UnityEngine.XR.WSA;
+
+namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
+{
+    public class WindowsMixedRealityUtilitiesProvider : IWindowsMixedRealityUtilitiesProvider
+    {
+        /// <inheritdoc />
+        IntPtr IWindowsMixedRealityUtilitiesProvider.ISpatialCoordinateSystemPtr => WorldManager.GetNativeISpatialCoordinateSystemPtr();
+
+        /// <inheritdoc />
+        IntPtr IWindowsMixedRealityUtilitiesProvider.IHolographicFramePtr
+        {
+            get
+            {
+                IntPtr nativePtr = UnityEngine.XR.XRDevice.GetNativePtr();
+                HolographicFrameNativeData hfd = Marshal.PtrToStructure<HolographicFrameNativeData>(nativePtr);
+                return hfd.IHolographicFramePtr;
+            }
+        }
+    }
+}