Merge pull request #594 from Sacristan/master

Added event when scan is done and a bool property whether Any mesh sectors been scanned

Author: StephenHodgson

Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingManager.cs

@@ -47,6 +47,11 @@ public partial class SpatialMappingManager : Singleton<SpatialMappingManager>
         [HideInInspector]
         public float StartTime { get; private set; }
 
+        /// <summary>
+        /// SurfaceMappingObserver GET
+        /// </summary>
+        public SpatialMappingObserver SurfaceObserver { get { return surfaceObserver; } }
+
         /// <summary>
         /// The current source of spatial mapping data.
         /// </summary>

Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstanding.cs

@@ -47,6 +47,7 @@ public bool AllowSpatialUnderstanding
                 return true;
             }
         }
+
         /// <summary>
         /// Reference to the SpatialUnderstandingDLL class (wraps the understanding dll functions).
         /// </summary>
@@ -97,7 +98,14 @@ public bool ScanStatsReportStillWorking
             }
         }
 
+        public delegate void OnScanDoneDelegate();
+
         // Events
+        /// <summary>
+        /// Event indicating that the scan is done
+        /// </summary>
+        public event OnScanDoneDelegate OnScanDone;
+
         /// <summary>
         /// Event indicating that the scan state has changed
         /// </summary>
@@ -247,7 +255,7 @@ private void Update_Scan(float deltaTime)
 
             // If it's done, finish up
             if ((ScanState == ScanStates.Finishing) &&
-                (scanDone) && 
+                (scanDone) &&
                 (!UnderstandingCustomMesh.IsImportActive) &&
                 (UnderstandingCustomMesh != null))
             {
@@ -256,6 +264,7 @@ private void Update_Scan(float deltaTime)
 
                 // Mark it
                 ScanState = ScanStates.Done;
+                if (OnScanDone != null) OnScanDone.Invoke();
             }
         }
     }

Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs

@@ -39,6 +39,7 @@ private float MaxFrameTimeInSeconds
         public bool CreateMeshColliders = true;
 
         private bool drawProcessedMesh = true;
+
         // Properties
         /// <summary>
         /// Controls rendering of the mesh. This can be set by the user to hide or show the mesh.
@@ -59,6 +60,11 @@ public bool DrawProcessedMesh
             }
         }
 
+        /// <summary>
+        /// Have any mesh sectors been scanned
+        /// </summary>
+        public bool HasMeshSectors { get { return meshSectors != null && meshSectors.Count > 0; } }
+
         /// <summary>
         /// Indicates if the previous import is still being processed.
         /// </summary>
@@ -80,13 +86,13 @@ public bool DrawProcessedMesh
         private SpatialUnderstanding spatialUnderstanding;
 
         /// <summary>
-        /// The spatial understanding mesh will be split into pieces so that we don't have to 
+        /// The spatial understanding mesh will be split into pieces so that we don't have to
         /// render the whole mesh, rather just the parts that are visible to the user.
         /// </summary>
         private Dictionary<Vector3, MeshData> meshSectors = new Dictionary<Vector3, MeshData>();
 
         /// <summary>
-        /// A data structure to manage collecting triangles as we 
+        /// A data structure to manage collecting triangles as we
         /// subdivide the spatial understanding mesh into smaller sub meshes.
         /// </summary>
         private class MeshData
@@ -157,11 +163,11 @@ public void Commit()
             /// <param name="point3">Third point on the triangle.</param>
             public void AddTriangle(Vector3 point1, Vector3 point2, Vector3 point3)
             {
-                // Currently spatial understanding in the native layer voxellizes the space 
-                // into ~2000 voxels per cubic meter.  Even in a degerate case we 
+                // Currently spatial understanding in the native layer voxellizes the space
+                // into ~2000 voxels per cubic meter.  Even in a degerate case we
                 // will use far fewer than 65000 vertices, this check should not fail
                 // unless the spatial understanding native layer is updated to have more
-                // voxels per cubic meter. 
+                // voxels per cubic meter.
                 if (verts.Count < 65000)
                 {
                     tris.Add(verts.Count);
@@ -195,7 +201,7 @@ private void Update()
         }
 
         /// <summary>
-        /// Adds a triangle with the specified points to the specified sector. 
+        /// Adds a triangle with the specified points to the specified sector.
         /// </summary>
         /// <param name="sector">The sector to add the triangle to.</param>
         /// <param name="point1">First point of the triangle.</param>
@@ -289,8 +295,8 @@ public IEnumerator Import_UnderstandingMesh()
                 }
 
                 float startTime = Time.realtimeSinceStartup;
-                // first we need to split the playspace up into segments so we don't always 
-                // draw everything.  We can break things up in to cubic meters.  
+                // first we need to split the playspace up into segments so we don't always
+                // draw everything.  We can break things up in to cubic meters.
                 for (int index = 0; index < meshIndices.Length; index += 3)
                 {
                     Vector3 firstVertex = meshVertices[meshIndices[index]];
@@ -389,7 +395,7 @@ private Vector3 VectorToSector(Vector3 vector)
         }
 
         /// <summary>
-        /// Updates the mesh import process. This function will kick off the import 
+        /// Updates the mesh import process. This function will kick off the import
         /// coroutine at the requested internal.
         /// </summary>
         private void Update_MeshImport()
@@ -411,4 +417,4 @@ private void OnDestroy()
         }
     }
 
-}
+}