Merge pull request #60 from petrasvestartas/compute_contacts_bvh

FIX compute_contacts with bvh and kdtree.

Author: tomvanmele

CHANGELOG.md

@@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Fixed bug in `compas_model.models.Model.transformation`.
+* BVH and KDTree search combination in `compas_model.models.Model.compute_contacts`.
+* Clean-up of mesh boolean triangulation in `compas_model.interactions.modifiers.boolean_modifier`.
+
 
 ### Removed
 

src/compas_model/interactions/modifiers/boolean_modifier.py

@@ -61,4 +61,14 @@ def apply(self, target: Union[Brep, Mesh]):
 
             V, F = boolean_difference_mesh_mesh(A, B)
             mesh: Mesh = Mesh.from_vertices_and_faces(V, F) if len(V) > 0 and len(F) > 0 else mesh0
+
+            # WIP: merge coplanar mesh faces, in the future use mesh corefinement from CGAL to avoid Brep to Mesh conversion.
+            from compas.tolerance import TOL
+
+            name = mesh.name
+            brep = Brep.from_mesh(mesh)
+            brep.simplify(lineardeflection=TOL.lineardeflection, angulardeflection=TOL.angulardeflection)
+            mesh = Mesh.from_polygons(brep.to_polygons())
+            mesh.unify_cycles()
+            mesh.name = name
             return mesh

src/compas_model/models/model.py

@@ -626,7 +626,7 @@ def compute_kdtree(self) -> KDTree:
     def compute_collisions(self):
         pass
 
-    def compute_contacts(self, tolerance=1e-6, minimum_area=1e-2, k=2) -> None:
+    def compute_contacts(self, tolerance=1e-6, minimum_area=1e-2, k=2, search_type="bvh") -> None:
         """Compute the contacts between the block elements of this model.
 
         Parameters
@@ -637,6 +637,8 @@ def compute_contacts(self, tolerance=1e-6, minimum_area=1e-2, k=2) -> None:
             The minimum contact size.
         k : int, optional
             The number of element neighbours to consider.
+        search_type : str, optional
+            Nearest neighbour algorithm type, possible options: 'bvh' or 'kdtree'.
 
         Returns
         -------
@@ -645,8 +647,18 @@ def compute_contacts(self, tolerance=1e-6, minimum_area=1e-2, k=2) -> None:
         """
         for element in self.elements():
             u = element.graphnode
-            nnbrs = self.element_nnbrs(element, k=k)
-            for nbr, _ in nnbrs:
+
+            nnbrs = []
+            if search_type == "bvh":
+                nnbrs = self.bvh.nearest_neighbors(element)
+            elif search_type == "kdtree":
+                nnbrs_and_distances = self.element_nnbrs(element, k=k)
+                for id, _ in nnbrs_and_distances:
+                    nnbrs.append(id)
+            else:
+                raise ValueError("Unknown search type, possible options: 'bvh' or 'kdtree'")
+
+            for nbr in nnbrs:
                 v = nbr.graphnode
                 if not self.graph.has_edge((u, v), directed=False):
                     contacts = element.contacts(nbr, tolerance=tolerance, minimum_area=minimum_area)