periodic_delaunay: removed unused lock variable

mesh_tetrahedralize: option to merge or not to merge coplanar facets
BrunoLevy · Oct 1, 2024 · f8993ce · f8993ce
1 parent fed35c1
commit f8993ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp b/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp
@@ -4110,7 +4110,6 @@ namespace GEO {
 
 
         PeriodicDelaunay3dThread* thread0 = thread(0);
-        Process::spinlock lock = GEOGRAM_SPINLOCK_INIT;
 
 	// Lag_cell_status:
 	//

diff --git a/src/lib/geogram/mesh/mesh_tetrahedralize.cpp b/src/lib/geogram/mesh/mesh_tetrahedralize.cpp
@@ -111,7 +111,7 @@ namespace GEO {
                 intersection.set_verbose(verbose);
                 intersection.intersect();
                 intersection.remove_internal_shells();
-                if(iter == 0) {
+                if(iter == 0 && parameters.preprocess_merge_coplanar_facets) {
                     intersection.simplify_coplanar_facets();
                 }
                 mesh_repair(M, MESH_REPAIR_DEFAULT, epsilon);

diff --git a/src/lib/geogram/mesh/mesh_tetrahedralize.h b/src/lib/geogram/mesh/mesh_tetrahedralize.h
@@ -61,6 +61,10 @@ namespace GEO {
          *  removes intersections and extracts external boundary.
          */
         bool preprocess = false;
+	/**
+	 * \brief merge coplanar facets
+	 */
+	bool preprocess_merge_coplanar_facets = false;
         /**
          * \brief Maximum distance for merging vertices if preprocess is set
          * \details In percent of bounding box diagonal