Merge branch 'HTK-Master' into HTK-Dictation

Author: StephenHodgson

.gitignore

@@ -10,6 +10,7 @@ Library/
 Assets/AssetStoreTools*
 App/
 UWP/
+/WindowsStoreApp
 project.json
 project.lock.json
 

Assets/HoloToolkit-UnitTests/Editor/Utilities/Extensions/VectorExtensionsTests.cs

@@ -68,13 +68,26 @@ public void Vector3_RotateAround_Euler()
         [Test]
         public void Vector3_TransformPoint()
         {
-            throw new NotImplementedException();
+            Vector3 point = new Vector3(1f, 2f, 3f);
+            Vector3 scale = new Vector3(2f, 3f, 4f); // scaled point: (2, 6, 12)
+            Quaternion rotation = Quaternion.AngleAxis(180f, Vector3.up); // scaled rotated point: (-2, 6, -12)
+            Vector3 translation = new Vector3(3f, 4f, 5f); // translated scaled rotated point: (1, 10, -7)
+            Vector3 expected = new Vector3(1, 10, -7);
+            Vector3 result = point.TransformPoint(translation, rotation, scale);
+            Assert.That(Vector3.Distance(result, expected), Is.LessThan(0.00001f));
         }
 
         [Test]
         public void Vector3_InverseTransformPoint()
         {
-            throw new NotImplementedException();
+            // Perform the same transformation as Vector3_TransformPoint in reverse.
+            Vector3 point = new Vector3(1, 10, -7);
+            Vector3 scale = new Vector3(2f, 3f, 4f);
+            Quaternion rotation = Quaternion.AngleAxis(180f, Vector3.up);
+            Vector3 translation = new Vector3(3f, 4f, 5f);
+            Vector3 expected = new Vector3(1f, 2f, 3f);
+            Vector3 result = point.InverseTransformPoint(translation, rotation, scale);
+            Assert.That(Vector3.Distance(result, expected), Is.LessThan(0.00001f));
         }
 
         [Test]

Assets/HoloToolkit/SpatialMapping/README.md

@@ -142,7 +142,9 @@ Generates planes and classifies them by type (wall, ceiling, floor, table, unkno
 
 **WallMaterial** Material to use when rendering wall plane types.
 
-**FloorMaterial** Material to use when rendering ceiling plane types.
+**FloorMaterial** Material to use when rendering floor plane types.
+
+**CeilingMaterial** Material to use when rendering ceiling plane types.
 
 **TableMaterial** Material to use when rendering table plane types.
 

Assets/HoloToolkit/SpatialUnderstanding/Prefabs/SpatialUnderstanding.prefab

@@ -16,12 +16,12 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 4000012071801678}
-  - 114: {fileID: 114000012099205058}
-  - 114: {fileID: 114000012152922318}
-  - 114: {fileID: 114000013027790266}
+  - component: {fileID: 4000012071801678}
+  - component: {fileID: 114000012099205058}
+  - component: {fileID: 114000012152922318}
+  - component: {fileID: 114000013027790266}
   m_Layer: 0
   m_Name: SpatialUnderstanding
   m_TagString: Untagged
@@ -79,4 +79,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ImportMeshPeriod: 1
-  MeshMaterial: {fileID: 2100000, guid: ddc2ff62e97ce6d41991784c3aa8e233, type: 2}
+  meshMaterial: {fileID: 2100000, guid: ddc2ff62e97ce6d41991784c3aa8e233, type: 2}
+  MaxFrameTime: 5
+  CreateMeshColliders: 1