Merge pull request #7093 from keveleigh/cherrypicked-input-helpers

XR SDK input helpers

Author: keveleigh

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/Extensions.meta

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+using Microsoft.MixedReality.Toolkit.Utilities;
+using Windows.UI.Input.Spatial;
+#endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+
+namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
+{
+    /// <summary>
+    /// Provides useful extensions for Windows-defined types.
+    /// </summary>
+    public static class WindowsExtensions
+    {
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+        /// <summary>
+        /// Converts a platform <see cref="SpatialInteractionSourceHandedness"/> into
+        /// the equivalent value in MRTK's defined <see cref="Handedness"/>.
+        /// </summary>
+        /// <param name="handedness">The handedness value to convert.</param>
+        /// <returns>The converted value in the new type.</returns>
+        public static Handedness ToMRTKHandedness(this SpatialInteractionSourceHandedness handedness)
+        {
+            switch (handedness)
+            {
+                case SpatialInteractionSourceHandedness.Left:
+                    return Handedness.Left;
+                case SpatialInteractionSourceHandedness.Right:
+                    return Handedness.Right;
+                case SpatialInteractionSourceHandedness.Unspecified:
+                default:
+                    return Handedness.None;
+            }
+        }
+#endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+    }
+}

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/Extensions/WindowsExtensions.cs

@@ -10,6 +10,9 @@
 
 namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
 {
+    /// <summary>
+    /// An implementation of <see cref="IWindowsMixedRealityUtilitiesProvider"/> for Unity's in-box XR pipeline.
+    /// </summary>
     public class WindowsMixedRealityUtilitiesProvider : IWindowsMixedRealityUtilitiesProvider
     {
         /// <inheritdoc />

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/Extensions/WindowsExtensions.cs.meta

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.MixedReality.Toolkit.WindowsMixedReality;
+using System;
+
+#if WMR_ENABLED
+using UnityEngine.XR.WindowsMR;
+#endif // WMR_ENABLED
+
+namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
+{
+    /// <summary>
+    /// An implementation of <see cref="Toolkit.WindowsMixedReality.IWindowsMixedRealityUtilitiesProvider"/> for Unity's XR SDK pipeline.
+    /// </summary>
+    public class XRSDKWindowsMixedRealityUtilitiesProvider : IWindowsMixedRealityUtilitiesProvider
+    {
+        /// <inheritdoc />
+        IntPtr IWindowsMixedRealityUtilitiesProvider.ISpatialCoordinateSystemPtr =>
+#if WMR_ENABLED
+            WindowsMREnvironment.OriginSpatialCoordinateSystem;
+#else
+            IntPtr.Zero;
+#endif
+
+        /// <inheritdoc />
+        IntPtr IWindowsMixedRealityUtilitiesProvider.IHolographicFramePtr
+        {
+            get
+            {
+                // NOTE: Currently unable to access HolographicFrame in XR SDK.
+                return IntPtr.Zero;
+            }
+        }
+    }
+}

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityUtilitiesProvider.cs

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 7612acbc1a4a4ed0afa5f4ccbe42bee4, type: 3}
-  m_Name: DefaultXRSDKToolkitConfigurationProfile
+  m_Name: DefaultXRSDKConfigurationProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
   targetExperienceScale: 3