Merge pull request #297 from darax/master

fix SpatialUnderstanding doesn't work in emulator

Author: darax

Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs

@@ -43,6 +43,11 @@ public class SpatialMappingObserver : SpatialMappingSource
         /// </summary>
         public event SurfaceObserver.SurfaceChangedDelegate SurfaceChanged;
 
+        /// <summary>
+        /// Event for hooking when the data for a surface is ready.
+        /// </summary>
+        public event SurfaceObserver.SurfaceDataReadyDelegate DataReady;
+
         /// <summary>
         /// Our Surface Observer object for generating/updating Spatial Mapping data.
         /// </summary>
@@ -201,6 +206,11 @@ private void SurfaceObserver_OnDataReady(SurfaceData cookedData, bool outputWrit
             }
 
             surfaceWorkOutstanding = false;
+            SurfaceObserver.SurfaceDataReadyDelegate dataReady = DataReady;
+            if (dataReady != null)
+            {
+                dataReady(cookedData, outputWritten, elapsedCookTimeSeconds);
+            }
         }
 
         private void CleanupSurface(GameObject surface)

Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingSourceMesh.cs

@@ -2,9 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
-using System.Collections;
 using System;
-using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using UnityEngine.VR.WSA;
 
@@ -32,27 +30,52 @@ private void Start()
             SpatialMappingObserver mappingObserver = SpatialMappingManager.Instance.Source as SpatialMappingObserver;
             if (mappingObserver != null)
             {
-                mappingObserver.SurfaceChanged += OnSurfaceChanged;
+                mappingObserver.DataReady += MappingObserver_DataReady;
+                mappingObserver.SurfaceChanged += MappingObserver_SurfaceChanged;
             }
         }
 
-        private int FindMeshIndexInInputMeshList(int meshID)
+        /// <summary>
+        /// Called when a surface is going to be added, removed, or updated. 
+        /// We only care about removal so we can remove our internal copy of the surface mesh.
+        /// </summary>
+        /// <param name="surfaceId">The surface ID that is being added/removed/updated</param>
+        /// <param name="changeType">Added | Removed | Updated</param>
+        /// <param name="bounds">The world volume the mesh is in.</param>
+        /// <param name="updateTime">When the mesh was updated.</param>
+        private void MappingObserver_SurfaceChanged(SurfaceId surfaceId, SurfaceChange changeType, Bounds bounds, DateTime updateTime)
         {
-            for (int i = 0; i < inputMeshList.Count; ++i)
+            // We only need to worry about removing meshes from our list.  Adding and updating is 
+            // done when the mesh data is actually ready.
+            if (changeType == SurfaceChange.Removed)
             {
-                if (inputMeshList[i].MeshID == meshID)
+                int meshIndex = FindMeshIndexInInputMeshList(surfaceId.handle);
+                if(meshIndex >= 0)
                 {
-                    return i;
+                    inputMeshList.RemoveAt(meshIndex);
                 }
             }
-            return -1;
         }
 
