Merge pull request #1614 from StephenHodgson/MRTK-Master_Clone

MRTK 2017.2.1.1 Patch Release
microsoft · Jan 16, 2018 · ab9a54f · ab9a54f
2 parents bce6505 + 5075ec3
commit ab9a54f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs b/Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs
@@ -33,10 +33,11 @@ public class BoundaryManager : Singleton<BoundaryManager>
         // This puts the origin (0, 0, 0) on the floor if a floor has been established during setup via MixedRealityPortal.
         private TrackingSpaceType opaqueTrackingSpaceType = TrackingSpaceType.RoomScale;
 
-        [SerializeField]
+        // Removed for now, until the HoloLens tracking space type story is more clear.
+        //[SerializeField]
         // Defaulting coordinate system to Stationary for transparent headsets, like HoloLens.
         // This puts the origin (0, 0, 0) at the first place where the user started the application.
-        private TrackingSpaceType transparentTrackingSpaceType = TrackingSpaceType.Stationary;
+        //private TrackingSpaceType transparentTrackingSpaceType = TrackingSpaceType.Stationary;
 #endif
 
         // Testing in the editor found that this moved the floor out of the way enough, and it is only

diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs
@@ -2,11 +2,13 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+#if UNITY_WSA
 #if UNITY_2017_2_OR_NEWER
 using UnityEngine.XR.WSA.Input;
 #else
 using UnityEngine.VR.WSA.Input;
 #endif
+#endif
 
 namespace HoloToolkit.Unity.InputModule
 {
@@ -18,7 +20,7 @@ public class MotionControllerInfo
     {
         public readonly GameObject ControllerParent;
 
-#if UNITY_2017_2_OR_NEWER
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         public readonly InteractionSourceHandedness Handedness;
 #endif
 
@@ -67,13 +69,13 @@ public class MotionControllerInfo
         private double lastSelectPressedAmount;
 
         public MotionControllerInfo(GameObject controllerParent
-#if UNITY_2017_2_OR_NEWER
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             , InteractionSourceHandedness handedness
 #endif
             )
         {
             ControllerParent = controllerParent;
-#if UNITY_2017_2_OR_NEWER
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             Handedness = handedness;
 #endif
         }

diff --git a/External/Unitypackages/HoloToolkit-Unity-2017.2.1.0.unitypackage b/External/Unitypackages/HoloToolkit-Unity-2017.2.1.0.unitypackage
diff --git a/External/Unitypackages/HoloToolkit-Unity-2017.2.1.1.unitypackage b/External/Unitypackages/HoloToolkit-Unity-2017.2.1.1.unitypackage
diff --git a/External/Unitypackages/HoloToolkit-Unity-Examples-2017.2.1.0.unitypackage b/External/Unitypackages/HoloToolkit-Unity-Examples-2017.2.1.0.unitypackage
diff --git a/External/Unitypackages/HoloToolkit-Unity-Examples-2017.2.1.1.unitypackage b/External/Unitypackages/HoloToolkit-Unity-Examples-2017.2.1.1.unitypackage
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -127,7 +127,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2017.2.1.0
+  bundleVersion: 2017.2.1.1
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 0
@@ -619,7 +619,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: MixedRealityToolkit-Unity
-  metroPackageVersion: 2017.2.1.0
+  metroPackageVersion: 2017.2.1.1
   metroCertificatePath: Assets/WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: Microsoft