Merge remote-tracking branch 'public/prerelease/2.3.0_stabilization' into user/bethalha/bc_example_patch

Author: bethalha-havok

Assets/MixedRealityToolkit.Examples/Demos/Input/Scenes/InputActions/InputActions.MixedRealityControllerMappingProfile.asset

@@ -11,7 +11,7 @@
 namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
 {
     /// <summary>
-    /// Manages Open VR Devices using unity's input system.
+    /// Manages Open VR devices using Unity's input system.
     /// </summary>
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),

Assets/MixedRealityToolkit.Providers/OpenVR/OpenVRDeviceManager.cs

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+using Microsoft.MixedReality.Toolkit.Utilities;
+#if WINDOWS_UWP
+using Windows.UI.Input.Spatial;
+#elif DOTNETWINRT_PRESENT
+using Microsoft.Windows.UI.Input.Spatial;
+#endif
+#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.meta

@@ -14,3 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isCustomProfile: 0
   renderFromPVCameraForMixedRealityCapture: 0
+  reprojectionMethod: 0

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

@@ -27,7 +27,7 @@
 namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
 {
     /// <summary>
-    /// A Windows Mixed Reality Controller Instance.
+    /// A Windows Mixed Reality articulated hand instance.
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.ArticulatedHand,
@@ -73,6 +73,7 @@ public bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose)
 
         #endregion IMixedRealityHand Implementation
 
+        /// <inheritdoc/>
         public override bool IsInPointingPose
         {
             get
@@ -170,8 +171,6 @@ protected void InitializeUVs(Vector3[] neutralPoseVertices)
             float minY = neutralPoseVertices[0].y;
             float maxY = minY;
 
-            float maxMagnitude = 0.0f;
-
             for (int ix = 1; ix < neutralPoseVertices.Length; ix++)
             {
                 Vector3 p = neutralPoseVertices[ix];
@@ -184,11 +183,8 @@ protected void InitializeUVs(Vector3[] neutralPoseVertices)
                 {
                     maxY = p.y;
                 }
-                float d = p.x * p.x + p.y * p.y;
-                if (d > maxMagnitude) maxMagnitude = d;
             }
 
-            maxMagnitude = Mathf.Sqrt(maxMagnitude);
             float scale = 1.0f / (maxY - minY);
 
             handMeshUVs = new Vector2[neutralPoseVertices.Length];
@@ -231,7 +227,14 @@ private void UpdateHandData(InteractionSourceState interactionSourceState)
                     HandPose handPose = sourceState.TryGetHandPose();
 
 #if WINDOWS_UWP
-                    if (CoreServices.InputSystem.InputSystemProfile.HandTrackingProfile.EnableHandMeshVisualization)
+                    MixedRealityHandTrackingProfile handTrackingProfile = null;
+                    MixedRealityInputSystemProfile inputSystemProfile = CoreServices.InputSystem?.InputSystemProfile;
+                    if (inputSystemProfile != null)
+                    {
+                        handTrackingProfile = inputSystemProfile.HandTrackingProfile;
+                    }
+
+                    if (handTrackingProfile != null && handTrackingProfile.EnableHandMeshVisualization)
                     {
                         // Accessing the hand mesh data involves copying quite a bit of data, so only do it if application requests it.
                         if (handMeshObserver == null && !hasRequestedHandMeshObserver)

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

@@ -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/Profiles/DefaultWindowsMixedRealityCameraSettingsProfile.asset

@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.MixedReality.Toolkit.Input;
+using Microsoft.MixedReality.Toolkit.Utilities;
+using Microsoft.MixedReality.Toolkit.XRSDK.Input;
+using UnityEngine;
+using UnityEngine.XR;
+
+#if WMR_ENABLED
+using Unity.XR.WindowsMR;
+#endif // WMR_ENABLED
+
+namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
+{
+    /// <summary>
+    /// A Windows Mixed Reality source instance.
+    /// </summary>
+    public abstract class BaseWindowsMixedRealityXRSDKSource : GenericXRSDKController
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        protected BaseWindowsMixedRealityXRSDKSource(TrackingState trackingState, Handedness sourceHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+                : base(trackingState, sourceHandedness, inputSource, interactions) { }
+
+#if WMR_ENABLED
+        private Vector3 currentPointerPosition = Vector3.zero;
+        private Quaternion currentPointerRotation = Quaternion.identity;
+        private MixedRealityPose currentPointerPose = MixedRealityPose.ZeroIdentity;
+
+        /// <summary>
+        /// Update spatial pointer and spatial grip data.
+        /// </summary>
+        protected override void UpdatePoseData(MixedRealityInteractionMapping interactionMapping, InputDevice inputDevice)
+        {
+            Debug.Assert(interactionMapping.AxisType == AxisType.SixDof);
+
+            base.UpdatePoseData(interactionMapping, inputDevice);
+
+            // Update the interaction data source
+            switch (interactionMapping.InputType)
+            {
+                case DeviceInputType.SpatialPointer:
+                    if (inputDevice.TryGetFeatureValue(WindowsMRUsages.PointerPosition, out currentPointerPosition))
+                    {
+                        currentPointerPose.Position = MixedRealityPlayspace.TransformPoint(currentPointerPosition);
+                    }
+
+                    if (inputDevice.TryGetFeatureValue(WindowsMRUsages.PointerRotation, out currentPointerRotation))
+                    {
+                        currentPointerPose.Rotation = MixedRealityPlayspace.Rotation * currentPointerRotation;
+                    }
+
+                    interactionMapping.PoseData = currentPointerPose;
+
+                    // If our value changed raise it.
+                    if (interactionMapping.Changed)
+                    {
+                        // Raise input system event if it's enabled
+                        CoreServices.InputSystem?.RaisePoseInputChanged(InputSource, ControllerHandedness, interactionMapping.MixedRealityInputAction, interactionMapping.PoseData);
+                    }
+                    break;
+                default:
+                    return;
+            }
+        }
+#endif // WMR_ENABLED
+    }
+}