Merge pull request #542 from trzy/master

Need to update collision mesh when committing mesh data

Author: StephenHodgson

Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs

@@ -33,6 +33,11 @@ private float MaxFrameTimeInSeconds
             get { return (MaxFrameTime / 1000); }
         }
 
+        /// <summary>
+        ///  Whether to create mesh colliders. If unchecked, mesh colliders will be empty and disabled.
+        /// </summary>
+        public bool CreateMeshColliders = true;
+
         private bool drawProcessedMesh = true;
         // Properties
         /// <summary>
@@ -97,6 +102,18 @@ private class MeshData
             /// </summary>
             public readonly Mesh MeshObject = new Mesh();
 
+            /// <summary>
+            /// The MeshCollider with which this mesh is associated. Must be set even if
+            /// no collision mesh will be created.
+            /// </summary>
+            public MeshCollider SpatialCollider = null;
+
+            /// <summary>
+            /// Whether to create collision mesh. If false, the MeshCollider attached to this
+            /// object will also be disabled when Commit() is called.
+            /// </summary>
+            public bool CreateMeshCollider = false;
+
             /// <summary>
             /// Clears the geometry, but does not clear the mesh.
             /// </summary>
@@ -118,6 +135,17 @@ public void Commit()
                     MeshObject.SetTriangles(tris, 0);
                     MeshObject.RecalculateNormals();
                     MeshObject.RecalculateBounds();
+                    // The null assignment is required by Unity in order to pick up the new mesh
+                    SpatialCollider.sharedMesh = null;
+                    if (CreateMeshCollider)
+                    {
+                        SpatialCollider.sharedMesh = MeshObject;
+                        SpatialCollider.enabled = true;
+                    }
+                    else
+                    {
+                        SpatialCollider.enabled = false;
+                    }
                 }
             }
 
@@ -180,16 +208,20 @@ private void AddTriangleToSector(Vector3 sector, Vector3 point1, Vector3 point2,
             if (!meshSectors.TryGetValue(sector, out nextSectorData))
             {
                 nextSectorData = new MeshData();
+                nextSectorData.CreateMeshCollider = CreateMeshColliders;
 
                 int surfaceObjectIndex = SurfaceObjects.Count;
 
-                AddSurfaceObject(CreateSurfaceObject(
-                    mesh: nextSectorData.MeshObject,
-                    objectName: string.Format("SurfaceUnderstanding Mesh-{0}", surfaceObjectIndex),
-                    parentObject: transform,
-                    meshID: surfaceObjectIndex,
-                    drawVisualMeshesOverride: DrawProcessedMesh
-                    ));
+                SurfaceObject surfaceObject = CreateSurfaceObject(
+                  mesh: nextSectorData.MeshObject,
+                  objectName: string.Format("SurfaceUnderstanding Mesh-{0}", surfaceObjectIndex),
+                  parentObject: transform,
+                  meshID: surfaceObjectIndex,
+                  drawVisualMeshesOverride: DrawProcessedMesh);
+
+                nextSectorData.SpatialCollider = surfaceObject.Collider;
+
+                AddSurfaceObject(surfaceObject);
 
                 // Or make it if this is a new sector.
                 meshSectors.Add(sector, nextSectorData);