Skip to content

Commit 2e1decd

Browse files
committed
Renamed Collider to SpatialCollider and removed check for null (want it to always be set and blow up otherwise)
1 parent 6a96180 commit 2e1decd

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private class MeshData
100100
/// <summary>
101101
/// The MeshCollider with which this mesh is associated.
102102
/// </summary>
103-
public MeshCollider Collider = null;
103+
public MeshCollider SpatialCollider = null;
104104

105105
/// <summary>
106106
/// Clears the geometry, but does not clear the mesh.
@@ -123,11 +123,8 @@ public void Commit()
123123
MeshObject.SetTriangles(tris, 0);
124124
MeshObject.RecalculateNormals();
125125
MeshObject.RecalculateBounds();
126-
if (Collider)
127-
{
128-
Collider.sharedMesh = null;
129-
Collider.sharedMesh = MeshObject;
130-
}
126+
SpatialCollider.sharedMesh = null;
127+
SpatialCollider.sharedMesh = MeshObject;
131128
}
132129
}
133130

@@ -200,7 +197,7 @@ private void AddTriangleToSector(Vector3 sector, Vector3 point1, Vector3 point2,
200197
meshID: surfaceObjectIndex,
201198
drawVisualMeshesOverride: DrawProcessedMesh);
202199

203-
nextSectorData.Collider = surfaceObject.Collider;
200+
nextSectorData.SpatialCollider = surfaceObject.Collider;
204201

205202
AddSurfaceObject(surfaceObject);
206203

0 commit comments

Comments
 (0)