Spatial Mapping Updates

Commits which address issues microsoft#144, microsoft#143, and microsoft#39. These commits include
the following changes:
1) Add the ObjectSurfaceObserver for loading meshes from a room file to
the SpatialMapping prefab (replaces the old FileSurfaceObserver).
2) Moves the FileSurfaceObserver onto the RemoteMapping prefab, for
saving/loading files from a remote mapping session.
3) Move all scripts related to RemoteMapping into a separate folder.
4) Move all scripts related to Processing into a separate folder.
5) Remove RemoteMapping prefab from the SpatialProcessing.unity test
scene. SpatialProcessing test will now load a .obj file when running in
Unity.
6) Add a RemoteMapping.unity test scene to help test the RemoteMapping
scripts.
7) Update documentation.
8) Remove Plugins\WSA\x64\PlaneFinding.dll which was failing WACK and is
not actually used by anything.

Assets/HoloToolkit/SpatialMapping/Prefabs/RemoteMapping.prefab

@@ -22,6 +22,7 @@ GameObject:
   - 114: {fileID: 114000013950815180}
   - 114: {fileID: 114000010791004466}
   - 114: {fileID: 114000012256053342}
+  - 114: {fileID: 114000013862356290}
   m_Layer: 0
   m_Name: RemoteMapping
   m_TagString: Untagged
@@ -41,6 +42,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &114000010791004466
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -65,6 +67,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e0e40e7a40c41984bbec8aaa64292522, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &114000013862356290
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000012046505862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c96e5de2c5d6ff048a7008e554de2a56, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MeshFileName: roombackup
 --- !u!114 &114000013950815180
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/HoloToolkit/SpatialMapping/Prefabs/SpatialMapping.prefab

@@ -21,7 +21,7 @@ GameObject:
   - 4: {fileID: 4000013298573622}
   - 114: {fileID: 114000012698980792}
   - 114: {fileID: 114000011154029958}
-  - 114: {fileID: 114000012459388718}
+  - 114: {fileID: 114000012149591842}
   m_Layer: 0
   m_Name: SpatialMapping
   m_TagString: Untagged
@@ -41,6 +41,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &114000011154029958
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -54,20 +55,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PhysicsLayer: 31
   surfaceMaterial: {fileID: 2100000, guid: d698790d3facd3d4289a13fa1243030a, type: 2}
+  autoStartObserver: 1
   drawVisualMeshes: 1
   castShadows: 0
---- !u!114 &114000012459388718
+--- !u!114 &114000012149591842
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1000010302963436}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c96e5de2c5d6ff048a7008e554de2a56, type: 3}
+  m_Script: {fileID: 11500000, guid: 13d883c0118351e4890753200e0ac916, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  MeshFileName: roombackup
+  roomModel: {fileID: 0}
 --- !u!114 &114000012698980792
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/HoloToolkit/SpatialMapping/Scripts/FileSurfaceObserver.cs → Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/FileSurfaceObserver.cs

@@ -11,6 +11,12 @@ public class FileSurfaceObserver : SpatialMappingSource
         [Tooltip("The file name to use when saving and loading meshes.")]
         public string MeshFileName = "roombackup";
 
+        [Tooltip("Key to press in editor to load a spatial mapping mesh from a .room file.")]
+        public KeyCode LoadFileKey = KeyCode.L;
+
+        [Tooltip("Key to press in editor to save a spatial mapping mesh to file.")]
+        public KeyCode SaveFileKey = KeyCode.S;
+
         /// <summary>
         /// Loads the SpatialMapping mesh from the specified file.
         /// </summary>
@@ -59,5 +65,25 @@ public void Load(string fileName)
                 Debug.Log("Failed to load " + fileName);
             }
         }
+
+        // Called every frame.
+        private void Update()
+        {
+            // Keyboard commands for saving and loading a remotely generated mesh file.
+#if UNITY_EDITOR
+            // S - saves the active mesh
+            if (Input.GetKeyUp(KeyCode.S))
+            {
+                MeshSaver.Save(MeshFileName, SpatialMappingManager.Instance.GetMeshes());
+            }
+
+            // L - loads the previously saved mesh into editor and sets it to be the spatial mapping source.
+            if (Input.GetKeyUp(KeyCode.L))
+            {
+                SpatialMappingManager.Instance.SetSpatialMappingSource(this);
+                Load(MeshFileName);
+            }
+#endif
+        }
     }
