From 99f07e7f9694f4541de4863cee90eb8a21514c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Mon, 26 Feb 2024 16:14:42 +0100 Subject: [PATCH] Remove accidental (and pointless) usages of NPs meant for DC in MC --- .../Isosurfacing_3/contouring_seq_vs_parallel_image.cpp | 6 ++---- .../Isosurfacing_3/contouring_seq_vs_parallel_implicit.cpp | 6 ++---- .../examples/Isosurfacing_3/contouring_mesh_offset.cpp | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_image.cpp b/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_image.cpp index 976ec98c6bd..2855d6ba1d8 100644 --- a/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_image.cpp +++ b/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_image.cpp @@ -123,8 +123,7 @@ int main(int argc, char** argv) Polygon_range triangles; std::cout << "--- Marching Cubes (Sequential)" << std::endl; - IS::marching_cubes( - domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces)); + IS::marching_cubes(domain, isovalue, points, triangles); timer.stop(); @@ -146,8 +145,7 @@ int main(int argc, char** argv) Polygon_range triangles; std::cout << "--- Marching Cubes (Parallel)" << std::endl; - IS::marching_cubes( - domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces)); + IS::marching_cubes(domain, isovalue, points, triangles); timer.stop(); diff --git a/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_implicit.cpp b/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_implicit.cpp index fddf246219a..e5397be4ddf 100644 --- a/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_implicit.cpp +++ b/Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_implicit.cpp @@ -116,8 +116,7 @@ int main(int argc, char** argv) Polygon_range triangles; std::cout << "--- Marching Cubes (Sequential)" << std::endl; - IS::marching_cubes( - domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces)); + IS::marching_cubes(domain, isovalue, points, triangles); timer.stop(); @@ -139,8 +138,7 @@ int main(int argc, char** argv) Polygon_range triangles; std::cout << "--- Marching Cubes (Parallel)" << std::endl; - IS::marching_cubes( - domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces)); + IS::marching_cubes(domain, isovalue, points, triangles); timer.stop(); diff --git a/Isosurfacing_3/examples/Isosurfacing_3/contouring_mesh_offset.cpp b/Isosurfacing_3/examples/Isosurfacing_3/contouring_mesh_offset.cpp index 1fa836f7aa1..5ad3e197323 100644 --- a/Isosurfacing_3/examples/Isosurfacing_3/contouring_mesh_offset.cpp +++ b/Isosurfacing_3/examples/Isosurfacing_3/contouring_mesh_offset.cpp @@ -84,8 +84,7 @@ void run_marching_cubes(const Grid& grid, // run marching cubes std::cout << "Running Marching Cubes with isovalue = " << offset_value << std::endl; - CGAL::Isosurfacing::marching_cubes(domain, offset_value, points, triangles, - CGAL::parameters::do_not_triangulate_faces(true)); + CGAL::Isosurfacing::marching_cubes(domain, offset_value, points, triangles); std::cout << "Output #vertices (MC): " << points.size() << std::endl; std::cout << "Output #triangles (MC): " << triangles.size() << std::endl; @@ -114,7 +113,8 @@ void run_dual_contouring(const Grid& grid, // run dual contouring std::cout << "Running Dual Contouring with isovalue = " << offset_value << std::endl; - CGAL::Isosurfacing::dual_contouring(domain, offset_value, points, triangles); + CGAL::Isosurfacing::dual_contouring(domain, offset_value, points, triangles, + CGAL::parameters::do_not_triangulate_faces(true)); std::cout << "Output #vertices (DC): " << points.size() << std::endl; std::cout << "Output #triangles (DC): " << triangles.size() << std::endl;