From 3d493adfefb1265c8c815eb307fa7e5865a2a53d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 31 Jan 2024 12:25:58 +0100 Subject: [PATCH] "merge facets" is not by default --- Triangulation_3/test/Triangulation_3/CMakeLists.txt | 1 + Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Triangulation_3/test/Triangulation_3/CMakeLists.txt b/Triangulation_3/test/Triangulation_3/CMakeLists.txt index 7d94284525e..3077901aa06 100644 --- a/Triangulation_3/test/Triangulation_3/CMakeLists.txt +++ b/Triangulation_3/test/Triangulation_3/CMakeLists.txt @@ -80,6 +80,7 @@ function(CGAL_add_cdt3_from_off_test_aux data_name data_dir) endif() add_test(NAME "execution of cdt_3_from_off ${data_name}" COMMAND cdt_3_from_off + --no-merge-facets ${data_dir}/${data_filename} ${CMAKE_CURRENT_BINARY_DIR}/dump_output_${data_name}.off) if(MY_ONLY_MERGE_FACETS) diff --git a/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp b/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp index d987947a2ed..cdb636eea21 100644 --- a/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp +++ b/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp @@ -62,7 +62,7 @@ struct CDT_options { int verbose = 0; bool quiet = false; - bool merge_facets = false; + bool merge_facets = true; bool merge_facets_old_method = false; double ratio = 0.; double vertex_vertex_epsilon = 1e-6; @@ -85,7 +85,7 @@ Usage: cdt_3_from_off [options] input.off output.off output.off: output mesh -V/--verbose: verbose (can be used several times) - --merge-facets: merge facets into patches (unset by default) + --merge-facets/--no-merge-facets: merge facets into patches (set by default) --ratio : ratio of faces to remove (default: 0) --failure-expression : expression to detect bad mesh (to use with --ratio) --dump-patches-after-merge : dump patches after merging facets in PLY @@ -113,6 +113,8 @@ int main(int argc, char* argv[]) std::string arg = argv[i]; if(arg == "--merge-facets") { options.merge_facets = true; + } else if(arg == "--no-merge-facets") { + options.merge_facets = false; } else if(arg == "--merge-facets-old") { options.merge_facets = true; options.merge_facets_old_method = true;