From b26edb5a86c7109edf0f7cf0e4f4525d56fd3ee4 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 30 Sep 2021 15:36:03 +0200 Subject: [PATCH] minor reorganization --- .../CGAL/Polygon_mesh_processing/make_surface_mesh.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Mesh_3/include/CGAL/Polygon_mesh_processing/make_surface_mesh.h b/Mesh_3/include/CGAL/Polygon_mesh_processing/make_surface_mesh.h index 24c9fd1c2a9..0650a511ecb 100644 --- a/Mesh_3/include/CGAL/Polygon_mesh_processing/make_surface_mesh.h +++ b/Mesh_3/include/CGAL/Polygon_mesh_processing/make_surface_mesh.h @@ -125,8 +125,8 @@ namespace Polygon_mesh_processing { * of `TriangleMesh`.} * \cgalParamDefault{`std::numeric_limits::max()`} * \cgalParamNEnd +* -* \cgalNamedParamsEnd * * @todo add edge_sizing_field_, * facet_angle_, facet_size_, facet_sizing_field_, facet_distance_, facet_topology_, @@ -144,7 +144,7 @@ void make_surface_mesh(const TriangleMesh& pmesh using TM = TriangleMesh; using GT = typename GetGeomTraits::type; using Mesh_domain = CGAL::Polyhedral_mesh_domain_with_features_3; - using Tr = CGAL::Mesh_triangulation_3::type; + using Tr = typename CGAL::Mesh_triangulation_3::type; using C3t3 = CGAL::Mesh_complex_3_in_triangulation_3; @@ -156,10 +156,6 @@ void make_surface_mesh(const TriangleMesh& pmesh return; } - const bool protect = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::protect_constraints), false); - const typename GT::FT angle_bound - = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::features_angle_bound), 60.); - // Create a vector with only one element: the pointer to the polyhedron. std::vector poly_ptrs_vector(1); poly_ptrs_vector[0] = &pmesh; @@ -170,6 +166,8 @@ void make_surface_mesh(const TriangleMesh& pmesh Mesh_domain domain(poly_ptrs_vector.begin(), poly_ptrs_vector.end()); // Get sharp features + const bool protect = choose_parameter(get_parameter(np, internal_np::protect_constraints), false); + const FT angle_bound = choose_parameter(get_parameter(np, internal_np::features_angle_bound), 60.); if(protect) domain.detect_features(angle_bound); //includes detection of borders