songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove accidental (and pointless) usages of NPs meant for DC in MC

This commit is contained in:
Mael Rouxel-Labbé 2024-02-26 16:14:42 +01:00
parent f686fae8ef
commit 99f07e7f96
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_image.cpp
View File

@ -123,8 +123,7 @@ int main(int argc, char** argv)
Polygon_range triangles; Polygon_range triangles;
std::cout << "--- Marching Cubes (Sequential)" << std::endl; std::cout << "--- Marching Cubes (Sequential)" << std::endl;
IS::marching_cubes<CGAL::Sequential_tag>( IS::marching_cubes<CGAL::Sequential_tag>(domain, isovalue, points, triangles);
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
timer.stop(); timer.stop();
@ -146,8 +145,7 @@ int main(int argc, char** argv)
Polygon_range triangles; Polygon_range triangles;
std::cout << "--- Marching Cubes (Parallel)" << std::endl; std::cout << "--- Marching Cubes (Parallel)" << std::endl;
IS::marching_cubes<CGAL::Parallel_if_available_tag>( IS::marching_cubes<CGAL::Parallel_if_available_tag>(domain, isovalue, points, triangles);
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
timer.stop(); timer.stop();

6
Isosurfacing_3/benchmark/Isosurfacing_3/contouring_seq_vs_parallel_implicit.cpp
View File

@ -116,8 +116,7 @@ int main(int argc, char** argv)
Polygon_range triangles; Polygon_range triangles;
std::cout << "--- Marching Cubes (Sequential)" << std::endl; std::cout << "--- Marching Cubes (Sequential)" << std::endl;
IS::marching_cubes<CGAL::Sequential_tag>( IS::marching_cubes<CGAL::Sequential_tag>(domain, isovalue, points, triangles);
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
timer.stop(); timer.stop();
@ -139,8 +138,7 @@ int main(int argc, char** argv)
Polygon_range triangles; Polygon_range triangles;
std::cout << "--- Marching Cubes (Parallel)" << std::endl; std::cout << "--- Marching Cubes (Parallel)" << std::endl;
IS::marching_cubes<CGAL::Parallel_if_available_tag>( IS::marching_cubes<CGAL::Parallel_if_available_tag>(domain, isovalue, points, triangles);
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
timer.stop(); timer.stop();

6
Isosurfacing_3/examples/Isosurfacing_3/contouring_mesh_offset.cpp
View File

@ -84,8 +84,7 @@ void run_marching_cubes(const Grid& grid,
// run marching cubes // run marching cubes
std::cout << "Running Marching Cubes with isovalue = " << offset_value << std::endl; std::cout << "Running Marching Cubes with isovalue = " << offset_value << std::endl;
CGAL::Isosurfacing::marching_cubes(domain, offset_value, points, triangles, CGAL::Isosurfacing::marching_cubes(domain, offset_value, points, triangles);
CGAL::parameters::do_not_triangulate_faces(true));
std::cout << "Output #vertices (MC): " << points.size() << std::endl; std::cout << "Output #vertices (MC): " << points.size() << std::endl;
std::cout << "Output #triangles (MC): " << triangles.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 // run dual contouring
std::cout << "Running Dual Contouring with isovalue = " << offset_value << std::endl; 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 #vertices (DC): " << points.size() << std::endl;
std::cout << "Output #triangles (DC): " << triangles.size() << std::endl; std::cout << "Output #triangles (DC): " << triangles.size() << std::endl;