From d5b51a84efde1935843ae4785d1391bd56711f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 23 Mar 2022 18:39:31 +0100 Subject: [PATCH] PMP misc spring cleaning --- .../compute_normals_example.cpp | 2 +- .../compute_normals_example_OM.cpp | 2 +- .../compute_normals_example_Polyhedron.cpp | 2 +- .../connected_components_example.cpp | 3 +- .../corefinement_LCC.cpp | 2 ++ .../corefinement_OM_union.cpp | 3 +- .../corefinement_SM.cpp | 2 +- .../corefinement_consecutive_bool_op.cpp | 2 +- .../corefinement_difference_remeshed.cpp | 2 ++ .../corefinement_mesh_union.cpp | 3 +- ...refinement_mesh_union_and_intersection.cpp | 4 ++- ...orefinement_mesh_union_with_attributes.cpp | 2 +- .../corefinement_polyhedron_union.cpp | 1 + .../detect_features_example.cpp | 6 ++-- .../face_filtered_graph_example.cpp | 3 +- .../hole_filling_example.cpp | 4 ++- .../hole_filling_example_LCC.cpp | 4 ++- .../hole_filling_example_OM.cpp | 8 ++++-- .../hole_filling_example_SM.cpp | 5 ++-- .../isotropic_remeshing_example.cpp | 6 ++-- .../isotropic_remeshing_of_patch_example.cpp | 4 ++- .../manifoldness_repair_example.cpp | 2 +- .../Polygon_mesh_processing/match_faces.cpp | 3 +- .../mesh_slicer_example.cpp | 5 +++- .../mesh_smoothing_example.cpp | 2 +- .../orient_polygon_soup_example.cpp | 3 +- .../orientation_pipeline_example.cpp | 3 +- .../point_inside_example.cpp | 5 ++-- .../point_inside_example_OM.cpp | 5 ++-- .../polyhedral_envelope.cpp | 1 + .../polyhedral_envelope_mesh_containment.cpp | 2 ++ .../polyhedral_envelope_of_triangle_soup.cpp | 3 +- .../random_perturbation_SM_example.cpp | 2 +- .../refine_fair_example.cpp | 5 +++- .../self_intersections_example.cpp | 4 ++- .../shape_smoothing_example.cpp | 3 +- .../stitch_borders_example.cpp | 2 +- .../stitch_borders_example_OM.cpp | 2 +- .../surface_mesh_intersection.cpp | 3 +- .../triangulate_faces_example.cpp | 2 +- .../triangulate_faces_example_OM.cpp | 2 +- ...riangulate_faces_split_visitor_example.cpp | 7 +++-- .../volume_connected_components.cpp | 1 + .../IO/polygon_mesh_io.h | 3 ++ .../connected_components.h | 7 ++--- .../CGAL/Polygon_mesh_processing/distance.h | 9 +++--- .../CGAL/Polygon_mesh_processing/measure.h | 28 +++++++++++-------- .../CGAL/Polygon_mesh_processing/repair.h | 2 +- 48 files changed, 115 insertions(+), 71 deletions(-) diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example.cpp index a9d4daee422..c7e1fbdb21c 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example.cpp @@ -4,8 +4,8 @@ #include #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_OM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_OM.cpp index 2abb4b412a7..25f8fb6d41a 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_OM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_OM.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_Polyhedron.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_Polyhedron.cpp index d0348f71492..d21d675eb2b 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_Polyhedron.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/compute_normals_example_Polyhedron.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp index a5bfd86e560..22f30364b7b 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp @@ -8,8 +8,9 @@ #include #include -#include +#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_LCC.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_LCC.cpp index c69a120cf10..232164a1b95 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_LCC.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_LCC.cpp @@ -5,6 +5,8 @@ #include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_OM_union.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_OM_union.cpp index 729cdaa7e8b..c6a7e332434 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_OM_union.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_OM_union.cpp @@ -7,14 +7,13 @@ #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; // default kernel for OpenMesh point type typedef CGAL::Exact_predicates_exact_constructions_kernel EK; // alternatice kernel we want to use typedef OpenMesh::PolyMesh_ArrayKernelT< > Mesh; - typedef boost::property_map >::type Exact_point_map; struct Exact_vertex_point_map diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_SM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_SM.cpp index a85495fef53..c77fb62fd77 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_SM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_SM.cpp @@ -4,8 +4,8 @@ #include #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_consecutive_bool_op.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_consecutive_bool_op.cpp index 418fb4605a5..a4d43817c1f 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_consecutive_bool_op.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_consecutive_bool_op.cpp @@ -5,8 +5,8 @@ #include #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Exact_predicates_exact_constructions_kernel EK; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp index b679f7bf5ae..b7388c3841d 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp @@ -9,6 +9,8 @@ #include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union.cpp index 2a585f34b60..bf226b0dc0c 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union.cpp @@ -4,7 +4,8 @@ #include #include -#include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp index 8cf8216190c..ffa6f9aeb2e 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp @@ -4,8 +4,10 @@ #include #include -#include +#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_with_attributes.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_with_attributes.cpp index b88cdc39e83..1132700499e 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_with_attributes.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_with_attributes.cpp @@ -6,8 +6,8 @@ #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_polyhedron_union.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_polyhedron_union.cpp index 7a086bed5df..a53b1473b13 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_polyhedron_union.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_polyhedron_union.cpp @@ -7,6 +7,7 @@ #include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Polyhedron_3 Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/detect_features_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/detect_features_example.cpp index 7d1a074b84e..0f2a5e09a27 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/detect_features_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/detect_features_example.cpp @@ -4,8 +4,8 @@ #include #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; @@ -43,8 +43,8 @@ int main(int argc, char* argv[]) ++nb_sharp_edges; } - std::cout<<"This mesh contains "< #include -#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example.cpp index 5a5d0d16277..41d23352506 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example.cpp @@ -4,8 +4,10 @@ #include #include -#include #include +#include +#include +#include #include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_LCC.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_LCC.cpp index 68d129febef..2c5550009d2 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_LCC.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_LCC.cpp @@ -5,8 +5,10 @@ #include #include -#include #include +#include +#include +#include #include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp index cc8dd4d54f4..db5082b82b4 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp @@ -7,10 +7,12 @@ #include #include -#include -#include -#include #include +#include +#include +#include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_SM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_SM.cpp index 699a7e9118a..b20e4e568b8 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_SM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_SM.cpp @@ -8,9 +8,10 @@ #include #include -#include +#include +#include +#include #include -#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp index e957fe8842a..048739c136f 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp @@ -6,9 +6,9 @@ #include -#include -#include +#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) PMP::isotropic_remeshing(faces(mesh), target_edge_length, mesh, CGAL::parameters::number_of_iterations(nb_iter) - .protect_constraints(true)); //i.e. protect border, here + .protect_constraints(true)); //i.e. protect border, here std::cout << "Remeshing done." << std::endl; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp index b73a2b4c416..4c27d922231 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp @@ -7,7 +7,9 @@ #include -#include +#include +#include +#include #include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp index ece6b8b2bb2..c6fd6f9d771 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp @@ -6,9 +6,9 @@ #include -#include #include #include +#include #include namespace PMP = CGAL::Polygon_mesh_processing; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp index 5589e638c3d..04382084f73 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp @@ -9,8 +9,9 @@ #include #include -#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_slicer_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_slicer_example.cpp index b505a8e6363..5f4b1cd78d5 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_slicer_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_slicer_example.cpp @@ -8,7 +8,10 @@ #include #include -#include +#include +#include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp index 31049f606a0..d177a2a3781 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp index 3db41626ccb..f603925bb6b 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp @@ -9,9 +9,10 @@ #include -#include #include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Polyhedron_3 Polyhedron; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/orientation_pipeline_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/orientation_pipeline_example.cpp index 638cfcca699..34f6c3e51de 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/orientation_pipeline_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/orientation_pipeline_example.cpp @@ -12,8 +12,9 @@ #include #include -#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_3 Point_3; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example.cpp index b950a0c505b..879325a1d5f 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example.cpp @@ -5,9 +5,10 @@ #include #include -#include -#include +#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example_OM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example_OM.cpp index d40e3ea3aae..5edcec14114 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example_OM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/point_inside_example_OM.cpp @@ -7,9 +7,10 @@ #include #include -#include -#include +#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope.cpp index 0981ea24bd9..afbb938afb5 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope.cpp @@ -2,6 +2,7 @@ #include #include +#include #include int main(int argc, char* argv[]) diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_mesh_containment.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_mesh_containment.cpp index 236c303c81e..4e814c7dccd 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_mesh_containment.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_mesh_containment.cpp @@ -3,6 +3,8 @@ #include #include +#include +#include #include namespace PMP = CGAL::Polygon_mesh_processing; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_of_triangle_soup.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_of_triangle_soup.cpp index 11de804b895..fce0a23b955 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_of_triangle_soup.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/polyhedral_envelope_of_triangle_soup.cpp @@ -2,8 +2,9 @@ #include #include -#include +#include #include +#include int main(int argc, char* argv[]) { diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/random_perturbation_SM_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/random_perturbation_SM_example.cpp index 8addbe405ee..742685e7485 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/random_perturbation_SM_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/random_perturbation_SM_example.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/refine_fair_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/refine_fair_example.cpp index 49706a4a874..23053a6766c 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/refine_fair_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/refine_fair_example.cpp @@ -5,8 +5,11 @@ #include #include -#include +#include +#include #include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/self_intersections_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/self_intersections_example.cpp index 5420ee57362..5190e66ba58 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/self_intersections_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/self_intersections_example.cpp @@ -8,7 +8,9 @@ #include #include -#include +#include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/shape_smoothing_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/shape_smoothing_example.cpp index 1e7f99e8461..4baee89a0f7 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/shape_smoothing_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/shape_smoothing_example.cpp @@ -5,7 +5,8 @@ #include #include -#include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Surface_mesh Mesh; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example.cpp index 1bfc344a90e..a7afc963ed7 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Polyhedron_3 Polyhedron; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example_OM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example_OM.cpp index 0437450b427..b731e8c0220 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example_OM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/stitch_borders_example_OM.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/surface_mesh_intersection.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/surface_mesh_intersection.cpp index a8060eac80e..0dc3a1fdf88 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/surface_mesh_intersection.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/surface_mesh_intersection.cpp @@ -6,8 +6,9 @@ #include +#include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp index ce098ae6d4b..431c71ba980 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp @@ -6,8 +6,8 @@ #include -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example_OM.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example_OM.cpp index 85787b992da..fa3deb2a512 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example_OM.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example_OM.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp index 70396e350d1..f46d09e0f2b 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp @@ -4,17 +4,18 @@ #include #include -#include +#include #include #include +#include +#include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef Kernel::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; typedef boost::graph_traits::face_descriptor face_descriptor; - - class Insert_iterator { typedef std::unordered_map Container; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/volume_connected_components.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/volume_connected_components.cpp index 43954189c8f..bd4181c3ff4 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/volume_connected_components.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/volume_connected_components.cpp @@ -9,6 +9,7 @@ #include #include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Surface_mesh Surface_mesh; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h index 62d75d51dff..923030c6d86 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h @@ -50,6 +50,9 @@ namespace IO { * * The format is detected from the filename extension (letter case is not important). * + * If repairing and orientation are known to not be required, one can use + * \link PkgBGLIOFct `CGAL::IO::read_polygon_mesh()` \endlink directly. + * * \tparam PolygonMesh a model of `MutableFaceGraph` * \tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" * diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h index 2c8396129ac..5298a09c0ee 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h @@ -476,7 +476,9 @@ std::size_t keep_largest_connected_components(PolygonMesh& pmesh, * of faces it contains), but it is also possible to pass custom sizes, such as the area of the face. * * \tparam PolygonMesh a model of `FaceListGraph` and `MutableFaceGraph` - * \tparam ThresholdValueType the type of the threshold value + * \tparam ThresholdValueType the type of the threshold value. If a face size property map is passed + * by the user, `ThresholdValueType` must be the same type as the value type of the property map. + * Otherwise, `ThresholdValueType` must be `std::size_t`. * \tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" * * \param pmesh the polygon mesh @@ -527,9 +529,6 @@ std::size_t keep_largest_connected_components(PolygonMesh& pmesh, * \cgalParamNEnd * \cgalNamedParamsEnd * - * \pre If a face size property map is passed by the user, `ThresholdValueType` must be the same - * type as the value type of the property map. Otherwise, `ThresholdValueType` must be `std::size_t`. - * * \return the number of connected components removed (ignoring isolated vertices). * * \see `keep_largest_connected_components()` diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h index e01fbe48515..1e1735ddbbb 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h @@ -2560,10 +2560,11 @@ double bounded_error_symmetric_Hausdorff_distance(const TriangleMesh1& tm1, /** * \ingroup PMP_distance_grp - * returns `true` if the Hausdorff distance between two meshes is larger than - * the user-defined max distance, otherwise it returns `false`. The distance used - * to compute the proximity of the meshes is the bounded-error Hausdorff distance. * + * \brief returns `true` if the Hausdorff distance between two meshes is larger than + * the user-defined max distance, otherwise it returns `false`. + * + * The distance used to compute the proximity of the meshes is the bounded-error Hausdorff distance. * Instead of computing the full distance and checking it against the user-provided * value, this function returns early if certain criteria show that the meshes * do not satisfy the provided `distance_bound`. @@ -2577,8 +2578,6 @@ double bounded_error_symmetric_Hausdorff_distance(const TriangleMesh1& tm1, * \cgalParamNEnd * \cgalNamedParamsEnd * - * @return Boolean `true` or `false` - * * @see `CGAL::Polygon_mesh_processing::bounded_error_Hausdorff_distance()` */ template< class Concurrency_tag, diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h index 3be7564ac36..468442de508 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h @@ -90,8 +90,8 @@ inline void rearrange_face_ids(boost::container::small_vector& i * or the geometric traits class deduced from the point property map of `pmesh`. * * \warning This function involves a square root computation. - * If `FT` does not have a `sqrt()` operation, the square root computation - * will be done approximately. + * If `FT` does not support the `sqrt()` operation, the square root computation + * will be performed approximately. * * @sa `squared_edge_length()` * @sa `face_border_length()` @@ -245,8 +245,8 @@ squared_edge_length(typename boost::graph_traits::edge_descriptor e * from the point property map of `pmesh`. * * \warning This function involves a square root computation. - * If `Kernel::FT` does not have a `sqrt()` operation, the square root computation - * will be done approximately. + * If `Kernel::FT` does not support the `sqrt()` operation, the square root computation + * will be performed approximately. * * @sa `edge_length()` */ @@ -309,6 +309,10 @@ face_border_length(typename boost::graph_traits::halfedge_descripto * \ref bgl_namedparameters "Named Parameters" if provided, * or the geometric traits class deduced from the point property map of `pmesh` * + * @warning This function involves a square root computation. + * If `Kernel::FT` does not support the `sqrt()` operation, the square root computation + * will be performed approximately. + * * @see `face_border_length()` */ template::face_descriptor f, * or the geometric traits class deduced from the point property map of `tmesh`. * * \warning This function involves a square root computation. - * If `Kernel::FT` does not have a `sqrt()` operation, the square root computation - * will be done approximately. + * If `Kernel::FT` does not support the `sqrt()` operation, the square root computation + * will be performed approximately. * * @sa `face_area()` */ @@ -597,8 +601,8 @@ area(FaceRange face_range, * or the geometric traits class deduced from the point property map of `tmesh`. * * \warning This function involves a square root computation. - * If `Kernel::FT` does not have a `sqrt()` operation, the square root computation - * will be done approximately. + * If `Kernel::FT` does not support the `sqrt()` operation, the square root computation + * will be performed approximately. * * @sa `face_area()` */ @@ -723,8 +727,8 @@ volume(const TriangleMesh& tmesh, * or the geometric traits class deduced from the point property map of `tmesh`. * * \warning This function involves a square root computation. - * If `Kernel::FT` does not have a `sqrt()` operation, the square root computation - * will be done approximately. + * If `Kernel::FT` does not support the `sqrt()` operation, the square root computation + * will be performed approximately. */ template diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h index 354f3df181e..dff4a6068b8 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h @@ -33,7 +33,7 @@ namespace Polygon_mesh_processing { /// /// \brief removes the isolated vertices from any polygon mesh. /// -/// A vertex is considered isolated if it is not incident to any simplex of higher dimension. +/// A vertex is considered isolated if it is not incident to a simplex of higher dimension. /// /// @tparam PolygonMesh a model of `FaceListGraph` and `MutableFaceGraph` ///