Merge branch 'MRTK-Master' into HTK-WorldAnchorManagerUpdate

# Conflicts:
#	Assets/HoloToolkit/Input/Scripts/Interactions/TapToPlace.cs

Author: Stephen Hodgson

Assets/HoloToolkit-Tests/Input/Scenes/TapToPlace.unity

@@ -38,11 +38,11 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
   m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -87,7 +87,7 @@ LightmapSettings:
     m_PVRFilteringAtrousNormalSigma: 1
     m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -219,6 +219,7 @@ MonoBehaviour:
   PlaceParentOnTap: 0
   ParentGameObjectToPlace: {fileID: 0}
   IsBeingPlaced: 0
+  AllowMeshVisualizationControl: 1
 --- !u!23 &181528116
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -376,9 +377,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   DefaultGazeDistance: 2
   SavedAnchorFriendlyName: 5361766564416e63686f72467269656e646c794e616d65
-  PlaceParentOnTap: 0
+  PlaceParentOnTap: 1
   ParentGameObjectToPlace: {fileID: 0}
   IsBeingPlaced: 0
+  AllowMeshVisualizationControl: 1
 --- !u!23 &532765827
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -474,6 +476,11 @@ Prefab:
       propertyPath: drawVisualMeshes
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 114000012149591842, guid: 2ed75ffdf9031c94e8bce4b3d17b9928,
+        type: 2}
+      propertyPath: RoomModel
+      value: 
+      objectReference: {fileID: 100008, guid: 68a7a806bf726614aa309bb190ab7cee, type: 3}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 2ed75ffdf9031c94e8bce4b3d17b9928, type: 2}
   m_IsPrefabParent: 0
@@ -513,6 +520,7 @@ MonoBehaviour:
   PlaceParentOnTap: 0
   ParentGameObjectToPlace: {fileID: 0}
   IsBeingPlaced: 0
+  AllowMeshVisualizationControl: 1
 --- !u!23 &1023018528
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -772,6 +780,20 @@ Light:
   m_Lightmapping: 4
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
+  m_FalloffTable:
+    m_Table[0]: 0
+    m_Table[1]: 0
+    m_Table[2]: 0
+    m_Table[3]: 0
+    m_Table[4]: 0
+    m_Table[5]: 0
+    m_Table[6]: 0
+    m_Table[7]: 0
+    m_Table[8]: 0
+    m_Table[9]: 0
+    m_Table[10]: 0
+    m_Table[11]: 0
+    m_Table[12]: 0
   m_ColorTemperature: 6570
   m_UseColorTemperature: 0
   m_ShadowRadius: 0

Assets/HoloToolkit-UnitTests/Editor/Input.meta

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.Linq;
+using UnityEngine;
+
+namespace HoloToolkit.Unity
+{
+    public static class EditorUtils
+    {
+        /// <summary>
+        /// Deletes all objects in the scene
+        /// </summary>
+        public static void ClearScene()
+        {
+            foreach (var transform in Object.FindObjectsOfType<Transform>().Select(t => t.root).Distinct().ToList())
+            {
+                Object.DestroyImmediate(transform.gameObject);
+            }
+        }
+    }
+}

Assets/HoloToolkit-UnitTests/Editor/Utilities/EditorUtils.cs

@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using UnityEngine;
+
+namespace HoloToolkit.Unity.Tests
+{
+    public class EditorUtilsTests
+    {
+        [Test]
+        public void ClearOne()
+        {
+            GameObject.CreatePrimitive(PrimitiveType.Cube);
+            EditorUtils.ClearScene();
+            Assert.That(Object.FindObjectsOfType<GameObject>(), Is.Empty);
+        }
+
+        [Test]
+        public void ClearMany()
+        {
+            for (var i = 0; i < 10; i++)
+            {
+                GameObject.CreatePrimitive(PrimitiveType.Cube);
+            }
+            EditorUtils.ClearScene();
+            Assert.That(Object.FindObjectsOfType<GameObject>(), Is.Empty);
+        }
+
+        [Test]
+        public void ClearHierarchy()
+        {
+            var empty = new GameObject();
+            var parent = Object.Instantiate(empty);
+            for (var i = 0; i < 10; i++)
+            {
+                parent = Object.Instantiate(empty, parent.transform);
+            }
+            EditorUtils.ClearScene();
+            Assert.That(Object.FindObjectsOfType<GameObject>(), Is.Empty);
+        }
+    }
+}