Merge pull request #1175 from StephenHodgson/MRTK-Dev-Local

Dev Changes before Master Merge

Author: StephenHodgson

Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs

@@ -1,16 +1,23 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using HoloToolkit.Unity;
 
 public class AdaptiveQualityExample : MonoBehaviour
 {
-	public TextMesh text;
-	public AdaptiveQuality quality;
+    public TextMesh Text;
+    public AdaptiveQuality Quality;
 
-	private void Update ()
-	{
-		text.text = string.Format("GPUTime:{0:N2}\nQualityLevel:{1}\nViewportScale:{2:N2}", 
-			GpuTiming.GetTime("Frame") * 1000.0f,
-			quality.QualityLevel,
-			UnityEngine.XR.XRSettings.renderViewportScale);
-	}
+    private void Update()
+    {
+        Text.text = string.Format("GPUTime:{0:N2}\nQualityLevel:{1}\nViewportScale:{2:N2}",
+            GpuTiming.GetTime("Frame") * 1000.0f,
+            Quality.QualityLevel,
+#if UNITY_2017_2_OR_NEWER
+            UnityEngine.XR.XRSettings.renderViewportScale);
+#else
+            UnityEngine.VR.VRSettings.renderViewportScale);
+#endif
+    }
 }

Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs

@@ -11,7 +11,7 @@ public class BoundaryTest : MonoBehaviour
 
         private void Start()
         {
-#if UNITY_WSA
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             BoundaryManager.Instance.RenderBoundary = true;
             BoundaryManager.Instance.RenderFloor = true;
 

Assets/HoloToolkit-Examples/Input/Scripts/OnFocusEvent.cs

@@ -13,15 +13,15 @@ public class OnFocusEvent : MonoBehaviour, IFocusable
 
         public void OnFocusEnter()
         {
-            if (enabled && FocusEnterEvent != null)
+            if (FocusEnterEvent != null)
             {
                 FocusEnterEvent.Invoke();
             }
         }
 
         public void OnFocusExit()
         {
-            if (enabled && FocusLostEvent != null)
+            if (FocusLostEvent != null)
             {
                 FocusLostEvent.Invoke();
             }

Assets/HoloToolkit-Examples/Sharing/SharingService/Scripts/ImportExportAnchorManager.cs

@@ -8,9 +8,15 @@
 
 #if UNITY_WSA && !UNITY_EDITOR
 using System.Collections.Generic;
+#if UNITY_2017_2_OR_NEWER
 using UnityEngine.XR.WSA;
 using UnityEngine.XR.WSA.Persistence;
 using UnityEngine.XR.WSA.Sharing;
+#else
+using UnityEngine.VR.WSA;
+using UnityEngine.VR.WSA.Persistence;
+using UnityEngine.VR.WSA.Sharing;
+#endif
 #endif
 
 namespace HoloToolkit.Sharing.Tests
@@ -199,7 +205,7 @@ private static bool ShouldLocalUserCreateRoom
         /// </summary>
         private RoomManagerAdapter roomManagerListener;
 
-        #region Untiy APIs
+        #region Unity APIs
 
         protected override void Awake()
         {

Assets/HoloToolkit-Examples/SpatialMapping/Scripts/DropCube.cs

@@ -5,7 +5,11 @@
 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.Examples.SpatialMappingComponent
@@ -22,16 +26,30 @@ private void Start()
         {
             recognizer = new GestureRecognizer();
             recognizer.SetRecognizableGestures(GestureSettings.Tap);
+#if UNITY_2017_2_OR_NEWER
             recognizer.Tapped += Recognizer_Tapped;
+#else
+            recognizer.TappedEvent += Recognizer_Tapped;
+#endif
             recognizer.StartCapturingGestures();
         }
 
         private void OnDestroy()
         {
+#if UNITY_2017_2_OR_NEWER
             recognizer.Tapped -= Recognizer_Tapped;
+#else
+            recognizer.TappedEvent -= Recognizer_Tapped;
+#endif
         }
 
-        private void Recognizer_Tapped(TappedEventArgs obj)
+        private void Recognizer_Tapped(
+#if UNITY_2017_2_OR_NEWER
+            TappedEventArgs obj
+#else
+            InteractionSourceKind source, int tapCount, Ray headRay
+#endif
+            )
         {
             // Create a cube
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
@@ -40,7 +58,7 @@ private void Recognizer_Tapped(TappedEventArgs obj)
             // Start to drop it in front of the camera
             cube.transform.position = CameraCache.Main.transform.position + CameraCache.Main.transform.forward;
             // Apply physics
-            cube.AddComponent<Rigidbody>(); 
+            cube.AddComponent<Rigidbody>();
         }
 #endif
     }