Merge pull request #6722 from microsoft/prerelease/2.2.0_stabilization

Prerelease/2.2.0 stabilization -> dev

Author: David Kline

.gitignore

@@ -92,3 +92,10 @@ doc/
 /MSBuild/
 /PackagesCopy/
 !/scripts/Packaging/NuGetRestoreProject.csproj
+
+# ========================= #
+# MSBuildForUnity generated #
+# ========================= #
+Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/Plugins*
+MSBuildForUnity.Common.props
+.obj

Assets/MixedReality.Toolkit.Foundation.nuspec

@@ -12,6 +12,9 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality</tags>
+    <dependencies>
+      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1034" />
+    </dependencies>
     <contentFiles>
       <files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
     </contentFiles>

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter.meta

@@ -0,0 +1,33 @@
+<Project ToolsVersion="15.0">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
+
+  <PropertyGroup Condition="'$(UnityCurrentTargetFramework)' == ''">
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(UnityCurrentTargetFramework)' != ''">
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Make sure Unity ignores the contents of the intermediate output path. -->
+    <BaseIntermediateOutputPath>.obj</BaseIntermediateOutputPath>
+    <OutputPath>Plugins</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT">
+      <Version>0.5.1034</Version>
+    </PackageReference>
+    <PackageReference Include="MSBuildForUnity">
+      <Version>0.8.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Note that this is the special "NoTarget" SDK to prevent this project from producing a dll. -->
+  <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
+</Project>

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/DotNetAdapter.csproj

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+    <add key="MSBuildForUnity" value="https://pkgs.dev.azure.com/UnityDeveloperTools/MSBuildForUnity/_packaging/UnityDeveloperTools/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources />
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+</configuration>

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/DotNetAdapter.csproj.meta

@@ -5,18 +5,24 @@
 using Microsoft.MixedReality.Toolkit.Input;
 
 #if UNITY_WSA
-using UnityEngine;
 using UnityEngine.XR.WSA.Input;
-#endif
-
-#if WINDOWS_UWP
-using Microsoft.MixedReality.Toolkit.Windows.Utilities;
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
 using System;
 using System.Collections.Generic;
+using UnityEngine;
+#if WINDOWS_UWP
+using Windows.Foundation.Metadata;
 using Windows.Perception;
 using Windows.Perception.People;
 using Windows.UI.Input.Spatial;
+#elif DOTNETWINRT_PRESENT
+using Microsoft.Windows.Foundation.Metadata;
+using Microsoft.Windows.Perception;
+using Microsoft.Windows.Perception.People;
+using Microsoft.Windows.UI.Input.Spatial;
 #endif
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
+#endif // UNITY_WSA
 
 namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
 {
@@ -34,6 +40,9 @@ public class WindowsMixedRealityArticulatedHand : BaseWindowsMixedRealitySource,
         public WindowsMixedRealityArticulatedHand(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
                 : base(trackingState, controllerHandedness, inputSource, interactions)
         {
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
+            articulatedHandApiAvailable = ApiInformation.IsMethodPresent("Windows.UI.Input.Spatial.SpatialInteractionSourceState", "TryGetHandPose");
+#endif
         }
 
         /// <summary>
@@ -54,7 +63,7 @@ public WindowsMixedRealityArticulatedHand(TrackingState trackingState, Handednes
         /// <inheritdoc/>
         public bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose)
         {
-#if WINDOWS_UWP
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
             return unityJointPoses.TryGetValue(joint, out pose);
 #else
             pose = MixedRealityPose.ZeroIdentity;
@@ -69,7 +78,7 @@ public override bool IsInPointingPose
             get
             {
                 bool valid = true;
-#if WINDOWS_UWP
+#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
                 Vector3 palmNormal = unityJointOrientations[(int)HandJointKind.Palm] * (-1 * Vector3.up);
                 if (CursorBeamBackwardTolerance >= 0)
                 {
@@ -86,17 +95,16 @@ public override bool IsInPointingPose
                         valid = false;
                     }
                 }
-#endif // WINDOWS_UWP
+#endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
                 return valid;
             }
         }
 
 #if UNITY_WSA
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
         private MixedRealityPose currentIndexPose = MixedRealityPose.ZeroIdentity;
 
-        private readonly HandRay handRay = new HandRay();
-
-#if WINDOWS_UWP
+        private SpatialInteractionManager spatialInteractionManager = null;
         private SpatialInteractionManager SpatialInteractionManager
         {
             get
@@ -113,15 +121,18 @@ private SpatialInteractionManager SpatialInteractionManager
             }
         }
 
