Merge pull request #7205 from keveleigh/fix-cached-coordinate-system

Update cached coordinate system whenever the underlying IntPtr changes

Author: keveleigh

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

@@ -72,20 +72,27 @@ public static SpatialCoordinateSystem SpatialCoordinateSystem
         {
             get
             {
-                if (spatialCoordinateSystem == null && UtilitiesProvider != null && UtilitiesProvider.ISpatialCoordinateSystemPtr != IntPtr.Zero)
+                if (UtilitiesProvider != null)
                 {
+                    IntPtr newSpatialCoordinateSystemPtr = UtilitiesProvider.ISpatialCoordinateSystemPtr;
+                    if (newSpatialCoordinateSystemPtr != currentSpatialCoordinateSystemPtr && newSpatialCoordinateSystemPtr != IntPtr.Zero)
+                    {
 #if ENABLE_DOTNET
-                    spatialCoordinateSystem = GetSpatialCoordinateSystem(UtilitiesProvider.ISpatialCoordinateSystemPtr);
+                        spatialCoordinateSystem = GetSpatialCoordinateSystem(newSpatialCoordinateSystemPtr);
 #elif WINDOWS_UWP
-                    spatialCoordinateSystem = Marshal.GetObjectForIUnknown(UtilitiesProvider.ISpatialCoordinateSystemPtr) as SpatialCoordinateSystem;
+                        spatialCoordinateSystem = Marshal.GetObjectForIUnknown(newSpatialCoordinateSystemPtr) as SpatialCoordinateSystem;
 #elif DOTNETWINRT_PRESENT
-                    spatialCoordinateSystem = SpatialCoordinateSystem.FromNativePtr(UtilitiesProvider.ISpatialCoordinateSystemPtr);
+                        spatialCoordinateSystem = SpatialCoordinateSystem.FromNativePtr(newSpatialCoordinateSystemPtr);
 #endif
+                        currentSpatialCoordinateSystemPtr = newSpatialCoordinateSystemPtr;
+                    }
                 }
                 return spatialCoordinateSystem;
             }
         }
 
+        private static IntPtr currentSpatialCoordinateSystemPtr = IntPtr.Zero;
+
         /// <summary>
         /// Access the underlying native current holographic frame.
         /// </summary>

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XRSDK/XRSDKWindowsMixedRealityUtilitiesProvider.cs

@@ -23,14 +23,9 @@ public class XRSDKWindowsMixedRealityUtilitiesProvider : IWindowsMixedRealityUti
             IntPtr.Zero;
 #endif
 
-        /// <inheritdoc />
-        IntPtr IWindowsMixedRealityUtilitiesProvider.IHolographicFramePtr
-        {
-            get
-            {
-                // NOTE: Currently unable to access HolographicFrame in XR SDK.
-                return IntPtr.Zero;
-            }
-        }
+        /// <summary>
+        /// Currently unable to access HolographicFrame in XR SDK. Always returns IntPtr.Zero.
+        /// </summary>
+        IntPtr IWindowsMixedRealityUtilitiesProvider.IHolographicFramePtr => IntPtr.Zero;
     }
 }