-}
+}

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMappingManager.cs → Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/RemoteMappingManager.cs

@@ -11,6 +11,12 @@ namespace HoloToolkit.Unity
     [RequireComponent(typeof(RemoteMeshTarget))]
     public partial class RemoteMappingManager : Singleton<RemoteMappingManager>
     {
+        [Tooltip("Key to press in editor to enable spatial mapping over the network.")]
+        public KeyCode RemoteMappingKey = KeyCode.N;
+
+        [Tooltip("Keyword for sending meshes from HoloLens to Unity over the network.")]
+        public string SendMeshesKeyword = "send meshes";
+
         /// <summary>
         /// Receives meshes collected over the network.
         /// </summary>
@@ -31,7 +37,7 @@ private void Start()
         {
             // Create our keyword collection.
             keywordCollection = new Dictionary<string, System.Action>();
-            keywordCollection.Add("send meshes", () => SendMeshes());
+            keywordCollection.Add(SendMeshesKeyword, () => SendMeshes());
 
             // Tell the KeywordRecognizer about our keywords.
             keywordRecognizer = new KeywordRecognizer(keywordCollection.Keys.ToArray());
@@ -55,8 +61,8 @@ private void Start()
         private void Update()
         {
 #if UNITY_EDITOR
-            // N - To use the 'network' sourced mesh.  
-            if (Input.GetKeyUp(KeyCode.N))
+            // Use the 'network' sourced mesh.  
+            if (Input.GetKeyUp(RemoteMappingKey))
             {
                 SpatialMappingManager.Instance.SetSpatialMappingSource(remoteMeshTarget);
             }

Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingManager.cs

@@ -35,16 +35,6 @@ public partial class SpatialMappingManager : Singleton<SpatialMappingManager>
         /// </summary>
         private SpatialMappingObserver surfaceObserver;
 
-        /// <summary>
-        /// Used for loading or saving spatial mapping data to disk.
-        /// </summary>
-        private FileSurfaceObserver fileSurfaceObserver;
-
-        /// <summary>
-        /// Used for sending meshes over the network and saving them to disk.
-        /// </summary>
-        private RemoteMeshTarget remoteMeshTarget;
-
         /// <summary>
         /// Time when StartObserver() was called.
         /// </summary>
@@ -66,39 +56,12 @@ private void Awake()
         // Use for initialization.
         private void Start()
         {
-            remoteMeshTarget = FindObjectOfType<RemoteMeshTarget>();
-
             if (autoStartObserver)
             {
                 StartObserver();
             }
         }
 
-        // Called every frame.
-        private void Update()
-        {
-            // There are a few keyboard commands we will add when in the editor.
-#if UNITY_EDITOR
-            // F - to use the 'file' sourced mesh.
-            if (Input.GetKeyUp(KeyCode.F))
-            {
-                SpatialMappingManager.Instance.SetSpatialMappingSource(fileSurfaceObserver);
-            }
-
-            // S - saves the active mesh
-            if (Input.GetKeyUp(KeyCode.S))
-            {
-                MeshSaver.Save(fileSurfaceObserver.MeshFileName, SpatialMappingManager.Instance.GetMeshes());
-            }
-
-            // L - loads the previously saved mesh into the file source.
-            if (Input.GetKeyUp(KeyCode.L))
-            {
-                fileSurfaceObserver.Load(fileSurfaceObserver.MeshFileName);
-            }
-#endif
-        }
-
         /// <summary>
         /// Returns the layer as a bit mask.
         /// </summary>
@@ -223,23 +186,6 @@ public void StartObserver()
                 surfaceObserver.StartObserving();
                 StartTime = Time.time;
             }
-#elif UNITY_EDITOR
-            fileSurfaceObserver = GetComponent<FileSurfaceObserver>();
-
-            if (fileSurfaceObserver != null)
-            {
-                // In the Unity editor, try loading a saved mesh.
-                fileSurfaceObserver.Load(fileSurfaceObserver.MeshFileName);
-
-                if (fileSurfaceObserver.GetMeshFilters().Count > 0)
-                {
-                    SetSpatialMappingSource(fileSurfaceObserver);
-                }
-                else if (remoteMeshTarget != null)
-                {
-                    SetSpatialMappingSource(remoteMeshTarget);
-                }
-            }
 #endif
         }