-        private SpatialInteractionManager spatialInteractionManager = null;
+#if WINDOWS_UWP
         private HandMeshObserver handMeshObserver = null;
         private int[] handMeshTriangleIndices = null;
         private bool hasRequestedHandMeshObserver = false;
         private Vector2[] handMeshUVs;
+#endif // WINDOWS_UWP
 
         private readonly float CursorBeamBackwardTolerance = 0.5f;
         private readonly float CursorBeamUpTolerance = 0.8f;
-#endif // WINDOWS_UWP
+
+        private readonly bool articulatedHandApiAvailable = false;
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
 
         #region Update data functions
 
@@ -194,19 +205,19 @@ private async void SetHandMeshObserver(SpatialInteractionSourceState sourceState
         {
             handMeshObserver = await sourceState.Source.TryCreateHandMeshObserverAsync();
         }
-#endif
+#endif // WINDOWS_UWP
 
         /// <summary>
         /// Update the hand data from the device.
         /// </summary>
         /// <param name="interactionSourceState">The InteractionSourceState retrieved from the platform.</param>
         private void UpdateHandData(InteractionSourceState interactionSourceState)
         {
-#if WINDOWS_UWP
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
             // Articulated hand support is only present in the 18362 version and beyond Windows
             // SDK (which contains the V8 drop of the Universal API Contract). In particular,
             // the HandPose related APIs are only present on this version and above.
-            if (!WindowsApiChecker.UniversalApiContractV8_IsAvailable)
+            if (!articulatedHandApiAvailable)
             {
                 return;
             }
@@ -219,6 +230,7 @@ private void UpdateHandData(InteractionSourceState interactionSourceState)
                 {
                     HandPose handPose = sourceState.TryGetHandPose();
 
+#if WINDOWS_UWP
                     if (CoreServices.InputSystem.InputSystemProfile.HandTrackingProfile.EnableHandMeshVisualization)
                     {
                         // Accessing the hand mesh data involves copying quite a bit of data, so only do it if application requests it.
@@ -301,6 +313,7 @@ private void UpdateHandData(InteractionSourceState interactionSourceState)
                             handMeshObserver = null;
                         }
                     }
+#endif // WINDOWS_UWP
 
                     if (handPose != null && handPose.TryGetJoints(WindowsMixedRealityUtilities.SpatialCoordinateSystem, jointIndices, jointPoses))
                     {
@@ -334,12 +347,12 @@ private void UpdateHandData(InteractionSourceState interactionSourceState)
                     }
                 }
             }
-#endif // WINDOWS_UWP
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
         }
 
         private void UpdateIndexFingerData(InteractionSourceState interactionSourceState, MixedRealityInteractionMapping interactionMapping)
         {
-#if WINDOWS_UWP
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
             UpdateCurrentIndexPose();
 
             // Update the interaction data source
@@ -351,12 +364,12 @@ private void UpdateIndexFingerData(InteractionSourceState interactionSourceState
                 // Raise input system event if it's enabled
                 CoreServices.InputSystem?.RaisePoseInputChanged(InputSource, ControllerHandedness, interactionMapping.MixedRealityInputAction, currentIndexPose);
             }
-#endif // WINDOWS_UWP
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
         }
 
         #endregion Update data functions
 
-#if WINDOWS_UWP
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
         private static readonly HandJointKind[] jointIndices = new HandJointKind[]
         {
             HandJointKind.Palm,
@@ -446,7 +459,7 @@ protected void UpdateCurrentIndexPose()
 
         #endregion Private InputSource Helpers
 
-#endif // WINDOWS_UWP
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
 #endif // UNITY_WSA
     }
 }