-        private int FindSurfaceIndexInList(int surfaceObjectID, List<SpatialMappingSource.SurfaceObject> surfaceObjects)
+        /// <summary>
+        /// Called by the surface observer when a mesh has had its data changed.
+        /// </summary>
+        /// <param name="bakedData">The data describing the surface.</param>
+        /// <param name="outputWritten">If the data was successfully updated.</param>
+        /// <param name="elapsedBakeTimeSeconds">How long it took to update.</param>
+        private void MappingObserver_DataReady(SurfaceData bakedData, bool outputWritten, float elapsedBakeTimeSeconds)
         {
-            for (int i = 0; i < surfaceObjects.Count; ++i)
+            if (!outputWritten)
+                return;
+
+            AddOrUpdateMeshInList(bakedData);
+        }
+
+        private int FindMeshIndexInInputMeshList(int meshID)
+        {
+            for (int i = 0; i < inputMeshList.Count; ++i)
             {
-                if (surfaceObjects[i].ID == surfaceObjectID)
+                if (inputMeshList[i].MeshID == meshID)
                 {
                     return i;
                 }
@@ -69,16 +92,14 @@ private int FindSurfaceIndexInList(int surfaceObjectID, List<SpatialMappingSourc
         /// <param name="surfaceObjects">The list of surfaceObjects</param>
         /// <param name="meshDataIndex">Index into the locally stored mesh data list</param>
         private void AddOrUpdateMeshInList(
-            int surfaceId, 
-            int surfaceObjectIndex, 
-            List<SpatialMappingSource.SurfaceObject> surfaceObjects,
-            int meshDataIndex = -1)
+            SurfaceData bakedData)
         {
+            SurfaceId surfaceId = bakedData.id;
+            MeshFilter meshFilter = bakedData.outputMesh;
+            int meshDataIndex = FindMeshIndexInInputMeshList(surfaceId.handle);
             SpatialUnderstandingDll.MeshData meshData = new SpatialUnderstandingDll.MeshData();
-            int meshUpdateID = (meshDataIndex > 0) ? (inputMeshList[meshDataIndex].LastUpdateID + 1) : 0;
-
-            // Checks.
-            MeshFilter meshFilter = surfaceObjects[surfaceObjectIndex].Filter;
+            int meshUpdateID = (meshDataIndex >= 0) ? (inputMeshList[meshDataIndex].LastUpdateID + 1) : 1;
+            
             if ((meshFilter != null) &&
                 (meshFilter.mesh != null) &&
                 (meshFilter.mesh.triangles.Length > 0))
@@ -87,12 +108,12 @@ private void AddOrUpdateMeshInList(
                 meshFilter.mesh.RecalculateNormals();
 
                 // Convert
-                meshData.CopyFrom(meshFilter, surfaceId, meshUpdateID);
+                meshData.CopyFrom(meshFilter, surfaceId.handle, meshUpdateID);
             }
             else
             {
                 // No filter yet, add as an empty mesh (will be updated later in the update loop)
-                meshData.CopyFrom(null, surfaceId, meshUpdateID);
+                meshData.CopyFrom(null, surfaceId.handle, meshUpdateID);
             }
 
             // And add it (unless an index of an update item is specified)
@@ -106,70 +127,6 @@ private void AddOrUpdateMeshInList(
             }
         }
 
-        private void OnSurfaceChanged(SurfaceId surfaceId, SurfaceChange changeType, Bounds bounds, DateTime updateTime)
-        {
-            // Find the surface
-            List<SpatialMappingSource.SurfaceObject> surfaceObjects = SpatialMappingManager.Instance.GetSurfaceObjects();
-
-            // Find it (in both lists)
-            int surfaceObjectIndex = FindSurfaceIndexInList(surfaceId.handle, surfaceObjects);
-            int meshDataIndex = FindMeshIndexInInputMeshList(surfaceId.handle);
-
-            // Deal with the change
-            switch (changeType)
-            {
-                case SurfaceChange.Added:
-                    {
-                        if (surfaceObjectIndex >= 0 && surfaceObjectIndex < surfaceObjects.Count)
-                        {
-                            AddOrUpdateMeshInList(surfaceId.handle, surfaceObjectIndex, surfaceObjects);
-                        }
-                    }
-                    break;
-                case SurfaceChange.Removed:
-                    {
-                        if (meshDataIndex >= 0 && meshDataIndex < inputMeshList.Count)
-                        {
-                            inputMeshList.RemoveAt(meshDataIndex);
-                        }
-                    }
-                    break;
-                case SurfaceChange.Updated:
-                    {
-                        if ((surfaceObjectIndex >= 0 && surfaceObjectIndex < surfaceObjects.Count) &&
-                            (meshDataIndex >= 0 && meshDataIndex < inputMeshList.Count))
-                        {
-                            AddOrUpdateMeshInList(surfaceId.handle, surfaceObjectIndex, surfaceObjects, meshDataIndex);
-                        }
-                    }
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Update the internal mesh list from spatial mapping's surface object list.
-        /// </summary>
-        private void UpdateInputMeshList()
-        {
-            List<SpatialMappingSource.SurfaceObject> surfaceObjects = SpatialMappingManager.Instance.GetSurfaceObjects();
-
-            // If we have any meshes with zero indices, but with filters
-            // that indicates that the filters are now ready to be processed
-            for (int i = 0; i < inputMeshList.Count; ++i)
-            {
-                if ((inputMeshList[i].Indices == null) ||
-                    (inputMeshList[i].Indices.Length == 0))
-                {
-                    int surfaceObjectIndex = FindSurfaceIndexInList(inputMeshList[i].MeshID, surfaceObjects);
-                    if ((surfaceObjectIndex > 0) &&
-                        (surfaceObjects[surfaceObjectIndex].UpdateID != inputMeshList[i].LastUpdateID))
-                    {
-                        AddOrUpdateMeshInList(inputMeshList[i].MeshID, surfaceObjectIndex, surfaceObjects, i);
-                    }
-                }
-            }
-        }
-
         /// <summary>
         /// Update the internal mesh list and provides an array pointer in
         /// the form the dll will accept.
@@ -179,8 +136,6 @@ private void UpdateInputMeshList()
         /// <returns></returns>
         public bool GetInputMeshList(out int meshCount, out IntPtr meshList)
         {
-            // First, update our mesh data
-            UpdateInputMeshList();
             if (inputMeshList.Count == 0)
             {
                 meshCount = 0;