From ef773ab8e4bec653438ff316808a14871efec755 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Sun, 19 Mar 2023 15:37:01 +0200 Subject: [PATCH 01/52] Fixed hole filtering. The code use to erroneously remove holes from an std::deque of holes that do not affect the mink. sum. Now it simply adds those that do affect it. --- .../CGAL/Minkowski_sum_2/Hole_filter_2.h | 42 ++++++------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Hole_filter_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Hole_filter_2.h index cfb2cedde6f..8248045f598 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Hole_filter_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Hole_filter_2.h @@ -26,16 +26,12 @@ namespace CGAL { * to the Minkowski sum boundary. */ template -class Hole_filter_2 -{ +class Hole_filter_2 { private: - typedef Kernel_ Kernel; - typedef Container_ Container; - - typedef CGAL::Polygon_2 Polygon_2; - typedef CGAL::Polygon_with_holes_2 Polygon_with_holes_2; - typedef typename Polygon_with_holes_2::Hole_iterator Hole_iterator; - typedef std::vector Hole_iterator_vector; + using Kernel = Kernel_; + using Container = Container_; + using Polygon_2 = CGAL::Polygon_2; + using Polygon_with_holes_2 = CGAL::Polygon_with_holes_2; public: /*! Filter out holes of a polygon with holes. @@ -45,29 +41,17 @@ public: */ void operator()(const Polygon_with_holes_2& pgn1, const Polygon_2& pgn2, - Polygon_with_holes_2& filtered_pgn1) const - { - filtered_pgn1 = pgn1; - - Hole_iterator_vector to_erase; + Polygon_with_holes_2& filtered_pgn1) const { Bbox_2 boundary_bbox = pgn2.bbox(); - - Hole_iterator it = filtered_pgn1.holes_begin(); - while (it != filtered_pgn1.holes_end()) { - Bbox_2 hole_bbox = (*it).bbox(); - - if ((hole_bbox.ymax()-hole_bbox.ymin() < - boundary_bbox.ymax()-boundary_bbox.ymin()) || - (hole_bbox.xmax()-hole_bbox.xmin() < + filtered_pgn1 = Polygon_with_holes_2(pgn1.outer_boundary()); + for (const auto& h : pgn1.holes()) { + Bbox_2 hole_bbox = h.bbox(); + if ((hole_bbox.ymax()-hole_bbox.ymin() >= + boundary_bbox.ymax()-boundary_bbox.ymin()) && + (hole_bbox.xmax()-hole_bbox.xmin() >= boundary_bbox.xmax()-boundary_bbox.xmin())) - { - to_erase.push_back(it); - } - ++it; + filtered_pgn1.add_hole(h); } - - typename Hole_iterator_vector::iterator it2 = to_erase.begin(); - while (it2 != to_erase.end()) filtered_pgn1.erase_hole(*it2++); } /*! Filter out holes of a polygon with holes. From c32272876b6ab3aff44a1bd69f462a021d0ab36a Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Sun, 19 Mar 2023 15:41:26 +0200 Subject: [PATCH 02/52] Added a description of a yet another bug fir in the Minkowski_sum_2 package --- Installation/CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 6baa48451f2..25e9701c791 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -106,6 +106,7 @@ extracted from labeled images. ### [2D Minkowski Sums](https://doc.cgal.org/5.6/Manual/packages.html#PkgMinkowskiSum2) - Fixed a bug that made holes in the Minkowski sum disappear +- Fixed hole filtering. The code use to erroneously remove holes from the container of holes of polygons with holes that did not affect the mink. sum. Now it simply adds those that do affect it. [Release 5.5](https://github.com/CGAL/cgal/releases/tag/v5.5) ----------- From 20c2df0692e1542c6febf8f1925dbd3becf764b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 09:59:21 +0200 Subject: [PATCH 03/52] Add triangulate_PS prototype --- .../triangulate_faces.h | 332 +++++++++++++++++- 1 file changed, 319 insertions(+), 13 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index d479b6d7d1b..9364e899231 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -15,8 +15,6 @@ #include -#include - #include #include @@ -24,6 +22,7 @@ #include #include #include +#include #include #else #include @@ -54,7 +53,8 @@ namespace Triangulate_faces * overridden. */ template -struct Default_visitor { +struct Default_visitor +{ typedef boost::graph_traits GT; typedef typename GT::face_descriptor face_descriptor; @@ -71,7 +71,7 @@ template -class Triangulate_modifier +class Triangulate_polygon_mesh_modifier { typedef Kernel Traits; @@ -91,7 +91,7 @@ class Triangulate_modifier Traits _traits; public: - Triangulate_modifier(VertexPointMap vpmap, const Traits& traits = Traits()) + Triangulate_polygon_mesh_modifier(VertexPointMap vpmap, const Traits& traits = Traits()) : _vpmap(vpmap), _traits(traits) { } @@ -420,9 +420,9 @@ public: } -}; // end class Triangulate_modifier +}; // class Triangulate_polygon_mesh_modifier -}//end namespace internal +} // namespace internal /** * \ingroup PMP_meshing_grp @@ -479,7 +479,7 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor //VertexPointMap typedef typename GetVertexPointMap::type VPMap; VPMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point), - get_property_map(vertex_point, pmesh)); + get_property_map(vertex_point, pmesh)); //Kernel typedef typename GetGeomTraits::type Kernel; @@ -497,7 +497,7 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor get_parameter(np, internal_np::visitor), Triangulate_faces::Default_visitor()); - internal::Triangulate_modifier modifier(vpmap, traits); + internal::Triangulate_polygon_mesh_modifier modifier(vpmap, traits); return modifier.triangulate_face(f, pmesh, use_cdt, visitor); } @@ -574,7 +574,7 @@ bool triangulate_faces(FaceRange face_range, get_parameter(np, internal_np::visitor), Triangulate_faces::Default_visitor()); - internal::Triangulate_modifier modifier(vpmap, traits); + internal::Triangulate_polygon_mesh_modifier modifier(vpmap, traits); return modifier(face_range, pmesh, use_cdt, visitor); } @@ -626,10 +626,316 @@ bool triangulate_faces(PolygonMesh& pmesh, return triangulate_faces(faces(pmesh), pmesh, np); } -} // end namespace Polygon_mesh_processing +//////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Polygon Soup -} // end namespace CGAL +namespace internal { -#include +template +class Triangulate_polygon_soup_modifier +{ + using Traits = Kernel; + using Point = typename Traits::Point_3; + using Vector = typename Traits::Vector_3; + +private: + Traits _traits; + +public: + Triangulate_polygon_soup_modifier(const Traits& traits = Traits()) + : _traits(traits) + { } + +private: + template + bool triangulate_face_with_CDT(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, + PMap pmap, + Visitor visitor) + { + using Point_ref = typename boost::property_traits::reference; + + using PK = CGAL::Projection_traits_3; + using Vbb = CGAL::Triangulation_vertex_base_with_info_2; + using Vb = CGAL::Triangulation_vertex_base_2; + using Fb = CGAL::Constrained_triangulation_face_base_2; + using TDS = CGAL::Triangulation_data_structure_2; + using Itag = CGAL::No_constraint_intersection_requiring_constructions_tag; + using CDT = CGAL::Constrained_Delaunay_triangulation_2; + using CDT_Vertex_handle = typename CDT::Vertex_handle; + using CDT_Face_handle = typename CDT::Face_handle; + + const std::size_t original_size = polygon.size(); + + Vector n = CGAL::NULL_VECTOR; + for(std::size_t i=0; iinfo() = i; + if(previous != CDT_Vertex_handle() && previous != vh) + cdt.insert_constraint(previous, vh); + + previous = vh; + } + cdt.insert_constraint(previous, first); + + if(cdt.dimension() != 2 || cdt.number_of_vertices() != polygon.size()) + return false; + + std::unordered_map in_domain_map; + boost::associative_property_map< std::unordered_map > in_domain(in_domain_map); + + CGAL::mark_domain_in_triangulation(cdt, in_domain); + + // visitor.before_subface_creations(f); + + for(CDT_Face_handle f : cdt.finite_face_handles()) + { + if(!get(in_domain, f)) + continue; + + triangulated_polygons.push_back({f->vertex(0)->info(), f->vertex(1)->info(), f->vertex(2)->info()}); + // visitor.after_subface_created(face(h0, pmesh)); + } + + // visitor.after_subface_creations(); + return true; + } + + template + bool triangulate_face_with_hole_filling(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, + PMap pmap, + Visitor visitor) + { + namespace PMP = CGAL::Polygon_mesh_processing; + + // gather halfedges around the face + std::vector hole_points; + std::vector hole_points_indices; + + for(std::size_t i : polygon) + { + hole_points.push_back(get(pmap, points[i])); + hole_points_indices.push_back(i); + } + + // use hole filling + typedef CGAL::Triple Face_indices; + std::vector patch; + PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), + parameters::geom_traits(_traits)); + + if(patch.empty()) + return false; + + // visitor.before_subface_creations(f); + + for(const Face_indices& triangle : patch) + { + triangulated_polygons.push_back({hole_points_indices[triangle.first], + hole_points_indices[triangle.second], + hole_points_indices[triangle.third]}); + // visitor.after_subface_created(face(h0, pmesh)); + } + + // visitor.after_subface_creations(); + return true; + } + + template + bool triangulate_face(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, + PMap pmap, + const bool use_cdt, + Visitor visitor) + { + using FT = typename Traits::FT; + using Point_ref = typename boost::property_traits::reference; + + const std::size_t original_size = polygon.size(); + if(original_size == 4) + { + Point_ref p0 = get(pmap, points[polygon[0]]); + Point_ref p1 = get(pmap, points[polygon[1]]); + Point_ref p2 = get(pmap, points[polygon[2]]); + Point_ref p3 = get(pmap, points[polygon[3]]); + + /* Chooses the diagonal that will split the quad in two triangles that maximize + * the scalar product of of the un-normalized normals of the two triangles. + * The lengths of the un-normalized normals (computed using cross-products of two vectors) + * are proportional to the area of the triangles. + * Maximize the scalar product of the two normals will avoid skinny triangles, + * and will also taken into account the cosine of the angle between the two normals. + * In particular, if the two triangles are oriented in different directions, + * the scalar product will be negative. + */ + FT p1p3 = CGAL::cross_product(p2-p1, p3-p2) * CGAL::cross_product(p0-p3, p1-p0); + FT p0p2 = CGAL::cross_product(p1-p0, p1-p2) * CGAL::cross_product(p3-p2, p3-p0); + + // visitor.before_subface_creations(f); + if(p0p2 > p1p3) + { + triangulated_polygons.push_back({polygon[0], polygon[1], polygon[2]}); + triangulated_polygons.push_back({polygon[0], polygon[2], polygon[3]}); + } + else + { + triangulated_polygons.push_back({polygon[0], polygon[1], polygon[3]}); + triangulated_polygons.push_back({polygon[1], polygon[2], polygon[3]}); + } + + // visitor.after_subface_created(face(res,pmesh)); + // visitor.after_subface_created(face(opposite(res,pmesh),pmesh)); + + // visitor.after_subface_creations(); + } + else + { +#ifndef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 + if(use_cdt) + return triangulate_face_with_CDT(polygon, points, triangulated_polygons, pmap, visitor); + +#else + CGAL_USE(use_cdt); +#endif + return triangulate_face_with_hole_filling(polygon, points, triangulated_polygons, pmap, visitor); + } + + return true; + } + +public: + template + bool operator()(const PolygonRange& polygons, + const PointRange& points, + PolygonRange& triangulated_polygons, + PMap pmap, + const bool use_cdt, + Visitor visitor) + { + using Polygon = typename boost::range_value::type; + + bool result = true; + triangulated_polygons.reserve(polygons.size()); + + for(const Polygon& polygon : polygons) + { + if(polygon.size() <= 3) + { + triangulated_polygons.push_back(polygon); + continue; + } + + if(!triangulate_face(polygon, points, triangulated_polygons, pmap, use_cdt, visitor)) + result = false; + } + + return result; + } + +}; // class Triangulate_polygon_soup_modifier + +} // namespace internal + +namespace Triangulate_faces { +namespace internal { + +struct Default_visitor_tmp // @tmp +{ + +}; + +} // namespace internal +} // namespace Triangulate_faces + +template +bool triangulate_faces_tmp(const PointRange& points, // @tmp + PolygonRange& polygons, + const NamedParameters& np = parameters::default_values()) +{ + using Polygon = typename boost::range_value::type; + + using parameters::choose_parameter; + using parameters::get_parameter; + + //VertexPointMap + using PMap = typename GetPointMap::const_type; + PMap pmap = choose_parameter(get_parameter(np, internal_np::point_map)); + + //Kernel + using Point = typename boost::property_traits::value_type; + using Def_Kernel = typename CGAL::Kernel_traits::Kernel; + using Kernel = typename internal_np::Lookup_named_param_def< + internal_np::geom_traits_t, + NamedParameters, + Def_Kernel>::type; + Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); + + //Option + bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true); + + typedef typename internal_np::Lookup_named_param_def< + internal_np::visitor_t, + NamedParameters, + Triangulate_faces::internal::Default_visitor_tmp // default + >::type Visitor; + Visitor visitor = choose_parameter(get_parameter(np, internal_np::visitor), + Triangulate_faces::internal::Default_visitor_tmp()); + + PolygonRange triangulated_polygons; + internal::Triangulate_polygon_soup_modifier modifier(traits); + const bool success = modifier(polygons, points, triangulated_polygons, pmap, use_cdt, visitor); + + std::swap(polygons, triangulated_polygons); + + return success; +} + +} // namespace Polygon_mesh_processing + +} // namespace CGAL #endif // CGAL_POLYGON_MESH_PROCESSING_TRIANGULATE_FACES_H From 83e89d85a69e32342f1f3ca364da1f38436c83a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 14:58:22 +0200 Subject: [PATCH 04/52] Fix typo --- .../include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h index cb24ce8ae7c..bca94855450 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h @@ -1125,7 +1125,7 @@ struct Polygon_soup_fixer > /// /// \tparam PointRange a model of the concepts `SequenceContainer` and `Swappable` /// and whose value type is the point type. -/// \tparam PolygonRange a model of the concept `SequenceContainer`. +/// \tparam PolygonRange a model of the concept `SequenceContainer` /// whose `value_type` is itself a model of the concepts `SequenceContainer`, /// `Swappable`, and `ReversibleContainer` whose `value_type` is `std::size_t`. /// \tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" From 51c1e21847de090f395c64f01a9f096ffcf175ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 14:58:39 +0200 Subject: [PATCH 05/52] Change ITag to No intersections, and try{}catch() the CDT2 code --- .../triangulate_faces.h | 74 +++++++++++-------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 9364e899231..41d89728e80 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -159,7 +159,7 @@ public: P_traits> Fb1; typedef CGAL::Constrained_triangulation_face_base_2 Fb; typedef CGAL::Triangulation_data_structure_2 TDS; - typedef CGAL::Exact_intersections_tag Itag; + typedef CGAL::No_constraint_intersection_tag Itag; typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; @@ -178,28 +178,35 @@ public: template bool triangulate_face_with_CDT(face_descriptor f, PM& pmesh, CDT& cdt, Visitor visitor) { + typedef typename CDT::Vertex_handle Tr_Vertex_handle; + std::size_t original_size = CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh).size(); - // Halfedge_around_facet_circulator - typedef typename CDT::Vertex_handle Tr_Vertex_handle; - halfedge_descriptor start = halfedge(f, pmesh); - halfedge_descriptor h = start; - Tr_Vertex_handle previous, first; - do + try { - Tr_Vertex_handle vh = cdt.insert(get(_vpmap, target(h, pmesh))); - if (first == Tr_Vertex_handle()) { - first = vh; - } - vh->info() = h; - if(previous != Tr_Vertex_handle() && previous != vh) { - cdt.insert_constraint(previous, vh); - } - previous = vh; - h = next(h, pmesh); + halfedge_descriptor start = halfedge(f, pmesh); + halfedge_descriptor h = start; + Tr_Vertex_handle previous, first; + do + { + Tr_Vertex_handle vh = cdt.insert(get(_vpmap, target(h, pmesh))); + if (first == Tr_Vertex_handle()) { + first = vh; + } + vh->info() = h; + if(previous != Tr_Vertex_handle() && previous != vh) { + cdt.insert_constraint(previous, vh); + } + previous = vh; + h = next(h, pmesh); - } while( h != start ); - cdt.insert_constraint(previous, first); + } while( h != start ); + cdt.insert_constraint(previous, first); + } + catch(const typename CDT::Intersection_of_constraints_exception&) + { + return false; + } // sets mark is_external for(typename CDT::All_faces_iterator fit = cdt.all_faces_begin(), @@ -667,7 +674,7 @@ private: using Vb = CGAL::Triangulation_vertex_base_2; using Fb = CGAL::Constrained_triangulation_face_base_2; using TDS = CGAL::Triangulation_data_structure_2; - using Itag = CGAL::No_constraint_intersection_requiring_constructions_tag; + using Itag = CGAL::No_constraint_intersection_tag; using CDT = CGAL::Constrained_Delaunay_triangulation_2; using CDT_Vertex_handle = typename CDT::Vertex_handle; using CDT_Face_handle = typename CDT::Face_handle; @@ -691,20 +698,27 @@ private: PK cdt_traits(n); CDT cdt(cdt_traits); - CDT_Vertex_handle previous, first; - for(std::size_t i : polygon) + try { - CDT_Vertex_handle vh = cdt.insert(get(pmap, points[i])); - if(first == CDT_Vertex_handle()) - first = vh; + CDT_Vertex_handle previous, first; + for(std::size_t i : polygon) + { + CDT_Vertex_handle vh = cdt.insert(get(pmap, points[i])); + if(first == CDT_Vertex_handle()) + first = vh; - vh->info() = i; - if(previous != CDT_Vertex_handle() && previous != vh) - cdt.insert_constraint(previous, vh); + vh->info() = i; + if(previous != CDT_Vertex_handle() && previous != vh) + cdt.insert_constraint(previous, vh); - previous = vh; + previous = vh; + } + cdt.insert_constraint(previous, first); + } + catch(const typename CDT::Intersection_of_constraints_exception&) + { + return false; } - cdt.insert_constraint(previous, first); if(cdt.dimension() != 2 || cdt.number_of_vertices() != polygon.size()) return false; From 4b2b996e088b6d05e916cd4d10c3e3e2f8051343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 14:59:17 +0200 Subject: [PATCH 06/52] Add visitor for triangulate_polygons() --- .../triangulate_faces.h | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 41d89728e80..77d6f1d36c0 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -728,7 +728,7 @@ private: CGAL::mark_domain_in_triangulation(cdt, in_domain); - // visitor.before_subface_creations(f); + visitor.before_subface_creations(polygon); for(CDT_Face_handle f : cdt.finite_face_handles()) { @@ -736,10 +736,10 @@ private: continue; triangulated_polygons.push_back({f->vertex(0)->info(), f->vertex(1)->info(), f->vertex(2)->info()}); - // visitor.after_subface_created(face(h0, pmesh)); + visitor.after_subface_created(triangulated_polygons.back()); } - // visitor.after_subface_creations(); + visitor.after_subface_creations(); return true; } @@ -775,17 +775,17 @@ private: if(patch.empty()) return false; - // visitor.before_subface_creations(f); + visitor.before_subface_creations(polygon); for(const Face_indices& triangle : patch) { triangulated_polygons.push_back({hole_points_indices[triangle.first], hole_points_indices[triangle.second], hole_points_indices[triangle.third]}); - // visitor.after_subface_created(face(h0, pmesh)); + visitor.after_subface_created(triangulated_polygons.back()); } - // visitor.after_subface_creations(); + visitor.after_subface_creations(); return true; } @@ -824,7 +824,7 @@ private: FT p1p3 = CGAL::cross_product(p2-p1, p3-p2) * CGAL::cross_product(p0-p3, p1-p0); FT p0p2 = CGAL::cross_product(p1-p0, p1-p2) * CGAL::cross_product(p3-p2, p3-p0); - // visitor.before_subface_creations(f); + visitor.before_subface_creations(polygon); if(p0p2 > p1p3) { triangulated_polygons.push_back({polygon[0], polygon[1], polygon[2]}); @@ -836,10 +836,10 @@ private: triangulated_polygons.push_back({polygon[1], polygon[2], polygon[3]}); } - // visitor.after_subface_created(face(res,pmesh)); - // visitor.after_subface_created(face(opposite(res,pmesh),pmesh)); + visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-2]); + visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-1]); - // visitor.after_subface_creations(); + visitor.after_subface_creations(); } else { @@ -892,16 +892,22 @@ public: } // namespace internal -namespace Triangulate_faces { +namespace Triangulate_polygons { namespace internal { -struct Default_visitor_tmp // @tmp +struct Default_visitor { + template + void before_subface_creations(const Polygon& /*f_old*/) {} + template + void after_subface_created(const Polygon& /*f_new*/) {} + + void after_subface_creations() {} }; } // namespace internal -} // namespace Triangulate_faces +} // namespace Triangulate_polygons template ::type Visitor; Visitor visitor = choose_parameter(get_parameter(np, internal_np::visitor), - Triangulate_faces::internal::Default_visitor_tmp()); + Triangulate_polygons::internal::Default_visitor()); PolygonRange triangulated_polygons; internal::Triangulate_polygon_soup_modifier modifier(traits); @@ -949,7 +955,6 @@ bool triangulate_faces_tmp(const PointRange& points, // @tmp } } // namespace Polygon_mesh_processing - } // namespace CGAL #endif // CGAL_POLYGON_MESH_PROCESSING_TRIANGULATE_FACES_H From 7b375129fb6d766924fe94b9135f8f887ad67a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 15:16:37 +0200 Subject: [PATCH 07/52] Document triangulate_polygons() --- .../PackageDescription.txt | 1 + .../triangulate_faces.h | 59 +++++++++++++++++-- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt index 8141fbd16f2..2fdc2471124 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt @@ -117,6 +117,7 @@ The page \ref bgl_namedparameters "Named Parameters" describes their usage. - `CGAL::Polygon_mesh_processing::fair()` - `CGAL::Polygon_mesh_processing::triangulate_face()` - `CGAL::Polygon_mesh_processing::triangulate_faces()` +- `CGAL::Polygon_mesh_processing::triangulate_polygons()` - \link PMP_meshing_grp `CGAL::Polygon_mesh_processing::isotropic_remeshing()` \endlink - \link PMP_meshing_grp `CGAL::Polygon_mesh_processing::surface_Delaunay_remeshing()` \endlink - \link PMP_meshing_grp `CGAL::Polygon_mesh_processing::split_long_edges()` \endlink diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 77d6f1d36c0..a4594228b20 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -41,11 +41,9 @@ #include namespace CGAL { - namespace Polygon_mesh_processing { +namespace Triangulate_faces { -namespace Triangulate_faces -{ /** \ingroup PMP_meshing_grp * %Default new face visitor model of `PMPTriangulateFaceVisitor`. * All its functions have an empty body. This class can be used as a @@ -895,6 +893,12 @@ public: namespace Triangulate_polygons { namespace internal { +/** \ingroup PMP_meshing_grp +* %Default new polygon visitor model of `PMPTriangulateFaceVisitor`. +* All its functions have an empty body. This class can be used as a +* base class if only some of the functions of the concept require to be +* overridden. +*/ struct Default_visitor { template @@ -909,12 +913,55 @@ struct Default_visitor } // namespace internal } // namespace Triangulate_polygons +/** +* \ingroup PMP_meshing_grp +* +* triangulates all polygons of a polygon soup. This function depends on the package \ref PkgTriangulation2. +* +* @tparam PointRange a model of `ConstRange`. The value type of its iterator is the point type. +* @tparam PolygonRange a model of the concept `SequenceContainer` and `Swappable`, +* whose `value_type` is itself a model of the concepts `SequenceContainer` +* whose `value_type` is `std::size_t`. +* @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" +* +* @param points the point geometry of the soup to be triangulated +* @param polygons the polygons to be triangulated +* @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below +* +* \cgalNamedParamsBegin +* \cgalParamNBegin{point_map} +* \cgalParamDescription{a property map associating points to the elements of the point set `points`} +* \cgalParamType{a model of `ReadablePropertyMap` whose key type is the value type +* of the iterator of `PointRange` and whose value type is `geom_traits::Point_3`} +* \cgalParamDefault{`CGAL::Identity_property_map`} +* \cgalParamNEnd +* +* \cgalParamNBegin{geom_traits} +* \cgalParamDescription{an instance of a geometric traits class} +* \cgalParamType{a class model of `Kernel`} +* \cgalParamDefault{a \cgal Kernel deduced from the point type, using `CGAL::Kernel_traits`} +* \cgalParamExtra{The geometric traits class must be compatible with the vertex point type.} +* \cgalParamNEnd +* +* \cgalParamNBegin{visitor} +* \cgalParamDescription{a visitor that enables to track how polygons are triangulated into triangles} +* \cgalParamType{a class model of `PMPTriangulateFaceVisitor`} +* \cgalParamDefault{`Triangulate_polygons::Default_visitor`} +* \cgalParamExtra{Note that the visitor will be copied, so +* it must not have any data member that does not have a reference-like type.} +* \cgalParamNEnd +* \cgalNamedParamsEnd +* +* @return `true` if all the polygons have been triangulated. +* +* @see `triangulate_face()` +*/ template -bool triangulate_faces_tmp(const PointRange& points, // @tmp - PolygonRange& polygons, - const NamedParameters& np = parameters::default_values()) +bool triangulate_polygons(const PointRange& points, + PolygonRange& polygons, + const NamedParameters& np = parameters::default_values()) { using Polygon = typename boost::range_value::type; From 6a0a0267bf2fa7a4b15eacd0d6d714e5d8580820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 15:16:52 +0200 Subject: [PATCH 08/52] Test triangulate_polygons() --- .../triangulate_faces_test.cpp | 68 ++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp index 5f239c7dfaa..61546684005 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp @@ -1,13 +1,14 @@ #include #include - #include +#include + #include #include #include #include -#include +#include #include @@ -117,21 +118,17 @@ test_triangulate_face() return false; } - unsigned int nb = 0; for(typename boost::graph_traits::face_descriptor fit : faces(mesh)) { - if (nb > 4) - break; - else if (next(next(halfedge(fit, mesh), mesh), mesh) - != prev(halfedge(fit, mesh), mesh)) + if (next(next(halfedge(fit, mesh), mesh), mesh) != prev(halfedge(fit, mesh), mesh)) { - if(CGAL::Polygon_mesh_processing::triangulate_face(fit, mesh)) - ++nb; - else + if(!CGAL::Polygon_mesh_processing::triangulate_face(fit, mesh)) assert(false); } } + assert(CGAL::is_triangle_mesh(mesh)); + return true; } @@ -156,6 +153,9 @@ test_triangulate_triangle_face() if(!CGAL::Polygon_mesh_processing::triangulate_face(fit, mesh, CGAL::parameters::geom_traits(K()))) assert(false); } + + assert(CGAL::is_triangle_mesh(mesh)); + return true; } @@ -238,9 +238,54 @@ test_dual_with_various_faces() if(!CGAL::Polygon_mesh_processing::triangulate_face(fit, sm_dual)) assert(false); } + + assert(CGAL::is_triangle_mesh(sm_dual)); + return true; } +template +bool +test_triangulate_soup() +{ + typedef typename K::Point_3 Point; + typedef CGAL::Surface_mesh Surface_mesh; + + Surface_mesh mesh; + std::ifstream input(CGAL::data_file_path("meshes/elephant.off")); + + if (!input || !(input >> mesh) || mesh.is_empty()) + { + std::cerr << "Not a valid off file." << std::endl; + return false; + } + + typedef typename boost::property_map::type Pmap; + Pmap vpmap = get_property_map(boost::vertex_point, mesh); + + CGAL::Dual dual(mesh); + // copy dual to a sm + Surface_mesh sm_dual; + CGAL::copy_face_graph(dual, sm_dual, + CGAL::parameters::vertex_point_map( + Dual_vpm(mesh, vpmap))); + + std::vector points; + std::vector > polygons; + CGAL::Polygon_mesh_processing::polygon_mesh_to_polygon_soup(sm_dual, points, polygons); + + bool success = CGAL::Polygon_mesh_processing::triangulate_polygons(points, polygons); + for(std::size_t i = 0; i < polygons.size(); ++i) + { + assert(polygons[i].size() == 3); + } + + // For compilation + success = CGAL::Polygon_mesh_processing::triangulate_polygons(points, polygons, CGAL::parameters::geom_traits(K())); + + return success; +} + int main() { assert(test_triangulate_faces()); @@ -249,6 +294,7 @@ int main() assert(test_triangulate_face()); assert(test_triangulate_triangle_face()); assert(test_dual_with_various_faces()); + assert(test_triangulate_soup()); assert(test_triangulate_faces()); assert(test_triangulate_faces_with_named_parameters()); @@ -256,6 +302,8 @@ int main() assert(test_triangulate_face()); assert(test_triangulate_triangle_face()); assert(test_dual_with_various_faces()); + assert(test_triangulate_soup()); + std::cout << "Done" << std::endl; return EXIT_SUCCESS; } From 123c2513fc855feba0a65acaa8878f274b4dca55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 16:48:41 +0200 Subject: [PATCH 09/52] Delegate construction of a 2D CDT to hole filling --- .../triangulate_faces.h | 299 ++---------------- 1 file changed, 28 insertions(+), 271 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index a4594228b20..ff03d1f83f5 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -18,16 +18,6 @@ #include #include -#ifndef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 -#include -#include -#include -#include -#include -#else -#include -#endif - #include #include #include @@ -40,6 +30,12 @@ #include #include +#ifdef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 +# ifndef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 +# define CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 +# endif +#endif + namespace CGAL { namespace Polygon_mesh_processing { namespace Triangulate_faces { @@ -144,166 +140,17 @@ public: visitor.after_subface_created(face(opposite(res,pmesh),pmesh)); visitor.after_subface_creations(); + + return true; } - else - { -#ifndef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 - if (use_cdt) - { - typedef CGAL::Projection_traits_3 P_traits; - typedef CGAL::Triangulation_vertex_base_with_info_2 Vb; - typedef CGAL::Triangulation_face_base_with_info_2 Fb1; - typedef CGAL::Constrained_triangulation_face_base_2 Fb; - typedef CGAL::Triangulation_data_structure_2 TDS; - typedef CGAL::No_constraint_intersection_tag Itag; - typedef CGAL::Constrained_Delaunay_triangulation_2 CDT; - P_traits cdt_traits(normal); - CDT cdt(cdt_traits); - return triangulate_face_with_CDT(f, pmesh, cdt, visitor); - } -#else - CGAL_USE(use_cdt); -#endif - return triangulate_face_with_hole_filling(f, pmesh, visitor); - } - return true; + + return triangulate_face_with_hole_filling(f, pmesh, use_cdt, visitor); } - template - bool triangulate_face_with_CDT(face_descriptor f, PM& pmesh, CDT& cdt, Visitor visitor) - { - typedef typename CDT::Vertex_handle Tr_Vertex_handle; - - std::size_t original_size = CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh).size(); - - try - { - halfedge_descriptor start = halfedge(f, pmesh); - halfedge_descriptor h = start; - Tr_Vertex_handle previous, first; - do - { - Tr_Vertex_handle vh = cdt.insert(get(_vpmap, target(h, pmesh))); - if (first == Tr_Vertex_handle()) { - first = vh; - } - vh->info() = h; - if(previous != Tr_Vertex_handle() && previous != vh) { - cdt.insert_constraint(previous, vh); - } - previous = vh; - h = next(h, pmesh); - - } while( h != start ); - cdt.insert_constraint(previous, first); - } - catch(const typename CDT::Intersection_of_constraints_exception&) - { - return false; - } - - // sets mark is_external - for(typename CDT::All_faces_iterator fit = cdt.all_faces_begin(), - end = cdt.all_faces_end(); - fit != end; ++fit) - { - fit->info().is_external = false; - } - std::queue face_queue; - face_queue.push(cdt.infinite_vertex()->face()); - while(! face_queue.empty() ) - { - typename CDT::Face_handle fh = face_queue.front(); - face_queue.pop(); - - if(fh->info().is_external) - continue; - - fh->info().is_external = true; - for(int i = 0; i <3; ++i) - { - if(!cdt.is_constrained(typename CDT::Edge(fh, i))) - { - face_queue.push(fh->neighbor(i)); - } - } - } - - if(cdt.dimension() != 2 || - cdt.number_of_vertices() != original_size) - return false; - - - // then modify the polyhedron - visitor.before_subface_creations(f); - // make_hole. (see comment in function body) - this->make_hole(halfedge(f, pmesh), pmesh); - - for(typename CDT::Finite_edges_iterator eit = cdt.finite_edges_begin(), - end = cdt.finite_edges_end(); - eit != end; ++eit) - { - typename CDT::Face_handle fh = eit->first; - const int index = eit->second; - typename CDT::Face_handle opposite_fh = fh->neighbor(eit->second); - const int opposite_index = opposite_fh->index(fh); - - const Tr_Vertex_handle va = fh->vertex(cdt. cw(index)); - const Tr_Vertex_handle vb = fh->vertex(cdt.ccw(index)); - - if( ! (is_external(fh) && is_external(opposite_fh))//not both fh are external - && ! cdt.is_constrained(*eit) ) //and edge is not constrained - { - // strictly internal edge - halfedge_descriptor hnew = halfedge(add_edge(pmesh), pmesh), - hnewopp = opposite(hnew, pmesh); - - fh->info().e[index] = hnew; - opposite_fh->info().e[opposite_index] = hnewopp; - - set_target(hnew, target(va->info(), pmesh), pmesh); - set_target(hnewopp, target(vb->info(), pmesh), pmesh); - } - if( cdt.is_constrained(*eit) ) //edge is constrained - { - if(!is_external(fh)) { - fh->info().e[index] = va->info(); - } - if(!is_external(opposite_fh)) { - opposite_fh->info().e[opposite_index] = vb->info(); - } - } - } - for(typename CDT::Finite_faces_iterator fit = cdt.finite_faces_begin(), - end = cdt.finite_faces_end(); - fit != end; ++fit) - { - if(!is_external(fit)) - { - halfedge_descriptor h0 = fit->info().e[0]; - halfedge_descriptor h1 = fit->info().e[1]; - halfedge_descriptor h2 = fit->info().e[2]; - CGAL_assertion(h0 != halfedge_descriptor()); - CGAL_assertion(h1 != halfedge_descriptor()); - CGAL_assertion(h2 != halfedge_descriptor()); - - set_next(h0, h1, pmesh); - set_next(h1, h2, pmesh); - set_next(h2, h0, pmesh); - - Euler::fill_hole(h0, pmesh); - visitor.after_subface_created(face(h0, pmesh)); - } - } - visitor.after_subface_creations(); - return true; - } - - bool triangulate_face_with_hole_filling(face_descriptor f, PM& pmesh, Visitor visitor) + bool triangulate_face_with_hole_filling(face_descriptor f, + PM& pmesh, + const bool use_cdt, + Visitor visitor) { namespace PMP = CGAL::Polygon_mesh_processing; @@ -322,7 +169,8 @@ public: typedef CGAL::Triple Face_indices; std::vector patch; PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), - parameters::geom_traits(_traits)); + parameters::geom_traits(_traits) + .use_2d_constrained_delaunay_triangulation(use_cdt)); if(patch.empty()) return false; @@ -491,7 +339,7 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); //Option - bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true); + bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), true); typedef typename internal_np::Lookup_named_param_def< internal_np::visitor_t, @@ -568,7 +416,7 @@ bool triangulate_faces(FaceRange face_range, Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); //Option - bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true); + bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), true); typedef typename internal_np::Lookup_named_param_def< internal_np::visitor_t, @@ -654,93 +502,6 @@ public: { } private: - template - bool triangulate_face_with_CDT(const Polygon& polygon, - const PointRange& points, - PolygonRange& triangulated_polygons, - PMap pmap, - Visitor visitor) - { - using Point_ref = typename boost::property_traits::reference; - - using PK = CGAL::Projection_traits_3; - using Vbb = CGAL::Triangulation_vertex_base_with_info_2; - using Vb = CGAL::Triangulation_vertex_base_2; - using Fb = CGAL::Constrained_triangulation_face_base_2; - using TDS = CGAL::Triangulation_data_structure_2; - using Itag = CGAL::No_constraint_intersection_tag; - using CDT = CGAL::Constrained_Delaunay_triangulation_2; - using CDT_Vertex_handle = typename CDT::Vertex_handle; - using CDT_Face_handle = typename CDT::Face_handle; - - const std::size_t original_size = polygon.size(); - - Vector n = CGAL::NULL_VECTOR; - for(std::size_t i=0; iinfo() = i; - if(previous != CDT_Vertex_handle() && previous != vh) - cdt.insert_constraint(previous, vh); - - previous = vh; - } - cdt.insert_constraint(previous, first); - } - catch(const typename CDT::Intersection_of_constraints_exception&) - { - return false; - } - - if(cdt.dimension() != 2 || cdt.number_of_vertices() != polygon.size()) - return false; - - std::unordered_map in_domain_map; - boost::associative_property_map< std::unordered_map > in_domain(in_domain_map); - - CGAL::mark_domain_in_triangulation(cdt, in_domain); - - visitor.before_subface_creations(polygon); - - for(CDT_Face_handle f : cdt.finite_face_handles()) - { - if(!get(in_domain, f)) - continue; - - triangulated_polygons.push_back({f->vertex(0)->info(), f->vertex(1)->info(), f->vertex(2)->info()}); - visitor.after_subface_created(triangulated_polygons.back()); - } - - visitor.after_subface_creations(); - return true; - } - template Face_indices; std::vector patch; PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), - parameters::geom_traits(_traits)); + parameters::geom_traits(_traits) + .use_2d_constrained_delaunay_triangulation(use_cdt)); if(patch.empty()) + { + std::cout << "failed hole filling" << std::endl; return false; + } visitor.before_subface_creations(polygon); @@ -838,20 +604,11 @@ private: visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-1]); visitor.after_subface_creations(); - } - else - { -#ifndef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 - if(use_cdt) - return triangulate_face_with_CDT(polygon, points, triangulated_polygons, pmap, visitor); -#else - CGAL_USE(use_cdt); -#endif - return triangulate_face_with_hole_filling(polygon, points, triangulated_polygons, pmap, visitor); + return true; } - return true; + return triangulate_face_with_hole_filling(polygon, points, triangulated_polygons, pmap, use_cdt, visitor); } public: @@ -981,8 +738,8 @@ bool triangulate_polygons(const PointRange& points, Def_Kernel>::type; Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); - //Option - bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true); + // Option + bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), true); typedef typename internal_np::Lookup_named_param_def< internal_np::visitor_t, From c451b921ef2cd6e774044a06266a8d00613c8e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 16:52:48 +0200 Subject: [PATCH 10/52] Rename internal functions for consistency --- .../triangulate_faces.h | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index ff03d1f83f5..e0a7911c332 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -507,12 +507,12 @@ private: typename PolygonRange, typename PMap, typename Visitor> - bool triangulate_face_with_hole_filling(const Polygon& polygon, - const PointRange& points, - PolygonRange& triangulated_polygons, - PMap pmap, - const bool use_cdt, - Visitor visitor) + bool triangulate_polygon_with_hole_filling(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, + PMap pmap, + const bool use_cdt, + Visitor visitor) { namespace PMP = CGAL::Polygon_mesh_processing; @@ -558,12 +558,12 @@ private: typename PolygonRange, typename PMap, typename Visitor> - bool triangulate_face(const Polygon& polygon, - const PointRange& points, - PolygonRange& triangulated_polygons, - PMap pmap, - const bool use_cdt, - Visitor visitor) + bool triangulate_polygon(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, + PMap pmap, + const bool use_cdt, + Visitor visitor) { using FT = typename Traits::FT; using Point_ref = typename boost::property_traits::reference; @@ -608,7 +608,7 @@ private: return true; } - return triangulate_face_with_hole_filling(polygon, points, triangulated_polygons, pmap, use_cdt, visitor); + return triangulate_polygon_with_hole_filling(polygon, points, triangulated_polygons, pmap, use_cdt, visitor); } public: @@ -636,7 +636,7 @@ public: continue; } - if(!triangulate_face(polygon, points, triangulated_polygons, pmap, use_cdt, visitor)) + if(!triangulate_polygon(polygon, points, triangulated_polygons, pmap, use_cdt, visitor)) result = false; } From f570e0ec2ea36e529b5e0dc95cb88e982a34602c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 16:53:08 +0200 Subject: [PATCH 11/52] Enhance tests --- .../triangulate_faces_test.cpp | 50 ++++++++++++++++--- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp index 61546684005..66085b83c74 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp @@ -21,6 +21,8 @@ template bool test_triangulate_faces() { + std::cout << "\n--- test_triangulate_faces(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; @@ -43,6 +45,8 @@ template bool test_triangulate_faces_with_named_parameters() { + std::cout << "\n--- test_triangulate_faces_with_named_parameters(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; @@ -78,13 +82,15 @@ test_triangulate_faces_with_named_parameters() template bool -test_triangulate_face_range() +test_triangulate_face_range(const std::string& filename) { + std::cout << "\n--- test_triangulate_face_range(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; Surface_mesh mesh; - std::ifstream input(CGAL::data_file_path("meshes/cube_quad.off")); + std::ifstream input(filename); if (!input || !(input >> mesh) || mesh.is_empty()) { @@ -93,6 +99,18 @@ test_triangulate_face_range() } bool success = CGAL::Polygon_mesh_processing::triangulate_faces(faces(mesh), mesh); + + for(auto f : faces(mesh)) + { + if(!is_triangle(halfedge(f, mesh), mesh)) + { + std::cout << "non triangular face:" << std::endl; + for(auto h : halfedges_around_face(halfedge(f, mesh), mesh)) + std::cout << " " << mesh.point(target(h, mesh)) << std::endl; + assert(false); + } + } + assert(CGAL::is_triangle_mesh(mesh)); // For compilation @@ -106,6 +124,8 @@ template bool test_triangulate_face() { + std::cout << "\n--- test_triangulate_face(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; @@ -136,6 +156,8 @@ template bool test_triangulate_triangle_face() { + std::cout << "\n--- test_triangulate_triangle_face(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; @@ -211,6 +233,8 @@ template bool test_dual_with_various_faces() { + std::cout << "\n--- test_dual_with_various_faces(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; @@ -235,7 +259,8 @@ test_dual_with_various_faces() for(typename boost::graph_traits::face_descriptor fit : faces(sm_dual)) { - if(!CGAL::Polygon_mesh_processing::triangulate_face(fit, sm_dual)) + if(!CGAL::Polygon_mesh_processing::triangulate_face(fit, sm_dual, + CGAL::parameters::use_2d_constrained_delaunay_triangulation(true))) assert(false); } @@ -248,6 +273,8 @@ template bool test_triangulate_soup() { + std::cout << "\n--- test_triangulate_soup(" << typeid(K).name() << ") ---" << std::endl; + typedef typename K::Point_3 Point; typedef CGAL::Surface_mesh Surface_mesh; @@ -274,23 +301,30 @@ test_triangulate_soup() std::vector > polygons; CGAL::Polygon_mesh_processing::polygon_mesh_to_polygon_soup(sm_dual, points, polygons); - bool success = CGAL::Polygon_mesh_processing::triangulate_polygons(points, polygons); + bool success = CGAL::Polygon_mesh_processing::triangulate_polygons(points, polygons, + CGAL::parameters::geom_traits(K()) + .use_2d_constrained_delaunay_triangulation(false)); for(std::size_t i = 0; i < polygons.size(); ++i) { assert(polygons[i].size() == 3); } // For compilation - success = CGAL::Polygon_mesh_processing::triangulate_polygons(points, polygons, CGAL::parameters::geom_traits(K())); + success = CGAL::Polygon_mesh_processing::triangulate_polygons(points, polygons); return success; } -int main() +int main(int argc, char** argv) { + if(argc > 1) + { + assert(test_triangulate_face_range(argv[1])); + } + assert(test_triangulate_faces()); assert(test_triangulate_faces_with_named_parameters()); - assert(test_triangulate_face_range()); + assert(test_triangulate_face_range(CGAL::data_file_path("meshes/cube_quad.off"))); assert(test_triangulate_face()); assert(test_triangulate_triangle_face()); assert(test_dual_with_various_faces()); @@ -298,7 +332,7 @@ int main() assert(test_triangulate_faces()); assert(test_triangulate_faces_with_named_parameters()); - assert(test_triangulate_face_range()); + assert(test_triangulate_face_range(CGAL::data_file_path("meshes/cube_quad.off"))); assert(test_triangulate_face()); assert(test_triangulate_triangle_face()); assert(test_dual_with_various_faces()); From 4d03dbe076e0d849e163d7ff37f2d1d0d9f13c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 Mar 2023 22:42:40 +0200 Subject: [PATCH 12/52] Try-Catch the CDT constraint insertions --- .../Hole_filling/Triangulate_hole_polyline.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h index 797a6912f26..0bb232eb66b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h @@ -1442,12 +1442,20 @@ triangulate_hole_polyline_with_cdt(const PointRange& points, vertices[v->info()] = v; } - for (std::size_t i = 0; i < size; ++i) { - const std::size_t ip = (i + 1) % size; - if (vertices[i] != vertices[ip]) { - cdt.insert_constraint(vertices[i], vertices[ip]); + try + { + for (std::size_t i = 0; i < size; ++i) { + const std::size_t ip = (i + 1) % size; + if (vertices[i] != vertices[ip]) { + cdt.insert_constraint(vertices[i], vertices[ip]); + } } } + catch(const typename CDT::Intersection_of_constraints_exception&) + { + visitor.end_planar_phase(false); + return false; + } // Mark external faces. for (typename CDT::All_faces_iterator fit = cdt.all_faces_begin(), From 1365fac894be7f5ea9118ce14e481e4e7178b84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 10:08:10 +0200 Subject: [PATCH 13/52] Move macro --- .../internal/Hole_filling/Triangulate_hole_polyline.h | 5 +++++ .../CGAL/Polygon_mesh_processing/triangulate_faces.h | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h index 0bb232eb66b..5e84ba9e694 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h @@ -15,6 +15,11 @@ #include +#ifdef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 +# ifndef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 +# define CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 +# endif +#endif #include #ifndef CGAL_HOLE_FILLING_DO_NOT_USE_DT3 diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index e0a7911c332..cb1d874f855 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -30,12 +30,6 @@ #include #include -#ifdef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 -# ifndef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 -# define CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 -# endif -#endif - namespace CGAL { namespace Polygon_mesh_processing { namespace Triangulate_faces { From 4a2d91e03bd94b15695017acb51a8a27eb3a0789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 10:11:04 +0200 Subject: [PATCH 14/52] Document requirements on faces of triangulate_faces/triangulate_polygons --- .../CGAL/Polygon_mesh_processing/triangulate_faces.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index cb1d874f855..4679e536e51 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -309,6 +309,8 @@ public: * \cgalParamNEnd * \cgalNamedParamsEnd * +* @pre The face `f` is not degenerate. +* * @return `true` if the face has been triangulated. * * @see `triangulate_faces()` @@ -388,6 +390,8 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor * `\cgalParamNEnd * \cgalNamedParamsEnd * +* @pre No face within `face_range` is degenerate. +* * @return `true` if all the faces have been triangulated. * * @see `triangulate_face()` @@ -462,6 +466,8 @@ bool triangulate_faces(FaceRange face_range, * \cgalParamNEnd * \cgalNamedParamsEnd * +* @pre No face of `pmesh` is degenerate. +* * @return `true` if all the faces have been triangulated. * * @see `triangulate_face()` @@ -703,6 +709,8 @@ struct Default_visitor * \cgalParamNEnd * \cgalNamedParamsEnd * +* @pre No polygon within `polygons` is degenerate. +* * @return `true` if all the polygons have been triangulated. * * @see `triangulate_face()` From 9387f087e02077c8f99580f4ff7569fddb85728b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 11:53:27 +0200 Subject: [PATCH 15/52] Refactor to properly forward NPs to triangulate_hole_polyline + other imprvmts --- .../triangulate_faces.h | 766 ++++++++---------- 1 file changed, 338 insertions(+), 428 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 4679e536e51..3cfba555a20 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -15,20 +15,22 @@ #include +#include + +#include #include #include - -#include -#include -#include #include +#include -#include +#include +#include +#include +#include #include -#include #include -#include +#include namespace CGAL { namespace Polygon_mesh_processing { @@ -51,68 +53,157 @@ struct Default_visitor void after_subface_created(face_descriptor /*f_new*/) {} }; -} //end namespace Triangulate_faces +} // namespace Triangulate_faces namespace internal { -template +template class Triangulate_polygon_mesh_modifier { - typedef Kernel Traits; + using vertex_descriptor = typename boost::graph_traits::vertex_descriptor; + using halfedge_descriptor = typename boost::graph_traits::halfedge_descriptor; + using face_descriptor = typename boost::graph_traits::face_descriptor; - typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; - typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - typedef typename boost::graph_traits::face_descriptor face_descriptor; - typedef typename boost::graph_traits::edge_descriptor edge_descriptor; - typedef typename Kernel::Point_3 Point; - - struct Face_info { - typename boost::graph_traits::halfedge_descriptor e[3]; - bool is_external; - }; - - typedef typename boost::property_traits::reference Point_ref; - VertexPointMap _vpmap; - Traits _traits; - -public: - Triangulate_polygon_mesh_modifier(VertexPointMap vpmap, const Traits& traits = Traits()) - : _vpmap(vpmap), _traits(traits) +private: + template + bool triangulate_face_with_hole_filling(face_descriptor f, + PolygonMesh& pmesh, + const VPM vpm, + Visitor visitor, + const NamedParameters& np) { - } + namespace PMP = CGAL::Polygon_mesh_processing; - template - bool is_external(Face_handle fh) const { - return fh->info().is_external; - } + using Point = typename boost::property_traits::value_type; - bool triangulate_face(face_descriptor f, PM& pmesh, bool use_cdt, Visitor visitor) - { - typedef typename Traits::FT FT; + // gather halfedges around the face + std::vector hole_points; + std::vector border_vertices; + CGAL_assertion(CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh).size() > 0); + for(halfedge_descriptor h : CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh)) + { + vertex_descriptor v = source(h, pmesh); + hole_points.push_back(get(vpm, v)); + border_vertices.push_back(v); + } - typename Traits::Vector_3 normal = - Polygon_mesh_processing::compute_face_normal( - f, pmesh, CGAL::parameters::geom_traits(_traits) - .vertex_point_map(_vpmap)); + // use hole filling + typedef CGAL::Triple Face_indices; + std::vector patch; + PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), np); - if(normal == typename Traits::Vector_3(0,0,0)) + if(patch.empty()) return false; - std::size_t original_size = CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh).size(); + // triangulate the hole + std::map, halfedge_descriptor > halfedge_map; + int i = 0; + for(halfedge_descriptor h : CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh)) + { + int j = std::size_t(i+1) == hole_points.size() ? 0 : i+1; + halfedge_map[std::make_pair(i, j)] = h; + ++i; + } + + visitor.before_subface_creations(f); + + bool first = true; + std::vector hedges; + hedges.reserve(4); + for(const Face_indices& triangle : patch) + { + if(first) + first = false; + else + f = add_face(pmesh); + + visitor.after_subface_created(f); + + std::array indices = make_array(triangle.first, + triangle.second, + triangle.third, + triangle.first); + for (int i=0; i<3; ++i) + { + typename std::map< std::pair , halfedge_descriptor >::iterator insert_res = + halfedge_map.emplace(std::make_pair(indices[i], indices[i+1]), + boost::graph_traits::null_halfedge()).first; + if(insert_res->second == boost::graph_traits::null_halfedge()) + { + halfedge_descriptor nh = halfedge(add_edge(pmesh), pmesh); + insert_res->second = nh; + halfedge_map[std::make_pair(indices[i+1], indices[i])] = opposite(nh, pmesh); + } + hedges.push_back(insert_res->second); + } + + hedges.push_back(hedges.front()); + for(int i=0; i<3;++i) + { + set_next(hedges[i], hedges[i+1], pmesh); + set_face(hedges[i], f, pmesh); + set_target(hedges[i], border_vertices[indices[i+1]], pmesh); + } + + set_halfedge(f, hedges[0], pmesh); + hedges.clear(); + } + + visitor.after_subface_creations(); + + return true; + } + +public: + template + bool operator()(face_descriptor f, + PolygonMesh& pmesh, + const NamedParameters& np) + { + using Traits = typename GetGeomTraits::type; + using VPM = typename GetVertexPointMap::type; + + using FT = typename Traits::FT; + using Point_ref = typename boost::property_traits::reference; + using Vector = typename Traits::Vector_3; + + using Visitor = typename internal_np::Lookup_named_param_def< + internal_np::visitor_t, + NamedParameters, + Triangulate_faces::Default_visitor // default + >::type; + + using parameters::choose_parameter; + using parameters::get_parameter; + + CGAL_precondition(is_valid_face_descriptor(f, pmesh)); + + Traits traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); + VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), + get_property_map(vertex_point, pmesh)); + Visitor visitor = choose_parameter(get_parameter(np, internal_np::visitor), + Triangulate_faces::Default_visitor()); + + typename Traits::Construct_cross_product_vector_3 cross_product = + traits.construct_cross_product_vector_3_object(); + + typename boost::graph_traits::degree_size_type original_size = degree(f, pmesh); + if(original_size <= 3) + return true; + if(original_size == 4) { halfedge_descriptor v0, v1, v2, v3; v0 = halfedge(f, pmesh); - Point_ref p0 = get(_vpmap, target(v0, pmesh)); + Point_ref p0 = get(vpm, target(v0, pmesh)); v1 = next(v0, pmesh); - Point_ref p1 = get(_vpmap, target(v1, pmesh)); + Point_ref p1 = get(vpm, target(v1, pmesh)); v2 = next(v1, pmesh); - Point_ref p2 = get(_vpmap, target(v2, pmesh)); + Point_ref p2 = get(vpm, target(v2, pmesh)); v3 = next(v2, pmesh); - Point_ref p3 = get(_vpmap, target(v3, pmesh)); + Point_ref p3 = get(vpm, target(v3, pmesh)); /* Chooses the diagonal that will split the quad in two triangles that maximize * the scalar product of of the un-normalized normals of the two triangles. @@ -123,150 +214,23 @@ public: * In particular, if the two triangles are oriented in different directions, * the scalar product will be negative. */ - FT p1p3 = CGAL::cross_product(p2-p1,p3-p2) * CGAL::cross_product(p0-p3,p1-p0); - FT p0p2 = CGAL::cross_product(p1-p0,p1-p2) * CGAL::cross_product(p3-p2,p3-p0); visitor.before_subface_creations(f); - halfedge_descriptor res = (p0p2>p1p3) - ? CGAL::Euler::split_face(v0, v2, pmesh) - : CGAL::Euler::split_face(v1, v3, pmesh); - visitor.after_subface_created(face(res,pmesh)); - visitor.after_subface_created(face(opposite(res,pmesh),pmesh)); + const FT p1p3 = cross_product(p2-p1, p3-p2) * cross_product(p0-p3, p1-p0); + const FT p0p2 = cross_product(p1-p0, p1-p2) * cross_product(p3-p2, p3-p0); + halfedge_descriptor res = (p0p2>p1p3) ? CGAL::Euler::split_face(v0, v2, pmesh) + : CGAL::Euler::split_face(v1, v3, pmesh); + + visitor.after_subface_created(face(res, pmesh)); + visitor.after_subface_created(face(opposite(res, pmesh), pmesh)); visitor.after_subface_creations(); return true; } - return triangulate_face_with_hole_filling(f, pmesh, use_cdt, visitor); + return triangulate_face_with_hole_filling(f, pmesh, vpm, visitor, np); } - - bool triangulate_face_with_hole_filling(face_descriptor f, - PM& pmesh, - const bool use_cdt, - Visitor visitor) - { - namespace PMP = CGAL::Polygon_mesh_processing; - - // gather halfedges around the face - std::vector hole_points; - std::vector border_vertices; - CGAL_assertion(CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh).size() > 0); - for(halfedge_descriptor h : CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh)) - { - vertex_descriptor v = source(h, pmesh); - hole_points.push_back( get(_vpmap, v) ); - border_vertices.push_back(v); - } - - // use hole filling - typedef CGAL::Triple Face_indices; - std::vector patch; - PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), - parameters::geom_traits(_traits) - .use_2d_constrained_delaunay_triangulation(use_cdt)); - - if(patch.empty()) - return false; - - // triangulate the hole - std::map< std::pair , halfedge_descriptor > halfedge_map; - int i=0; - for(halfedge_descriptor h : CGAL::halfedges_around_face(halfedge(f, pmesh), pmesh)) - { - int j = std::size_t(i+1) == hole_points.size() ? 0 : i+1; - halfedge_map[ std::make_pair(i, j) ] = h; - ++i; - } - - visitor.before_subface_creations(f); - bool first = true; - std::vector hedges; - hedges.reserve(4); - for(const Face_indices& triangle : patch) - { - if (first) - first=false; - else - f=add_face(pmesh); - visitor.after_subface_created(f); - - std::array indices = - make_array( triangle.first, - triangle.second, - triangle.third, - triangle.first ); - for (int i=0; i<3; ++i) - { - typename std::map< std::pair , halfedge_descriptor >::iterator insert_res = - halfedge_map.insert( - std::make_pair( std::make_pair(indices[i], indices[i+1]), - boost::graph_traits::null_halfedge() ) ).first; - if (insert_res->second == boost::graph_traits::null_halfedge()) - { - halfedge_descriptor nh = halfedge(add_edge(pmesh), pmesh); - insert_res->second=nh; - halfedge_map[std::make_pair(indices[i+1], indices[i])]=opposite(nh, pmesh); - } - hedges.push_back(insert_res->second); - } - hedges.push_back(hedges.front()); - for(int i=0; i<3;++i) - { - set_next(hedges[i], hedges[i+1], pmesh); - set_face(hedges[i], f, pmesh); - set_target(hedges[i], border_vertices[indices[i+1]], pmesh); - } - set_halfedge(f, hedges[0], pmesh); - hedges.clear(); - } - visitor.after_subface_creations(); - return true; - } - - template - bool operator()(FaceRange face_range, PM& pmesh, bool use_cdt, Visitor visitor) - { - bool result = true; - // One need to store facet handles into a vector, because the list of - // facets of the polyhedron will be modified during the loop, and - // that invalidates the range [facets_begin(), facets_end()[. - std::vector facets; - facets.reserve(std::distance(boost::begin(face_range), boost::end(face_range))); - - //only consider non-triangular faces - for(face_descriptor fit : face_range) - if ( next( next( halfedge(fit, pmesh), pmesh), pmesh) - != prev( halfedge(fit, pmesh), pmesh) ) - facets.push_back(fit); - - // Iterates on the vector of face descriptors - for(face_descriptor f : facets) - { - if(!this->triangulate_face(f, pmesh, use_cdt, visitor)) - result = false; - } - return result; - } - - void make_hole(halfedge_descriptor h, PM& pmesh) - { - //we are not using Euler::make_hole because it has a precondition - //that the hole is not made on the boundary of the mesh - //here we allow making a hole on the boundary, and the pair(s) of - //halfedges that become border-border are fixed by the connectivity - //setting made in operator() - CGAL_assertion(!is_border(h, pmesh)); - face_descriptor fd = face(h, pmesh); - - for(halfedge_descriptor hd : halfedges_around_face(h, pmesh)) - { - CGAL::internal::set_border(hd, pmesh); - } - remove_face(fd, pmesh); - } - - }; // class Triangulate_polygon_mesh_modifier } // namespace internal @@ -309,45 +273,23 @@ public: * \cgalParamNEnd * \cgalNamedParamsEnd * +* This function calls `CGAL::Polygon_mesh_processing::triangulate_hole_polyline()`. +* Refer to its documentation for its named parameters. +* * @pre The face `f` is not degenerate. * * @return `true` if the face has been triangulated. * * @see `triangulate_faces()` */ -template +template bool triangulate_face(typename boost::graph_traits::face_descriptor f, PolygonMesh& pmesh, const NamedParameters& np = parameters::default_values()) { - using parameters::choose_parameter; - using parameters::get_parameter; - - CGAL_precondition(is_valid_face_descriptor(f, pmesh)); - - //VertexPointMap - typedef typename GetVertexPointMap::type VPMap; - VPMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point), - get_property_map(vertex_point, pmesh)); - - //Kernel - typedef typename GetGeomTraits::type Kernel; - Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); - - //Option - bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), true); - - typedef typename internal_np::Lookup_named_param_def< - internal_np::visitor_t, - NamedParameters, - Triangulate_faces::Default_visitor//default - >::type Visitor; - Visitor visitor = choose_parameter( - get_parameter(np, internal_np::visitor), - Triangulate_faces::Default_visitor()); - - internal::Triangulate_polygon_mesh_modifier modifier(vpmap, traits); - return modifier.triangulate_face(f, pmesh, use_cdt, visitor); + internal::Triangulate_polygon_mesh_modifier modifier; + return modifier(f, pmesh, np); } /** @@ -390,43 +332,39 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor * `\cgalParamNEnd * \cgalNamedParamsEnd * +* This function calls `CGAL::Polygon_mesh_processing::triangulate_hole_polyline()` for each face. +* Refer to its documentation for its named parameters. +* * @pre No face within `face_range` is degenerate. * * @return `true` if all the faces have been triangulated. * * @see `triangulate_face()` */ -template +template bool triangulate_faces(FaceRange face_range, PolygonMesh& pmesh, const NamedParameters& np = parameters::default_values()) { - using parameters::choose_parameter; - using parameters::get_parameter; + using face_descriptor = typename boost::graph_traits::face_descriptor; - //VertexPointMap - typedef typename GetVertexPointMap::type VPMap; - VPMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point), - get_property_map(vertex_point, pmesh)); + bool result = true; - //Kernel - typedef typename GetGeomTraits::type Kernel; - Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); + // One need to store facet handles into a vector, because the list of + // facets of the polyhedron will be modified during the loop, and + // that invalidates the range [facets_begin(), facets_end()[. + std::vector facets(std::begin(face_range), std::end(face_range)); - //Option - bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), true); + internal::Triangulate_polygon_mesh_modifier modifier; + for(face_descriptor f : facets) + { + if(!modifier(f, pmesh, np)) + result = false; + } - typedef typename internal_np::Lookup_named_param_def< - internal_np::visitor_t, - NamedParameters, - Triangulate_faces::Default_visitor//default - >::type Visitor; - Visitor visitor = choose_parameter( - get_parameter(np, internal_np::visitor), - Triangulate_faces::Default_visitor()); - - internal::Triangulate_polygon_mesh_modifier modifier(vpmap, traits); - return modifier(face_range, pmesh, use_cdt, visitor); + return result; } /** @@ -466,6 +404,9 @@ bool triangulate_faces(FaceRange face_range, * \cgalParamNEnd * \cgalNamedParamsEnd * +* This function calls `CGAL::Polygon_mesh_processing::triangulate_hole_polyline()` on all the faces of the polygon mesh. +* Refer to its documentation for its named parameters. +* * @pre No face of `pmesh` is degenerate. * * @return `true` if all the faces have been triangulated. @@ -484,169 +425,6 @@ bool triangulate_faces(PolygonMesh& pmesh, //////////////////////////////////////////////////////////////////////////////////////////////////// // Polygon Soup -namespace internal { - -template -class Triangulate_polygon_soup_modifier -{ - using Traits = Kernel; - using Point = typename Traits::Point_3; - using Vector = typename Traits::Vector_3; - -private: - Traits _traits; - -public: - Triangulate_polygon_soup_modifier(const Traits& traits = Traits()) - : _traits(traits) - { } - -private: - template - bool triangulate_polygon_with_hole_filling(const Polygon& polygon, - const PointRange& points, - PolygonRange& triangulated_polygons, - PMap pmap, - const bool use_cdt, - Visitor visitor) - { - namespace PMP = CGAL::Polygon_mesh_processing; - - // gather halfedges around the face - std::vector hole_points; - std::vector hole_points_indices; - - for(std::size_t i : polygon) - { - hole_points.push_back(get(pmap, points[i])); - hole_points_indices.push_back(i); - } - - // use hole filling - typedef CGAL::Triple Face_indices; - std::vector patch; - PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), - parameters::geom_traits(_traits) - .use_2d_constrained_delaunay_triangulation(use_cdt)); - - if(patch.empty()) - { - std::cout << "failed hole filling" << std::endl; - return false; - } - - visitor.before_subface_creations(polygon); - - for(const Face_indices& triangle : patch) - { - triangulated_polygons.push_back({hole_points_indices[triangle.first], - hole_points_indices[triangle.second], - hole_points_indices[triangle.third]}); - visitor.after_subface_created(triangulated_polygons.back()); - } - - visitor.after_subface_creations(); - return true; - } - - template - bool triangulate_polygon(const Polygon& polygon, - const PointRange& points, - PolygonRange& triangulated_polygons, - PMap pmap, - const bool use_cdt, - Visitor visitor) - { - using FT = typename Traits::FT; - using Point_ref = typename boost::property_traits::reference; - - const std::size_t original_size = polygon.size(); - if(original_size == 4) - { - Point_ref p0 = get(pmap, points[polygon[0]]); - Point_ref p1 = get(pmap, points[polygon[1]]); - Point_ref p2 = get(pmap, points[polygon[2]]); - Point_ref p3 = get(pmap, points[polygon[3]]); - - /* Chooses the diagonal that will split the quad in two triangles that maximize - * the scalar product of of the un-normalized normals of the two triangles. - * The lengths of the un-normalized normals (computed using cross-products of two vectors) - * are proportional to the area of the triangles. - * Maximize the scalar product of the two normals will avoid skinny triangles, - * and will also taken into account the cosine of the angle between the two normals. - * In particular, if the two triangles are oriented in different directions, - * the scalar product will be negative. - */ - FT p1p3 = CGAL::cross_product(p2-p1, p3-p2) * CGAL::cross_product(p0-p3, p1-p0); - FT p0p2 = CGAL::cross_product(p1-p0, p1-p2) * CGAL::cross_product(p3-p2, p3-p0); - - visitor.before_subface_creations(polygon); - if(p0p2 > p1p3) - { - triangulated_polygons.push_back({polygon[0], polygon[1], polygon[2]}); - triangulated_polygons.push_back({polygon[0], polygon[2], polygon[3]}); - } - else - { - triangulated_polygons.push_back({polygon[0], polygon[1], polygon[3]}); - triangulated_polygons.push_back({polygon[1], polygon[2], polygon[3]}); - } - - visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-2]); - visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-1]); - - visitor.after_subface_creations(); - - return true; - } - - return triangulate_polygon_with_hole_filling(polygon, points, triangulated_polygons, pmap, use_cdt, visitor); - } - -public: - template - bool operator()(const PolygonRange& polygons, - const PointRange& points, - PolygonRange& triangulated_polygons, - PMap pmap, - const bool use_cdt, - Visitor visitor) - { - using Polygon = typename boost::range_value::type; - - bool result = true; - triangulated_polygons.reserve(polygons.size()); - - for(const Polygon& polygon : polygons) - { - if(polygon.size() <= 3) - { - triangulated_polygons.push_back(polygon); - continue; - } - - if(!triangulate_polygon(polygon, points, triangulated_polygons, pmap, use_cdt, visitor)) - result = false; - } - - return result; - } - -}; // class Triangulate_polygon_soup_modifier - -} // namespace internal - namespace Triangulate_polygons { namespace internal { @@ -670,6 +448,148 @@ struct Default_visitor } // namespace internal } // namespace Triangulate_polygons +namespace internal { + +class Triangulate_polygon_soup_modifier +{ +private: + template + bool triangulate_polygon_with_hole_filling(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, // output + PMap pm, + Visitor visitor, + const NamedParameters& np) + { + namespace PMP = CGAL::Polygon_mesh_processing; + + using Point = typename boost::property_traits::value_type; + using Kernel = typename CGAL::Kernel_traits::type; + + // gather halfedges around the face + std::vector hole_points; + std::vector hole_points_indices; + + for(std::size_t i : polygon) + { + hole_points.push_back(get(pm, points[i])); + hole_points_indices.push_back(i); + } + + // use hole filling + typedef CGAL::Triple Face_indices; + std::vector patch; + PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), np); + + if(patch.empty()) + return false; + + visitor.before_subface_creations(polygon); + + for(const Face_indices& triangle : patch) + { + triangulated_polygons.push_back({hole_points_indices[triangle.first], + hole_points_indices[triangle.second], + hole_points_indices[triangle.third]}); + visitor.after_subface_created(triangulated_polygons.back()); + } + + visitor.after_subface_creations(); + return true; + } + +public: + template + bool operator()(const Polygon& polygon, + const PointRange& points, + PolygonRange& triangulated_polygons, + const NamedParameters& np) + { + // PointMap + using PMap = typename GetPointMap::const_type; + using Point_ref = typename boost::property_traits::reference; + + // Kernel + using Point = typename boost::property_traits::value_type; + using Def_Kernel = typename CGAL::Kernel_traits::Kernel; + using Traits = typename internal_np::Lookup_named_param_def< + internal_np::geom_traits_t, + NamedParameters, + Def_Kernel>::type; + using FT = typename Traits::FT; + + // Visitor + using Visitor = typename internal_np::Lookup_named_param_def< + internal_np::visitor_t, + NamedParameters, + Triangulate_polygons::internal::Default_visitor // default + >::type; + + using parameters::choose_parameter; + using parameters::get_parameter; + + PMap pm = choose_parameter(get_parameter(np, internal_np::point_map)); + Traits traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); + Visitor visitor = choose_parameter(get_parameter(np, internal_np::visitor), + Triangulate_polygons::internal::Default_visitor()); + + typename Traits::Construct_cross_product_vector_3 cross_product = + traits.construct_cross_product_vector_3_object(); + + const std::size_t original_size = polygon.size(); + if(original_size == 4) + { + Point_ref p0 = get(pm, points[polygon[0]]); + Point_ref p1 = get(pm, points[polygon[1]]); + Point_ref p2 = get(pm, points[polygon[2]]); + Point_ref p3 = get(pm, points[polygon[3]]); + + /* Chooses the diagonal that will split the quad in two triangles that maximize + * the scalar product of of the un-normalized normals of the two triangles. + * The lengths of the un-normalized normals (computed using cross-products of two vectors) + * are proportional to the area of the triangles. + * Maximize the scalar product of the two normals will avoid skinny triangles, + * and will also taken into account the cosine of the angle between the two normals. + * In particular, if the two triangles are oriented in different directions, + * the scalar product will be negative. + */ + visitor.before_subface_creations(polygon); + + const FT p1p3 = cross_product(p2-p1, p3-p2) * cross_product(p0-p3, p1-p0); + const FT p0p2 = cross_product(p1-p0, p1-p2) * cross_product(p3-p2, p3-p0); + if(p0p2 > p1p3) + { + triangulated_polygons.push_back({polygon[0], polygon[1], polygon[2]}); + triangulated_polygons.push_back({polygon[0], polygon[2], polygon[3]}); + } + else + { + triangulated_polygons.push_back({polygon[0], polygon[1], polygon[3]}); + triangulated_polygons.push_back({polygon[1], polygon[2], polygon[3]}); + } + + visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-2]); + visitor.after_subface_created(triangulated_polygons[triangulated_polygons.size()-1]); + + visitor.after_subface_creations(); + + return true; + } + + return triangulate_polygon_with_hole_filling(polygon, points, triangulated_polygons, pm, visitor, np); + } +}; // class Triangulate_polygon_soup_modifier + +} // namespace internal + /** * \ingroup PMP_meshing_grp * @@ -709,6 +629,9 @@ struct Default_visitor * \cgalParamNEnd * \cgalNamedParamsEnd * +* This function calls `CGAL::Polygon_mesh_processing::triangulate_hole_polyline()` for each polygon. +* Refer to its documentation for its named parameters. +* * @pre No polygon within `polygons` is degenerate. * * @return `true` if all the polygons have been triangulated. @@ -724,36 +647,23 @@ bool triangulate_polygons(const PointRange& points, { using Polygon = typename boost::range_value::type; - using parameters::choose_parameter; - using parameters::get_parameter; - - //VertexPointMap - using PMap = typename GetPointMap::const_type; - PMap pmap = choose_parameter(get_parameter(np, internal_np::point_map)); - - //Kernel - using Point = typename boost::property_traits::value_type; - using Def_Kernel = typename CGAL::Kernel_traits::Kernel; - using Kernel = typename internal_np::Lookup_named_param_def< - internal_np::geom_traits_t, - NamedParameters, - Def_Kernel>::type; - Kernel traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); - - // Option - bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), true); - - typedef typename internal_np::Lookup_named_param_def< - internal_np::visitor_t, - NamedParameters, - Triangulate_polygons::internal::Default_visitor // default - >::type Visitor; - Visitor visitor = choose_parameter(get_parameter(np, internal_np::visitor), - Triangulate_polygons::internal::Default_visitor()); - PolygonRange triangulated_polygons; - internal::Triangulate_polygon_soup_modifier modifier(traits); - const bool success = modifier(polygons, points, triangulated_polygons, pmap, use_cdt, visitor); + triangulated_polygons.reserve(polygons.size()); + + bool success = true; + + internal::Triangulate_polygon_soup_modifier modifier; + for(const Polygon& polygon : polygons) + { + if(polygon.size() <= 3) + { + triangulated_polygons.push_back(polygon); + continue; + } + + if(!modifier(polygon, points, triangulated_polygons, np)) + success = false; + } std::swap(polygons, triangulated_polygons); From 962269c03dc495ba700d80f6af094c996e06781c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 12:07:47 +0200 Subject: [PATCH 16/52] Add see also's --- .../include/CGAL/Polygon_mesh_processing/triangulate_faces.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 3cfba555a20..79fe0f624f3 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -340,6 +340,7 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor * @return `true` if all the faces have been triangulated. * * @see `triangulate_face()` +* @see `triangulate_polygons()` */ template bool triangulate_faces(PolygonMesh& pmesh, @@ -636,7 +638,7 @@ public: * * @return `true` if all the polygons have been triangulated. * -* @see `triangulate_face()` +* @see `triangulate_faces()` */ template Date: Wed, 29 Mar 2023 12:07:57 +0200 Subject: [PATCH 17/52] Move triangulate_polygons()'s default visitor out of internal namespace so that it is documented --- .../CGAL/Polygon_mesh_processing/triangulate_faces.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 79fe0f624f3..b33f3265cca 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -428,7 +428,6 @@ bool triangulate_faces(PolygonMesh& pmesh, // Polygon Soup namespace Triangulate_polygons { -namespace internal { /** \ingroup PMP_meshing_grp * %Default new polygon visitor model of `PMPTriangulateFaceVisitor`. @@ -447,7 +446,6 @@ struct Default_visitor void after_subface_creations() {} }; -} // namespace internal } // namespace Triangulate_polygons namespace internal { @@ -532,7 +530,7 @@ public: using Visitor = typename internal_np::Lookup_named_param_def< internal_np::visitor_t, NamedParameters, - Triangulate_polygons::internal::Default_visitor // default + Triangulate_polygons::Default_visitor // default >::type; using parameters::choose_parameter; @@ -541,7 +539,7 @@ public: PMap pm = choose_parameter(get_parameter(np, internal_np::point_map)); Traits traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); Visitor visitor = choose_parameter(get_parameter(np, internal_np::visitor), - Triangulate_polygons::internal::Default_visitor()); + Triangulate_polygons::Default_visitor()); typename Traits::Construct_cross_product_vector_3 cross_product = traits.construct_cross_product_vector_3_object(); From 5a47df6682a80c2de0f3784141379d63175b173a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 15:29:10 +0200 Subject: [PATCH 18/52] Doc fixes, thanks @albert-github --- .../CGAL/Polygon_mesh_processing/triangulate_faces.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index b33f3265cca..d112e6c8dd6 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -206,7 +206,7 @@ public: Point_ref p3 = get(vpm, target(v3, pmesh)); /* Chooses the diagonal that will split the quad in two triangles that maximize - * the scalar product of of the un-normalized normals of the two triangles. + * the scalar product of the un-normalized normals of the two triangles. * The lengths of the un-normalized normals (computed using cross-products of two vectors) * are proportional to the area of the triangles. * Maximize the scalar product of the two normals will avoid skinny triangles, @@ -353,7 +353,7 @@ bool triangulate_faces(FaceRange face_range, bool result = true; - // One need to store facet handles into a vector, because the list of + // One needs to store the facets into a vector, because the list of // facets of the polyhedron will be modified during the loop, and // that invalidates the range [facets_begin(), facets_end()[. std::vector facets(std::begin(face_range), std::end(face_range)); @@ -553,7 +553,7 @@ public: Point_ref p3 = get(pm, points[polygon[3]]); /* Chooses the diagonal that will split the quad in two triangles that maximize - * the scalar product of of the un-normalized normals of the two triangles. + * the scalar product of the un-normalized normals of the two triangles. * The lengths of the un-normalized normals (computed using cross-products of two vectors) * are proportional to the area of the triangles. * Maximize the scalar product of the two normals will avoid skinny triangles, @@ -596,8 +596,8 @@ public: * triangulates all polygons of a polygon soup. This function depends on the package \ref PkgTriangulation2. * * @tparam PointRange a model of `ConstRange`. The value type of its iterator is the point type. -* @tparam PolygonRange a model of the concept `SequenceContainer` and `Swappable`, -* whose `value_type` is itself a model of the concepts `SequenceContainer` +* @tparam PolygonRange a model of the concepts `SequenceContainer` and `Swappable`, +* whose `value_type` is itself a model of the concept `SequenceContainer` * whose `value_type` is `std::size_t`. * @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" * From 70363a3b9c563ee2f82b2e1420bde3bb8c78549e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 15:29:29 +0200 Subject: [PATCH 19/52] Update CHANGES.md --- Installation/CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 6baa48451f2..062ad6eabe2 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -34,6 +34,8 @@ CGAL tetrahedral Delaunay refinement algorithm. - Added the function `CGAL::Polygon_mesh_processing::remove_almost_degenerate_faces()` to remove badly shaped triangles faces in a mesh. +- Added the function `CGAL::Polygon_mesh_processing::triangulate_polygons()`, which allows users to triangulate polygon soups. + ### [3D Simplicial Mesh Data Structure](https://doc.cgal.org/5.6/Manual/packages.html#PkgSMDS3) (new package) - This new package wraps all the existing code that deals with a `MeshComplex_3InTriangulation_3` to describe 3D simplicial meshes, and makes the data structure independent from the tetrahedral mesh generation package. From 8a39016780a06d9d600934ca8f9f6cff86f2fe02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 15:30:25 +0200 Subject: [PATCH 20/52] Visitor of triangulate_faces must be a visitor of HoleFilling too --- .../CGAL/Polygon_mesh_processing/triangulate_faces.h | 10 ++++++---- .../Plugins/PMP/Triangulate_facets_plugin.cpp | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index d112e6c8dd6..35fc824e4ad 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -44,6 +44,7 @@ namespace Triangulate_faces { */ template struct Default_visitor + : public Hole_filling::Default_visitor { typedef boost::graph_traits GT; typedef typename GT::face_descriptor face_descriptor; @@ -266,7 +267,7 @@ public: * * \cgalParamNBegin{visitor} * \cgalParamDescription{a visitor that enables to track how faces are triangulated into subfaces} -* \cgalParamType{a class model of `PMPTriangulateFaceVisitor`} +* \cgalParamType{a class model of `PMPTriangulateFaceVisitor` and `PMPHolefillingVisitor`} * \cgalParamDefault{`Triangulate_faces::Default_visitor`} * \cgalParamExtra{Note that the visitor will be copied, so * it must not have any data member that does not have a reference-like type.} @@ -325,7 +326,7 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor * * \cgalParamNBegin{visitor} * \cgalParamDescription{a visitor that enables to track how faces are triangulated into subfaces} -* \cgalParamType{a class model of `PMPTriangulateFaceVisitor`} +* \cgalParamType{a class model of `PMPTriangulateFaceVisitor` and `PMPHolefillingVisitor`} * \cgalParamDefault{`Triangulate_faces::Default_visitor`} * \cgalParamExtra{Note that the visitor will be copied, so * it must not have any data member that does not have a reference-like type.} @@ -398,7 +399,7 @@ bool triangulate_faces(FaceRange face_range, * * \cgalParamNBegin{visitor} * \cgalParamDescription{a visitor that enables to track how faces are triangulated into subfaces} -* \cgalParamType{a class model of `PMPTriangulateFaceVisitor`} +* \cgalParamType{a class model of `PMPTriangulateFaceVisitor` and `PMPHolefillingVisitor`} * \cgalParamDefault{`Triangulate_faces::Default_visitor`} * \cgalParamExtra{Note that the visitor will be copied, so * it must not have any data member that does not have a reference-like type.} @@ -436,6 +437,7 @@ namespace Triangulate_polygons { * overridden. */ struct Default_visitor + : public Hole_filling::Default_visitor { template void before_subface_creations(const Polygon& /*f_old*/) {} @@ -622,7 +624,7 @@ public: * * \cgalParamNBegin{visitor} * \cgalParamDescription{a visitor that enables to track how polygons are triangulated into triangles} -* \cgalParamType{a class model of `PMPTriangulateFaceVisitor`} +* \cgalParamType{a class model of `PMPTriangulateFaceVisitor` and `PMPHolefillingVisitor`} * \cgalParamDefault{`Triangulate_polygons::Default_visitor`} * \cgalParamExtra{Note that the visitor will be copied, so * it must not have any data member that does not have a reference-like type.} diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp index 3f86836f4bf..c342e536ff2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp @@ -21,6 +21,7 @@ class Polyhedron_demo_triangulate_facets_plugin : typedef boost::graph_traits::face_descriptor face_descriptor; struct Visitor + : public CGAL::Polygon_mesh_processing::Hole_filling::Default_visitor { typedef typename Scene_polyhedron_selection_item::Selection_set_facet Container; Container& faces; From e5c83238259ff1435c45612c192f3e4dfa9fc922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 15:30:56 +0200 Subject: [PATCH 21/52] Add triangulate_polygons() to the demo --- .../Polyhedron/Plugins/PMP/CMakeLists.txt | 2 +- .../Plugins/PMP/Triangulate_facets_plugin.cpp | 74 ++++++++++++------- .../Polyhedron/Scene_polygon_soup_item.cpp | 41 ++++++---- .../demo/Polyhedron/Scene_polygon_soup_item.h | 1 + 4 files changed, 76 insertions(+), 42 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt index adcd4f7f02b..9503348b9b7 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt @@ -100,7 +100,7 @@ add_custom_target(self_intersection_plugin) add_dependencies(self_intersection_plugin selection_plugin) polyhedron_demo_plugin(triangulate_facets_plugin Triangulate_facets_plugin KEYWORDS PMP) -target_link_libraries(triangulate_facets_plugin PUBLIC scene_surface_mesh_item scene_selection_item) +target_link_libraries(triangulate_facets_plugin PUBLIC scene_surface_mesh_item scene_selection_item scene_polygon_soup_item) polyhedron_demo_plugin(corefinement_plugin Corefinement_plugin KEYWORDS PMP) target_link_libraries(corefinement_plugin PUBLIC scene_surface_mesh_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp index c342e536ff2..6b85c6fb45b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp @@ -4,10 +4,13 @@ #include "Messages_interface.h" #include #include + #include "Scene_surface_mesh_item.h" #include "Scene_polyhedron_selection_item.h" +#include "Scene_polygon_soup_item.h" #include + using namespace CGAL::Three; class Polyhedron_demo_triangulate_facets_plugin : public QObject, @@ -20,13 +23,13 @@ class Polyhedron_demo_triangulate_facets_plugin : typedef Scene_surface_mesh_item::Face_graph FaceGraph; typedef boost::graph_traits::face_descriptor face_descriptor; - struct Visitor + struct Selection_updater_visitor : public CGAL::Polygon_mesh_processing::Hole_filling::Default_visitor { typedef typename Scene_polyhedron_selection_item::Selection_set_facet Container; Container& faces; - Visitor(Container& container) + Selection_updater_visitor(Container& container) : faces(container) {} void before_subface_creations(face_descriptor fd) @@ -67,6 +70,8 @@ public: return true; if ( qobject_cast(scene->item(index))) return true; + if(qobject_cast(scene->item(index))) + return true; } return false; } @@ -83,39 +88,54 @@ public Q_SLOTS: Scene_polyhedron_selection_item* selection_item = qobject_cast(scene->item(index)); - SMesh* pMesh = (sm_item != nullptr) - ? sm_item->polyhedron() - : selection_item->polyhedron(); + Scene_polygon_soup_item* soup_item = + qobject_cast(scene->item(index)); - if(!pMesh) continue; - if(is_triangle_mesh(*pMesh)) { - CGAL::Three::Three::warning(tr("The polyhedron \"%1\" is already triangulated.") - .arg(sm_item->name()) ); - continue; - } - if (sm_item) + if (soup_item) { - if (!CGAL::Polygon_mesh_processing::triangulate_faces(*pMesh)) - CGAL::Three::Three::warning(tr("Some facets could not be triangulated.")); + soup_item->triangulate(); } - else if (selection_item) + else { - Visitor visitor(selection_item->selected_facets); - if (!CGAL::Polygon_mesh_processing::triangulate_faces( - selection_item->selected_facets, - *pMesh, - CGAL::parameters::visitor(visitor))) - CGAL::Three::Three::warning(tr("Some facets could not be triangulated.")); + SMesh* pMesh = (sm_item != nullptr) ? sm_item->polyhedron() + : selection_item->polyhedron(); - sm_item = selection_item->polyhedron_item(); - selection_item->set_num_faces(num_faces(*sm_item->face_graph())); + if(!pMesh) + continue; - selection_item->invalidateOpenGLBuffers(); - selection_item->itemChanged(); + if(is_triangle_mesh(*pMesh)) + { + CGAL::Three::Three::warning(tr("The polyhedron \"%1\" is already triangulated.") + .arg(sm_item->name()) ); + continue; + } + + if (sm_item) + { + if (!CGAL::Polygon_mesh_processing::triangulate_faces(*pMesh)) + CGAL::Three::Three::warning(tr("Some facets could not be triangulated.")); + + sm_item->invalidateOpenGLBuffers(); + } + else if (selection_item) + { + Selection_updater_visitor visitor(selection_item->selected_facets); + if (!CGAL::Polygon_mesh_processing::triangulate_faces( + selection_item->selected_facets, + *pMesh, + CGAL::parameters::visitor(visitor))) + CGAL::Three::Three::warning(tr("Some facets could not be triangulated.")); + + sm_item = selection_item->polyhedron_item(); + selection_item->set_num_faces(num_faces(*sm_item->face_graph())); + + selection_item->invalidateOpenGLBuffers(); + selection_item->itemChanged(); + } + + sm_item->resetColors(); // @todo should have a visitor to give the color of the parent face } - sm_item->resetColors(); - sm_item->invalidateOpenGLBuffers(); scene->itemChanged(sm_item); } // end of the loop on the selected items diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp index b258e0c5714..8ba8813f349 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -419,6 +420,32 @@ void Scene_polygon_soup_item::inside_out() invalidateOpenGLBuffers(); } +void Scene_polygon_soup_item::repair(bool erase_dup, bool req_same_orientation) +{ + QApplication::setOverrideCursor(Qt::BusyCursor); + CGAL::Polygon_mesh_processing::repair_polygon_soup( + d->soup->points, + d->soup->polygons, + CGAL::parameters::erase_all_duplicates(erase_dup) + .require_same_orientation(req_same_orientation)); + QApplication::restoreOverrideCursor(); + invalidateOpenGLBuffers(); +} + +bool Scene_polygon_soup_item::triangulate() +{ + QApplication::setOverrideCursor(Qt::BusyCursor); + + bool success = true; + + CGAL::Polygon_mesh_processing::triangulate_polygons(d->soup->points, d->soup->polygons); + + QApplication::restoreOverrideCursor(); + invalidateOpenGLBuffers(); + + return success; +} + bool Scene_polygon_soup_item::orient(std::vector& non_manifold_vertices) { @@ -894,20 +921,6 @@ void Scene_polygon_soup_item::computeElements() const QApplication::restoreOverrideCursor(); } -void Scene_polygon_soup_item::repair(bool erase_dup, bool req_same_orientation) -{ - QApplication::setOverrideCursor(Qt::BusyCursor); - CGAL::Polygon_mesh_processing::repair_polygon_soup( - d->soup->points, - d->soup->polygons, - CGAL::parameters:: - erase_all_duplicates(erase_dup) - .require_same_orientation(req_same_orientation)); - QApplication::restoreOverrideCursor(); - - // CGAL::Three::Three::information( -} - CGAL::Three::Scene_item::Header_data Scene_polygon_soup_item::header() const { CGAL::Three::Scene_item::Header_data data; diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h index 5dea8c11f02..9fd1aed124f 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h @@ -187,6 +187,7 @@ public Q_SLOTS: bool exportAsSurfaceMesh(SMesh*); void inside_out(); void repair(bool erase_dup, bool req_same_orientation); + bool triangulate(); void setDisplayNonManifoldEdges(const bool); bool displayNonManifoldEdges() const; From c346b4a8365208ea6334515771792d1a2d83b0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 15:46:42 +0200 Subject: [PATCH 22/52] Avoid repetition --- .../include/CGAL/Polygon_mesh_processing/triangulate_faces.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 35fc824e4ad..991113b438b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -623,7 +623,7 @@ public: * \cgalParamNEnd * * \cgalParamNBegin{visitor} -* \cgalParamDescription{a visitor that enables to track how polygons are triangulated into triangles} +* \cgalParamDescription{a visitor that enables to track how polygons are divided into triangles} * \cgalParamType{a class model of `PMPTriangulateFaceVisitor` and `PMPHolefillingVisitor`} * \cgalParamDefault{`Triangulate_polygons::Default_visitor`} * \cgalParamExtra{Note that the visitor will be copied, so From 8f3968000e8cbc222b9ee83396d726e864e696a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 29 Mar 2023 21:09:44 +0200 Subject: [PATCH 23/52] Fix visitor --- .../Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp index a15e1f14dfd..37dcedc8adb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp @@ -178,12 +178,13 @@ class Polyhedron_demo_isotropic_remeshing_plugin : typedef std::unordered_set Edge_set; typedef Scene_polyhedron_selection_item::Is_constrained_map Edge_constrained_pmap; - struct Visitor + struct Selection_updater_visitor + : public CGAL::Polygon_mesh_processing::Hole_filling::Default_visitor { typedef typename Scene_polyhedron_selection_item::Selection_set_facet Container; Container& faces; - Visitor(Container& container) + Selection_updater_visitor(Container& container) : faces(container) {} @@ -493,7 +494,7 @@ public Q_SLOTS: (QMessageBox::Ok | QMessageBox::Cancel), QMessageBox::Ok)) { - Visitor visitor(selection_item->selected_facets); + Selection_updater_visitor visitor(selection_item->selected_facets); CGAL::Polygon_mesh_processing::triangulate_faces(selection_item->selected_facets, pmesh, CGAL::parameters::visitor(visitor)); From 23f3813458dcd4219c5a6d4abf53fd123cd18dce Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Sat, 1 Apr 2023 11:48:51 +0300 Subject: [PATCH 24/52] Fixed typos in Minkowski sum bug fix description --- Installation/CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 25e9701c791..ead4fb05d23 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -106,7 +106,7 @@ extracted from labeled images. ### [2D Minkowski Sums](https://doc.cgal.org/5.6/Manual/packages.html#PkgMinkowskiSum2) - Fixed a bug that made holes in the Minkowski sum disappear -- Fixed hole filtering. The code use to erroneously remove holes from the container of holes of polygons with holes that did not affect the mink. sum. Now it simply adds those that do affect it. +- Fixed hole filtering. The code used to erroneously remove holes from the container of holes of polygons with holes that did not affect the minkowsi sum. Now it simply adds those that do affect it. [Release 5.5](https://github.com/CGAL/cgal/releases/tag/v5.5) ----------- From 8ee3eecc85655a680c41c8d5ac27e9c805c9a68e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 08:33:51 +0100 Subject: [PATCH 25/52] Remove unused typedefs --- .../include/CGAL/Polygon_mesh_processing/triangulate_faces.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index 991113b438b..1db068ef470 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -168,7 +168,6 @@ public: using FT = typename Traits::FT; using Point_ref = typename boost::property_traits::reference; - using Vector = typename Traits::Vector_3; using Visitor = typename internal_np::Lookup_named_param_def< internal_np::visitor_t, @@ -471,7 +470,6 @@ private: namespace PMP = CGAL::Polygon_mesh_processing; using Point = typename boost::property_traits::value_type; - using Kernel = typename CGAL::Kernel_traits::type; // gather halfedges around the face std::vector hole_points; From e816f17ef496dffc7fa44ac805a75350206bc90f Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 08:47:07 +0100 Subject: [PATCH 26/52] Derive Visitor in example to have default implementations of some callbacks --- .../triangulate_faces_split_visitor_example.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f46d09e0f2b..9b246f7678d 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 @@ -41,7 +41,7 @@ public: }; -struct Visitor +struct Visitor : public CGAL::Polygon_mesh_processing::Triangulate_faces::Default_visitor { typedef std::unordered_map Container; From 49b8f1f7fbe73d32ae2da5bd381a77fa38edfd91 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 23 Mar 2023 14:41:46 +0100 Subject: [PATCH 27/52] Add partial specializations of boost::multiprecision::is_byte_container --- Installation/include/CGAL/config.h | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 22fe30a1823..2149ea244cd 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -597,4 +597,40 @@ inline std::string data_file_path(const std::string& filename) } // end namespace CGAL + +// Workaround for an accidental enable if of Eigen::Matrix in the +// boost::multiprecision::cpp_int constructor for some versions of +// boost + +namespace Eigen{ + template + class Matrix; + template + class Ref; + +} + +namespace boost { + namespace multiprecision { + namespace detail { + template + struct is_byte_container; + + + template + struct is_byte_container< Eigen::Matrix> + { + static const bool value = false; + }; + + template + struct is_byte_container< Eigen::Ref> + { + static const bool value = false; + }; + + } + } +} + #endif // CGAL_CONFIG_H From a9cf79e512c65664663080892ae65be33e4c105d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 10:21:00 +0100 Subject: [PATCH 28/52] Add more partial specializations --- Installation/include/CGAL/config.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 2149ea244cd..2396191a639 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -608,6 +608,11 @@ namespace Eigen{ template class Ref; + template + class Product; + + template class CwiseBinaryOp; + } namespace boost { @@ -629,6 +634,18 @@ namespace boost { static const bool value = false; }; + template + struct is_byte_container< Eigen::Product> + { + static const bool value = false; + }; + + template + struct is_byte_container< Eigen::CwiseBinaryOp> + { + static const bool value = false; + }; + } } } From 3d9e5898538d4b3fc27b42858271716405c54bb8 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 10:42:17 +0100 Subject: [PATCH 29/52] Remove default value --- Installation/include/CGAL/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 2396191a639..422c4600825 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -608,7 +608,7 @@ namespace Eigen{ template class Ref; - template + template class Product; template class CwiseBinaryOp; From be85b37b374aa67394c6f5f3e9654dc9514d4ec5 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 10:42:43 +0100 Subject: [PATCH 30/52] Simplify expressions --- .../include/CGAL/PCA_util_Eigen.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h b/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h index e7fd18b8842..f4a8fc09f80 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h +++ b/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h @@ -368,7 +368,7 @@ assemble_covariance_matrix_3(InputIterator first, transformation << radius, 0.0, 0.0, 0.0, radius, 0.0, 0.0, 0.0, radius; - FT volume = (FT)(4.0/3.0) * radius * t.squared_radius(); + FT volume = radius * t.squared_radius(); // skip zero measure primitives if(volume == (FT)0.0) @@ -377,8 +377,9 @@ assemble_covariance_matrix_3(InputIterator first, // Find the 2nd order moment for the sphere wrt to the origin by an affine transformation. // Transform the standard 2nd order moment using the transformation matrix - transformation = (3.0/4.0) * volume * transformation * moment * transformation.transpose(); + transformation = volume * transformation * moment * transformation.transpose(); + volume *= FT(4.0 / 3.0); // Translate the 2nd order moment to the center of the sphere. FT x0 = t.center().x(); FT y0 = t.center().y(); @@ -453,7 +454,7 @@ assemble_covariance_matrix_3(InputIterator first, transformation << radius, 0.0, 0.0, 0.0, radius, 0.0, 0.0, 0.0, radius; - FT area = (FT)4.0 * t.squared_radius(); + FT area = t.squared_radius(); // skip zero measure primitives if(area == (FT)0.0) @@ -462,8 +463,9 @@ assemble_covariance_matrix_3(InputIterator first, // Find the 2nd order moment for the sphere wrt to the origin by an affine transformation. // Transform the standard 2nd order moment using the transformation matrix - transformation = (1.0/4.0) * area * transformation * moment * transformation.transpose(); + transformation = area * transformation * moment * transformation.transpose(); + area *= FT(4.0); // Translate the 2nd order moment to the center of the sphere. FT x0 = t.center().x(); FT y0 = t.center().y(); From b5f44bdac113c22a9c7b363b53bac25b2276f3c2 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 10:55:31 +0100 Subject: [PATCH 31/52] Activate workaround only for boost < 1.79 --- Installation/include/CGAL/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 422c4600825..38e6788a438 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -598,6 +598,8 @@ inline std::string data_file_path(const std::string& filename) } // end namespace CGAL +#if BOOST_VERSION < 107900 + // Workaround for an accidental enable if of Eigen::Matrix in the // boost::multiprecision::cpp_int constructor for some versions of // boost @@ -650,4 +652,6 @@ namespace boost { } } +#endif + #endif // CGAL_CONFIG_H From 246cc9ba0b90797bd16d42e059a042ec284df9d1 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 4 Apr 2023 11:16:52 +0100 Subject: [PATCH 32/52] Simplify expressions --- Principal_component_analysis/include/CGAL/PCA_util.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Principal_component_analysis/include/CGAL/PCA_util.h b/Principal_component_analysis/include/CGAL/PCA_util.h index 9e3508a68a6..d3f7215d801 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util.h +++ b/Principal_component_analysis/include/CGAL/PCA_util.h @@ -391,7 +391,7 @@ assemble_covariance_matrix_3(InputIterator first, 0.0, radius, 0.0, 0.0, 0.0, radius}; Matrix transformation = init_matrix(3,delta); - FT volume = (FT)(4.0/3.0) * radius * t.squared_radius(); + FT volume = radius * t.squared_radius(); // skip zero measure primitives if(volume == (FT)0.0) @@ -400,8 +400,9 @@ assemble_covariance_matrix_3(InputIterator first, // Find the 2nd order moment for the sphere wrt to the origin by an affine transformation. // Transform the standard 2nd order moment using the transformation matrix - transformation = (3.0/4.0) * volume * transformation * moment * LA::transpose(transformation); + transformation = volume * transformation * moment * LA::transpose(transformation); + volume *= FT(4.0/3.0); // Translate the 2nd order moment to the center of the sphere. FT x0 = t.center().x(); FT y0 = t.center().y(); @@ -476,7 +477,7 @@ assemble_covariance_matrix_3(InputIterator first, 0.0, radius, 0.0, 0.0, 0.0, radius}; Matrix transformation = init_matrix(3,delta); - FT area = (FT)4.0 * t.squared_radius(); + FT area = t.squared_radius(); // skip zero measure primitives if(area == (FT)0.0) @@ -485,8 +486,9 @@ assemble_covariance_matrix_3(InputIterator first, // Find the 2nd order moment for the sphere wrt to the origin by an affine transformation. // Transform the standard 2nd order moment using the transformation matrix - transformation = (1.0/4.0) * area * transformation * moment * LA::transpose(transformation); + transformation = area * transformation * moment * LA::transpose(transformation); + area *= FT(4.0); // Translate the 2nd order moment to the center of the sphere. FT x0 = t.center().x(); FT y0 = t.center().y(); From 5828644133924676f63f8cfd7e947c64e43a563b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 5 Apr 2023 17:24:04 +0200 Subject: [PATCH 33/52] fix warnings --- .../internal/Hole_filling/Triangulate_hole_polygon_mesh.h | 6 ++++++ .../CGAL/Polygon_mesh_processing/triangulate_hole.h | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polygon_mesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polygon_mesh.h index ab837b05c88..7b36d3295ec 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polygon_mesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polygon_mesh.h @@ -22,6 +22,7 @@ #endif #include #include +#include #include namespace CGAL { @@ -107,6 +108,11 @@ triangulate_hole_polygon_mesh(PolygonMesh& pmesh, Visitor& visitor, const typename Kernel::FT max_squared_distance) { +#ifdef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 + CGAL_USE(use_cdt); + CGAL_USE(max_squared_distance); +#endif + typedef Halfedge_around_face_circulator Hedge_around_face_circulator; typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h index 46c3a6904be..ba55ceca89e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h @@ -729,11 +729,8 @@ namespace Polygon_mesh_processing { using parameters::get_parameter; using parameters::get_parameter_reference; - bool use_cdt = -#ifdef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 - false; -#else - choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), false); +#ifndef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2 + bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_2d_constrained_delaunay_triangulation), false); #endif bool use_dt3 = #ifdef CGAL_HOLE_FILLING_DO_NOT_USE_DT3 From df17ad5e245c2189dbb5d29d21da49342a4479f9 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Apr 2023 12:47:07 +0200 Subject: [PATCH 34/52] Add a comment to the closing #endif --- Installation/include/CGAL/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 38e6788a438..d492dafc046 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -652,6 +652,6 @@ namespace boost { } } -#endif +#endif // BOOST_VERSION < 107900 #endif // CGAL_CONFIG_H From 3262b21ed76213a8bd14b0511ddd2104ed76c60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 10 Jan 2023 19:09:58 +0100 Subject: [PATCH 35/52] do not evaluate other options if the parameter is provided --- .../CGAL/boost/graph/named_params_helper.h | 100 +++++++++++++++--- 1 file changed, 83 insertions(+), 17 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h index 1d68f2a6f87..6c438270980 100644 --- a/BGL/include/CGAL/boost/graph/named_params_helper.h +++ b/BGL/include/CGAL/boost/graph/named_params_helper.h @@ -110,22 +110,75 @@ public: typedef typename boost::property_traits::value_type type; }; + +template +struct GetVertexPointMap_impl +{ + typedef VPM_from_NP type; + typedef VPM_from_NP const_type; + + template + static const_type + get_const_map(const NamedParameters& np, const PolygonMesh&) + { + return parameters::get_parameter(np, internal_np::vertex_point); + } + + template + static type + get_map(const NamedParameters& np, PolygonMesh&) + { + return parameters::get_parameter(np, internal_np::vertex_point); + } +}; + +template +struct GetVertexPointMap_impl +{ + typedef typename property_map_selector::const_type const_type; + typedef typename property_map_selector::type type; + + template + static const_type + get_const_map(const NamedParameters& np, const PolygonMesh& pm) + { + return get_const_property_map(boost::vertex_point, pm); + } + + template + static type + get_map(const NamedParameters& np, PolygonMesh& pm) + { + return get_property_map(boost::vertex_point, pm); + } +}; + template class GetVertexPointMap { - typedef typename property_map_selector::const_type - DefaultVPMap_const; - typedef typename property_map_selector::type - DefaultVPMap; + typedef typename internal_np::Lookup_named_param_def::type VPM_from_NP; + + typedef GetVertexPointMap_impl Impl; public: - typedef typename internal_np::Lookup_named_param_def::type type; - typedef typename internal_np::Lookup_named_param_def::type const_type; + typedef typename Impl::type type; + typedef typename Impl::const_type const_type; + + static const_type + get_const_map(const NamedParameters& np, const PolygonMesh& pm) + { + return Impl::get_const_map(np, pm); + } + + static type + get_map(const NamedParameters& np, PolygonMesh& pm) + { + return Impl::get_map(np, pm); + } }; template @@ -138,10 +191,15 @@ public: typedef typename CGAL::Kernel_traits::Kernel Kernel; }; -template -class GetGeomTraits + +template +struct GetGeomTraits_impl +{ + typedef GT type; +}; + +template +struct GetGeomTraits_impl { typedef typename CGAL::graph_has_property::type Has_internal_pmap; @@ -154,12 +212,20 @@ class GetGeomTraits typedef typename boost::mpl::if_c::value, typename GetK::Kernel, - Fake_GT>::type DefaultKernel; + Fake_GT>::type type; +}; -public: +template +struct GetGeomTraits +{ typedef typename internal_np::Lookup_named_param_def::type type; + internal_np::Param_not_found>::type GT_from_NP; + typedef typename GetGeomTraits_impl::type type; }; // Define the following structs: From fb7d892e36e54e45e51f3b05609f6763d571feea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 6 Apr 2023 19:12:39 +0200 Subject: [PATCH 36/52] add help for geom traits for function dealing with polygon soups --- .../CGAL/boost/graph/named_params_helper.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h index 6c438270980..f5b8c44df82 100644 --- a/BGL/include/CGAL/boost/graph/named_params_helper.h +++ b/BGL/include/CGAL/boost/graph/named_params_helper.h @@ -344,6 +344,21 @@ public: typedef typename CGAL::Identity_property_map const_type; }; +template +struct GetPolygonSoupGeomTraits +{ + typedef typename internal_np::Lookup_named_param_def < + internal_np::geom_traits_t, + NamedParameters, + typename CGAL::Kernel_traits< + typename boost::property_traits< + typename GetPointMap::type + >::value_type + >::type + > ::type type; +}; + + template struct Point_set_processing_3_np_helper { From dd4a4420f0823984449023166169ccdc70709789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 5 Jan 2023 08:45:09 +0100 Subject: [PATCH 37/52] soup/mesh abstraction --- .../self_intersections.h | 203 +++++++++++++----- 1 file changed, 150 insertions(+), 53 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index cc07ed99f65..f89e5fddef3 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -54,6 +54,115 @@ namespace CGAL { namespace Polygon_mesh_processing { namespace internal { +template +struct Triangle_mesh_and_triangle_soup_wrapper +{ + typedef typename boost::graph_traits::face_descriptor face_descriptor; + typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; + typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; // private + + static void get_face_vertices(face_descriptor fd, std::array& vh, const TM& tm) + { + CGAL_assertion(boost::graph_traits::null_face() != fd); + halfedge_descriptor h = halfedge(fd, tm); + vh[0]=source(h, tm); + vh[1]=target(h, tm); + vh[2]=target(next(h, tm), tm); + } + + static bool faces_have_a_shared_edge(face_descriptor f, face_descriptor g, std::array& vh, const TM& tm) + { + CGAL_assertion(boost::graph_traits::null_face() != f); + CGAL_assertion(boost::graph_traits::null_face() != g); + halfedge_descriptor h=halfedge(f, tm); + for(unsigned int i=0; i<3; ++i) + { + halfedge_descriptor opp_h = opposite(h, tm); + if(face(opp_h, tm) == g) + { + vh[0]=source(h, tm); + vh[1]=target(h, tm); + vh[2]=target(next(h, tm), tm); + vh[3]=target(next(opp_h, tm), tm); + return true; + } + h = next(h, tm); + } + return false; + } +}; + +template +struct Triangle_mesh_and_triangle_soup_wrapper< + std::pair, + std::reference_wrapper>> +{ + typedef std::size_t face_descriptor; + typedef std::size_t vertex_descriptor; + + typedef std::pair, + std::reference_wrapper > Soup; + + static void get_face_vertices(face_descriptor fd, std::array& vh, const Soup& soup) + { + const auto& face = soup.second.get()[fd]; + vh[0]=face[0]; + vh[1]=face[1]; + vh[2]=face[2]; + } + + static bool faces_have_a_shared_edge(face_descriptor fd, face_descriptor gd, std::array& vh, const Soup& soup) + { + const auto& f = soup.second.get()[fd]; + const auto& g = soup.second.get()[gd]; + + for(unsigned int i=0; i<3; ++i) + { + for(unsigned int j=0; j<3; ++j) + { + if (f[i]==g[j]) + { + vh[0]=f[i]; + vh[1]=f[(i+1)%3]; + vh[2]=f[(i+2)%3]; + + if (vh[1]==g[(j+1)%3]) + { + vh[3]=g[(j+2)%3]; + return true; + } + if (vh[1]==g[(j+2)%3]) + { + vh[3]=g[(j+1)%3]; + return true; + } + + if (i==0) + { + vh[1]=f[i]; + vh[2]=f[(i+1)%3]; + vh[0]=f[(i+2)%3]; + if (vh[0]==g[(j+1)%3]) + { + vh[3]=g[(j+2)%3]; + return true; + } + if (vh[0]==g[(j+2)%3]) + { + vh[3]=g[(j+1)%3]; + return true; + } + } + + return false; + } + } + } + + return false; + } +}; + template struct Throw_at_count_reached_functor { @@ -82,59 +191,49 @@ struct Throw_at_count_reached_functor { // Checks for 'real' intersections, i.e. not simply a shared vertex or edge template -bool do_faces_intersect(typename boost::graph_traits::halfedge_descriptor h, - typename boost::graph_traits::halfedge_descriptor g, +bool do_faces_intersect(typename Triangle_mesh_and_triangle_soup_wrapper::face_descriptor fh, + typename Triangle_mesh_and_triangle_soup_wrapper::face_descriptor fg, const TM& tmesh, const VPM vpmap, const typename GT::Construct_segment_3& construct_segment, const typename GT::Construct_triangle_3& construct_triangle, const typename GT::Do_intersect_3& do_intersect) { - typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; - typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; + typedef Triangle_mesh_and_triangle_soup_wrapper Wrapper; + typedef typename Wrapper::vertex_descriptor vertex_descriptor; - typedef typename GT::Segment_3 Segment; - typedef typename GT::Triangle_3 Triangle; + typedef typename GT::Segment_3 Segment; + typedef typename GT::Triangle_3 Triangle; - CGAL_assertion(!is_border(h, tmesh)); - CGAL_assertion(!is_border(g, tmesh)); - vertex_descriptor hv[3], gv[3]; - hv[0] = target(h, tmesh); - hv[1] = target(next(h, tmesh), tmesh); - hv[2] = source(h, tmesh); - - gv[0] = target(g, tmesh); - gv[1] = target(next(g, tmesh), tmesh); - gv[2] = source(g, tmesh); + std::array hv, gv; + Wrapper::get_face_vertices(fh, hv, tmesh); + Wrapper::get_face_vertices(fg, gv, tmesh); // check for shared edge - for(unsigned int i=0; i<3; ++i) + std::array verts; + if (Wrapper::faces_have_a_shared_edge(fh, fg, verts, tmesh)) { - halfedge_descriptor opp_h = opposite(h, tmesh); - if(face(opp_h, tmesh) == face(g, tmesh)) - { - // there is an intersection if the four points are coplanar and the triangles overlap - if(CGAL::coplanar(get(vpmap, hv[i]), - get(vpmap, hv[(i+1)%3]), - get(vpmap, hv[(i+2)%3]), - get(vpmap, target(next(opp_h, tmesh), tmesh))) && - CGAL::coplanar_orientation(get(vpmap, hv[(i+2)%3]), - get(vpmap, hv[i]), - get(vpmap, hv[(i+1)%3]), - get(vpmap, target(next(opp_h, tmesh), tmesh))) - == CGAL::POSITIVE) - { - return true; - } - else - { - // there is a shared edge but no intersection - return false; - } - } + if (verts[2]==verts[3]) return false; // only for a soup of triangles - h = next(h, tmesh); + // there is an intersection if the four points are coplanar and the triangles overlap + if(CGAL::coplanar(get(vpmap, verts[0]), + get(vpmap, verts[1]), + get(vpmap, verts[2]), + get(vpmap, verts[3])) && + CGAL::coplanar_orientation(get(vpmap, verts[0]), + get(vpmap, verts[1]), + get(vpmap, verts[2]), + get(vpmap, verts[3])) + == CGAL::POSITIVE) + { + return true; + } + else + { + // there is a shared edge but no intersection + return false; + } } // check for shared vertex --> maybe intersection, maybe not @@ -188,8 +287,6 @@ template struct Strict_intersect_faces // "strict" as in "not sharing a subface" { - typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - mutable OutputIterator m_iterator; const TM& m_tmesh; const VPM m_vpmap; @@ -209,10 +306,7 @@ struct Strict_intersect_faces // "strict" as in "not sharing a subface" void operator()(const Box* b, const Box* c) const { - const halfedge_descriptor h = halfedge(b->info(), m_tmesh); - const halfedge_descriptor g = halfedge(c->info(), m_tmesh); - - if(do_faces_intersect(h, g, m_tmesh, m_vpmap, m_construct_segment, m_construct_triangle, m_do_intersect)) + if(do_faces_intersect(b->info(), c->info(), m_tmesh, m_vpmap, m_construct_segment, m_construct_triangle, m_do_intersect)) *m_iterator++ = std::make_pair(b->info(), c->info()); } }; @@ -236,8 +330,9 @@ self_intersections_impl(const FaceRange& face_range, using CGAL::parameters::is_default_parameter; typedef TriangleMesh TM; - typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - typedef typename boost::graph_traits::face_descriptor face_descriptor; + typedef Triangle_mesh_and_triangle_soup_wrapper Wrapper; + typedef typename Wrapper::face_descriptor face_descriptor; + typedef typename Wrapper::vertex_descriptor vertex_descriptor; typedef CGAL::Box_intersection_d::ID_FROM_BOX_ADDRESS Box_policy; typedef CGAL::Box_intersection_d::Box_with_info_d Box; @@ -268,11 +363,13 @@ self_intersections_impl(const FaceRange& face_range, // This loop is very cheap, so there is hardly anything to gain from parallelizing it for(face_descriptor f : face_range) { - halfedge_descriptor h = halfedge(f, tmesh); + std::array vh; + Wrapper::get_face_vertices(f, vh, tmesh); + typename boost::property_traits::reference - p = get(vpmap, target(h,tmesh)), - q = get(vpmap, target(next(h, tmesh), tmesh)), - r = get(vpmap, target(prev(h, tmesh), tmesh)); + p = get(vpmap, vh[0]), + q = get(vpmap, vh[1]), + r = get(vpmap, vh[2]); // tiny fixme: if f is degenerate, we might still have a real intersection between f // and another face f', but right now we are not creating a box for f and thus not returning those @@ -342,7 +439,7 @@ self_intersections_impl(const FaceRange& face_range, std::atomic atomic_counter(counter); Throw_functor throwing_count_functor(atomic_counter, maximum_number, std::back_inserter(face_pairs)); Throwing_after_count_output_iterator count_filter(throwing_count_functor); - Filtered_intersecting_faces_filter limited_callback(tmesh, vpmap, gt, count_filter); + Filtered_intersecting_faces_filter limited_callback(tmesh, vpmap, gt, count_filter); CGAL::box_self_intersection_d(box_ptr.begin(), box_ptr.end(), limited_callback, cutoff); } catch(const CGAL::internal::Throw_at_output_exception&) From f8ab63088a8c482095af34624380d9b46eea4a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 10 Jan 2023 19:19:32 +0100 Subject: [PATCH 38/52] add self-intersection functions for soup no doc for now --- .../self_intersections.h | 112 ++++++++++++++++-- 1 file changed, 105 insertions(+), 7 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index f89e5fddef3..a00ea645f7e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -43,6 +43,7 @@ #endif #include +#include #include #include @@ -94,8 +95,8 @@ struct Triangle_mesh_and_triangle_soup_wrapper template struct Triangle_mesh_and_triangle_soup_wrapper< - std::pair, - std::reference_wrapper>> + std::pair> { typedef std::size_t face_descriptor; typedef std::size_t vertex_descriptor; @@ -116,14 +117,14 @@ struct Triangle_mesh_and_triangle_soup_wrapper< const auto& f = soup.second.get()[fd]; const auto& g = soup.second.get()[gd]; - for(unsigned int i=0; i<3; ++i) + for(unsigned int i=0; i<2; ++i) // no need to check f[2] if neither f[0] nor f[1] are shared { for(unsigned int j=0; j<3; ++j) { if (f[i]==g[j]) { vh[0]=f[i]; - vh[1]=f[(i+1)%3]; + vh[1]=f[i+1]; vh[2]=f[(i+2)%3]; if (vh[1]==g[(j+1)%3]) @@ -340,9 +341,9 @@ self_intersections_impl(const FaceRange& face_range, typedef typename GetGeomTraits::type GT; GT gt = choose_parameter(get_parameter(np, internal_np::geom_traits)); - typedef typename GetVertexPointMap::const_type VPM; - VPM vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tmesh)); + typedef GetVertexPointMap VPM_helper; + typedef typename VPM_helper::const_type VPM; + VPM vpmap = VPM_helper::get_const_map(np, tmesh); const bool do_limit = !(is_default_parameter::value); const unsigned int maximum_number = choose_parameter(get_parameter(np, internal_np::maximum_number), 0); @@ -753,6 +754,103 @@ bool does_self_intersect(const TriangleMesh& tmesh, return does_self_intersect(faces(tmesh), tmesh, np); } + +#ifndef DOXYGEN_RUNNING + +template +struct Property_map_for_soup +{ + typedef std::size_t key_type; + typedef typename boost::property_traits::value_type value_type; + //typedef typename boost::property_traits::category category; + typedef boost::readable_property_map_tag category; + typedef typename boost::property_traits::reference reference; + + const PointRange& points; + VPM vpm; + + Property_map_for_soup(const PointRange& points, VPM vpm) + : points(points) + , vpm(vpm) + {} + + inline friend + reference get(const Property_map_for_soup& map, key_type k) + { + return get(map.vpm, map.points[k]); + } +}; + +template +FacePairOutputIterator +triangle_soup_self_intersections(const PointRange& points, + const TriangleRange& triangles, + FacePairOutputIterator out, + const CGAL_NP_CLASS& np = parameters::default_values()) +{ + using parameters::choose_parameter; + using parameters::get_parameter; + + typedef typename CGAL::GetPointMap::const_type Point_map_base; + Point_map_base pm_base = choose_parameter(get_parameter(np, internal_np::point_map)); + typedef Property_map_for_soup Point_map; + + return self_intersections(boost::irange(0, triangles.size()), + std::make_pair(std::cref(points), std::cref(triangles)), + out, + parameters::vertex_point_map(Point_map(points,pm_base))); +} + +template +bool does_triangle_soup_self_intersect(const PointRange& points, + const TriangleRange& triangles, + const CGAL_NP_CLASS& np = parameters::default_values()) +{ + try + { + using parameters::choose_parameter; + using parameters::get_parameter; + + CGAL::Emptyset_iterator unused_out; + typedef typename CGAL::GetPointMap::const_type Point_map_base; + Point_map_base pm_base = choose_parameter(get_parameter(np, internal_np::point_map)); + typedef Property_map_for_soup Point_map; + + typename Kernel_traits::value_type>::Kernel k; + + internal::self_intersections_impl(boost::irange(0, triangles.size()), + std::make_pair(std::cref(points), std::cref(triangles)), + unused_out, true /*throw*/, + parameters::vertex_point_map(Point_map(points,pm_base)) + .geom_traits(k)); + } + catch (const CGAL::internal::Throw_at_output_exception&) + { + return true; + } + #if defined(CGAL_LINKED_WITH_TBB) && TBB_USE_CAPTURED_EXCEPTION + catch (const tbb::captured_exception& e) + { + const char* ti1 = e.name(); + const char* ti2 = typeid(const CGAL::internal::Throw_at_output_exception&).name(); + const std::string tn1(ti1); + const std::string tn2(ti2); + if (tn1 == tn2) return true; + else throw; + } + #endif + return false; +} + +#endif + }// namespace Polygon_mesh_processing }// namespace CGAL From 96868b9fc4086d3ac790656debbbf0095ebe262d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 12 Jan 2023 13:42:40 +0100 Subject: [PATCH 39/52] fix debug code --- .../self_intersections.h | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index a00ea645f7e..5ea0d530eb3 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -91,6 +91,11 @@ struct Triangle_mesh_and_triangle_soup_wrapper } return false; } + + static bool is_pure_triangle(const TM& tm) + { + return is_triangle_mesh(tm); + } }; template @@ -101,12 +106,11 @@ struct Triangle_mesh_and_triangle_soup_wrapper< typedef std::size_t face_descriptor; typedef std::size_t vertex_descriptor; - typedef std::pair, - std::reference_wrapper > Soup; + typedef std::pair Soup; static void get_face_vertices(face_descriptor fd, std::array& vh, const Soup& soup) { - const auto& face = soup.second.get()[fd]; + const auto& face = soup.second[fd]; vh[0]=face[0]; vh[1]=face[1]; vh[2]=face[2]; @@ -114,8 +118,8 @@ struct Triangle_mesh_and_triangle_soup_wrapper< static bool faces_have_a_shared_edge(face_descriptor fd, face_descriptor gd, std::array& vh, const Soup& soup) { - const auto& f = soup.second.get()[fd]; - const auto& g = soup.second.get()[gd]; + const auto& f = soup.second[fd]; + const auto& g = soup.second[gd]; for(unsigned int i=0; i<2; ++i) // no need to check f[2] if neither f[0] nor f[1] are shared { @@ -162,6 +166,14 @@ struct Triangle_mesh_and_triangle_soup_wrapper< return false; } + + static bool is_pure_triangle(const Soup& soup) + { + for (const typename std::iterator_traits::value_type& t : soup.second) + if (t.size()!=3) + return false; + return true; + } }; template @@ -324,14 +336,15 @@ self_intersections_impl(const FaceRange& face_range, const bool throw_on_SI, const NamedParameters& np) { - CGAL_precondition(CGAL::is_triangle_mesh(tmesh)); + typedef TriangleMesh TM; + typedef Triangle_mesh_and_triangle_soup_wrapper Wrapper; + + CGAL_precondition(Wrapper::is_pure_triangle(tmesh)); using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; using CGAL::parameters::is_default_parameter; - typedef TriangleMesh TM; - typedef Triangle_mesh_and_triangle_soup_wrapper Wrapper; typedef typename Wrapper::face_descriptor face_descriptor; typedef typename Wrapper::vertex_descriptor vertex_descriptor; @@ -682,8 +695,6 @@ bool does_self_intersect(const FaceRange& face_range, const TriangleMesh& tmesh, const NamedParameters& np = parameters::default_values()) { - CGAL_precondition(CGAL::is_triangle_mesh(tmesh)); - try { CGAL::Emptyset_iterator unused_out; From 5f3d748e19e2142dd3b42f02b150bf87983723e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 28 Mar 2023 16:41:32 +0200 Subject: [PATCH 40/52] add doc for self-intersection related functions for soups --- .../PackageDescription.txt | 2 + .../self_intersections.h | 125 ++++++++++++++++-- 2 files changed, 114 insertions(+), 13 deletions(-) diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt index 8141fbd16f2..8f85c769189 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt @@ -150,6 +150,8 @@ The page \ref bgl_namedparameters "Named Parameters" describes their usage. \cgalCRPSection{Intersection Functions} - `CGAL::Polygon_mesh_processing::does_self_intersect()` - `CGAL::Polygon_mesh_processing::self_intersections()` +- `CGAL::Polygon_mesh_processing::does_triangle_soup_self_intersect()` +- `CGAL::Polygon_mesh_processing::triangle_soup_self_intersections()` - \link PMP_intersection_grp `CGAL::Polygon_mesh_processing::do_intersect()` \endlink - `CGAL::Polygon_mesh_processing::intersecting_meshes()` diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index 5ea0d530eb3..f331c79ef17 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -601,9 +601,9 @@ self_intersections(const FaceRange& face_range, * * @param tmesh the triangulated surface mesh to be checked * @param out output iterator to be filled with all pairs of non-adjacent faces that intersect. - In case `tmesh` contains some degenerate faces, for each degenerate face `f` a pair `(f,f)` - will be put in `out` before any other self intersection between non-degenerate faces. - These are the only pairs where degenerate faces will be reported. + * In case `tmesh` contains some degenerate faces, for each degenerate face `f` a pair `(f,f)` + * will be put in `out` before any other self intersection between non-degenerate faces. + * These are the only pairs where degenerate faces will be reported. * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below * * \cgalNamedParamsBegin @@ -767,7 +767,6 @@ bool does_self_intersect(const TriangleMesh& tmesh, #ifndef DOXYGEN_RUNNING - template struct Property_map_for_soup { @@ -791,16 +790,71 @@ struct Property_map_for_soup return get(map.vpm, map.points[k]); } }; +#endif +/** + * \ingroup PMP_intersection_grp + * + * collects intersections between all the triangles in a triangle soup. + * + * Two triangles of the soup are said to intersect if the corresponding geometric triangles intersect + * and the intersection is not an edge nor a vertex of both triangles + * (with the same point ids, ignoring the orientation for an edge). + * + * A triangle soup self-intersects if at least two triangles of the soup intersect. + * Two triangles of the soup are considered to intersect if the geometric triangles are not disjoint + * and the intersection is not a restricted to the same point (i.e. with the same id) or to a triangle edge + * (i.e. with the same ids, the edge orientation being ignored). + * + * This function depends on the package \ref PkgBoxIntersectionD + * + * @tparam ConcurrencyTag enables sequential versus parallel algorithm. + * Possible values are `Sequential_tag`, `Parallel_tag`, and `Parallel_if_available_tag`. + * @tparam PointRange a model of the concept `RandomAccessContainer` + * whose value type is the point type + * @tparam TriangleRange a model of the concept `RandomAccessContainer` whose + * value type is a model of the concept `RandomAccessContainer` whose value type is `std::size_t` + * @tparam TriangleIdPairOutputIterator a model of `OutputIterator` holding objects of type + * `std::pair` + * @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" + * + * @param points points of the soup of polygons + * @param triangles each element in the range describes a triangle using the indices of the points in `points` + * @param out output iterator to be filled with all pairs of ids of triangles intersecting (the id of a triangle is its position in `triangles`). + * In case the triangle soup contains some degenerate faces, for each degenerate face `t` with id `i` a pair `(i,i)` + * will be put in `out` before any other self intersection between non-degenerate faces. + * These are the only pairs where degenerate faces will be reported. + * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below + * + * \cgalNamedParamsBegin + * \cgalParamNBegin{point_map} + * \cgalParamDescription{a property map associating points to the elements of the range `points`} + * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type convertible to the point type + * of the vertex point map associated to the polygon mesh} + * \cgalParamDefault{`CGAL::Identity_property_map`} + * \cgalParamNEnd + * + * \cgalParamNBegin{geom_traits} + * \cgalParamDescription{an instance of a geometric traits class} + * \cgalParamType{a class model of `PMPSelfIntersectionTraits`} + * \cgalParamDefault{a \cgal Kernel deduced from the point type, using `CGAL::Kernel_traits`} + * \cgalParamExtra{The geometric traits class must be compatible with the point type of the point map.} + * \cgalParamNEnd + * \cgalNamedParamsEnd + * + * @return `true` if the triangle soup self-intersects, and `false` otherwise. + * + * @sa `does_triangle_soup_self_intersect()` + */ template -FacePairOutputIterator +TriangleIdPairOutputIterator triangle_soup_self_intersections(const PointRange& points, const TriangleRange& triangles, - FacePairOutputIterator out, + TriangleIdPairOutputIterator out, const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; @@ -809,13 +863,60 @@ triangle_soup_self_intersections(const PointRange& points, typedef typename CGAL::GetPointMap::const_type Point_map_base; Point_map_base pm_base = choose_parameter(get_parameter(np, internal_np::point_map)); typedef Property_map_for_soup Point_map; + typedef typename GetPolygonSoupGeomTraits::type GT; + GT gt = choose_parameter(get_parameter(np, internal_np::geom_traits)); return self_intersections(boost::irange(0, triangles.size()), std::make_pair(std::cref(points), std::cref(triangles)), out, - parameters::vertex_point_map(Point_map(points,pm_base))); + parameters::vertex_point_map(Point_map(points,pm_base)). + geom_traits(gt)); } +/** + * \ingroup PMP_intersection_grp + * + * \brief tests if a triangle soup self-intersects. + * + * A triangle soup self-intersects if at least two triangles of the soup intersect. + * Two triangles of the soup are said to intersect if the corresponding geometric triangles intersect + * and the intersection is not an edge nor a vertex of both triangles + * (with the same point ids, ignoring the orientation for an edge). + * + * This function depends on the package \ref PkgBoxIntersectionD + * + * @tparam ConcurrencyTag enables sequential versus parallel algorithm. + * Possible values are `Sequential_tag`, `Parallel_tag`, and `Parallel_if_available_tag`. + * @tparam PointRange a model of the concept `RandomAccessContainer` + * whose value type is the point type + * @tparam TriangleRange a model of the concept `RandomAccessContainer` whose + * value type is a model of the concept `RandomAccessContainer` whose value type is `std::size_t` + * @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" + * + * @param points points of the soup of polygons + * @param triangles each element in the range describes a triangle using the indices of the points in `points` + * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below + * + * \cgalNamedParamsBegin + * \cgalParamNBegin{point_map} + * \cgalParamDescription{a property map associating points to the elements of the range `points`} + * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type convertible to the point type + * of the vertex point map associated to the polygon mesh} + * \cgalParamDefault{`CGAL::Identity_property_map`} + * \cgalParamNEnd + * + * \cgalParamNBegin{geom_traits} + * \cgalParamDescription{an instance of a geometric traits class} + * \cgalParamType{a class model of `PMPSelfIntersectionTraits`} + * \cgalParamDefault{a \cgal Kernel deduced from the point type, using `CGAL::Kernel_traits`} + * \cgalParamExtra{The geometric traits class must be compatible with the point type of the point map.} + * \cgalParamNEnd + * \cgalNamedParamsEnd + * + * @return `out` + * + * @sa `triangle_soup_self_intersections()` + */ template ::const_type Point_map_base; Point_map_base pm_base = choose_parameter(get_parameter(np, internal_np::point_map)); typedef Property_map_for_soup Point_map; - - typename Kernel_traits::value_type>::Kernel k; + typedef typename GetPolygonSoupGeomTraits::type GT; + GT gt = choose_parameter(get_parameter(np, internal_np::geom_traits)); internal::self_intersections_impl(boost::irange(0, triangles.size()), std::make_pair(std::cref(points), std::cref(triangles)), unused_out, true /*throw*/, parameters::vertex_point_map(Point_map(points,pm_base)) - .geom_traits(k)); + .geom_traits(gt)); } catch (const CGAL::internal::Throw_at_output_exception&) { @@ -860,8 +961,6 @@ bool does_triangle_soup_self_intersect(const PointRange& points, return false; } -#endif - }// namespace Polygon_mesh_processing }// namespace CGAL From 9cd2e031dbb826141aa60f3972c3bee3d0bcf2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 6 Apr 2023 15:15:09 +0200 Subject: [PATCH 41/52] fix after review from Mael --- .../self_intersections.h | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index f331c79ef17..3a368e73459 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -521,7 +521,7 @@ self_intersections_impl(const FaceRange& face_range, * Two faces are said to intersect if the corresponding triangles intersect * and the intersection is not an edge nor a vertex incident to both faces. * - * This function depends on the package \ref PkgBoxIntersectionD + * This function depends on the package \ref PkgBoxIntersectionD. * * @pre `CGAL::is_triangle_mesh(tmesh)` * @@ -588,7 +588,7 @@ self_intersections(const FaceRange& face_range, * Two faces are said to intersect if the corresponding triangles intersect * and the intersection is not an edge nor a vertex incident to both faces. * - * This function depends on the package \ref PkgBoxIntersectionD + * This function depends on the package \ref PkgBoxIntersectionD. * * @pre `CGAL::is_triangle_mesh(tmesh)` * @@ -652,7 +652,7 @@ self_intersections(const TriangleMesh& tmesh, * * \brief tests if a set of faces of a triangulated surface mesh self-intersects. * - * This function depends on the package \ref PkgBoxIntersectionD + * This function depends on the package \ref PkgBoxIntersectionD. * * @pre `CGAL::is_triangle_mesh(tmesh)` * @@ -723,7 +723,7 @@ bool does_self_intersect(const FaceRange& face_range, * * \brief tests if a triangulated surface mesh self-intersects. * - * This function depends on the package \ref PkgBoxIntersectionD + * This function depends on the package \ref PkgBoxIntersectionD. * * @pre `CGAL::is_triangle_mesh(tmesh)` * @@ -801,12 +801,7 @@ struct Property_map_for_soup * and the intersection is not an edge nor a vertex of both triangles * (with the same point ids, ignoring the orientation for an edge). * - * A triangle soup self-intersects if at least two triangles of the soup intersect. - * Two triangles of the soup are considered to intersect if the geometric triangles are not disjoint - * and the intersection is not a restricted to the same point (i.e. with the same id) or to a triangle edge - * (i.e. with the same ids, the edge orientation being ignored). - * - * This function depends on the package \ref PkgBoxIntersectionD + * This function depends on the package \ref PkgBoxIntersectionD. * * @tparam ConcurrencyTag enables sequential versus parallel algorithm. * Possible values are `Sequential_tag`, `Parallel_tag`, and `Parallel_if_available_tag`. @@ -818,19 +813,18 @@ struct Property_map_for_soup * `std::pair` * @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters" * - * @param points points of the soup of polygons + * @param points points of the soup of triangles * @param triangles each element in the range describes a triangle using the indices of the points in `points` * @param out output iterator to be filled with all pairs of ids of triangles intersecting (the id of a triangle is its position in `triangles`). - * In case the triangle soup contains some degenerate faces, for each degenerate face `t` with id `i` a pair `(i,i)` - * will be put in `out` before any other self intersection between non-degenerate faces. - * These are the only pairs where degenerate faces will be reported. + * In case the triangle soup contains some degenerate triangles, for each degenerate triangle `t` with id `i` a pair `(i,i)` + * will be put in `out` before any other self intersection between non-degenerate triangles. + * These are the only pairs where degenerate triangles will be reported. * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below * * \cgalNamedParamsBegin * \cgalParamNBegin{point_map} * \cgalParamDescription{a property map associating points to the elements of the range `points`} - * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type convertible to the point type - * of the vertex point map associated to the polygon mesh} + * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type from a \cgal Kernel.} * \cgalParamDefault{`CGAL::Identity_property_map`} * \cgalParamNEnd * @@ -842,9 +836,11 @@ struct Property_map_for_soup * \cgalParamNEnd * \cgalNamedParamsEnd * - * @return `true` if the triangle soup self-intersects, and `false` otherwise. + * @return `out` * * @sa `does_triangle_soup_self_intersect()` + * @sa `self_intersections()` + * @sa `does_self_intersect()` */ template Date: Thu, 6 Apr 2023 15:39:54 +0200 Subject: [PATCH 42/52] fix after Andreas' review --- .../Polygon_mesh_processing/self_intersections.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index 3a368e73459..88fe5369daa 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -519,7 +519,7 @@ self_intersections_impl(const FaceRange& face_range, * * collects intersections between a subset of faces of a triangulated surface mesh. * Two faces are said to intersect if the corresponding triangles intersect - * and the intersection is not an edge nor a vertex incident to both faces. + * and the intersection is neither an edge nor a vertex incident to both faces. * * This function depends on the package \ref PkgBoxIntersectionD. * @@ -586,7 +586,7 @@ self_intersections(const FaceRange& face_range, * * collects intersections between all the faces of a triangulated surface mesh. * Two faces are said to intersect if the corresponding triangles intersect - * and the intersection is not an edge nor a vertex incident to both faces. + * and the intersection is neither an edge nor a vertex incident to both faces. * * This function depends on the package \ref PkgBoxIntersectionD. * @@ -798,7 +798,7 @@ struct Property_map_for_soup * collects intersections between all the triangles in a triangle soup. * * Two triangles of the soup are said to intersect if the corresponding geometric triangles intersect - * and the intersection is not an edge nor a vertex of both triangles + * and the intersection is neither an edge nor a vertex of both triangles * (with the same point ids, ignoring the orientation for an edge). * * This function depends on the package \ref PkgBoxIntersectionD. @@ -824,7 +824,7 @@ struct Property_map_for_soup * \cgalNamedParamsBegin * \cgalParamNBegin{point_map} * \cgalParamDescription{a property map associating points to the elements of the range `points`} - * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type from a \cgal Kernel.} + * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type from a \cgal `Kernel`.} * \cgalParamDefault{`CGAL::Identity_property_map`} * \cgalParamNEnd * @@ -876,7 +876,7 @@ triangle_soup_self_intersections(const PointRange& points, * * A triangle soup self-intersects if at least two triangles of the soup intersect. * Two triangles of the soup are said to intersect if the corresponding geometric triangles intersect - * and the intersection is not an edge nor a vertex of both triangles + * and the intersection is neither an edge nor a vertex of both triangles * (with the same point ids, ignoring the orientation for an edge). * * This function depends on the package \ref PkgBoxIntersectionD. @@ -896,7 +896,7 @@ triangle_soup_self_intersections(const PointRange& points, * \cgalNamedParamsBegin * \cgalParamNBegin{point_map} * \cgalParamDescription{a property map associating points to the elements of the range `points`} - * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type from a \cgal Kernel.} + * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type from a \cgal `Kernel`.} * \cgalParamDefault{`CGAL::Identity_property_map`} * \cgalParamNEnd * From 89859163826505fff38e225be36912004cf0e07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 6 Apr 2023 17:05:10 +0200 Subject: [PATCH 43/52] add note --- .../CGAL/Polygon_mesh_processing/self_intersections.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index 88fe5369daa..01cf832155b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -602,8 +602,8 @@ self_intersections(const FaceRange& face_range, * @param tmesh the triangulated surface mesh to be checked * @param out output iterator to be filled with all pairs of non-adjacent faces that intersect. * In case `tmesh` contains some degenerate faces, for each degenerate face `f` a pair `(f,f)` - * will be put in `out` before any other self intersection between non-degenerate faces. - * These are the only pairs where degenerate faces will be reported. + * will be put in `out` before any other self intersection between non-degenerate faces.
+ * Note that these are the only pairs where degenerate faces will be reported. * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below * * \cgalNamedParamsBegin @@ -817,8 +817,8 @@ struct Property_map_for_soup * @param triangles each element in the range describes a triangle using the indices of the points in `points` * @param out output iterator to be filled with all pairs of ids of triangles intersecting (the id of a triangle is its position in `triangles`). * In case the triangle soup contains some degenerate triangles, for each degenerate triangle `t` with id `i` a pair `(i,i)` - * will be put in `out` before any other self intersection between non-degenerate triangles. - * These are the only pairs where degenerate triangles will be reported. + * will be put in `out` before any other self intersection between non-degenerate triangles.
+ * Note that these are the only pairs where degenerate triangles will be reported. * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below * * \cgalNamedParamsBegin From 28c97d293fe7a855aad5441bbeef490b7abc71c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 11 Apr 2023 09:25:29 +0200 Subject: [PATCH 44/52] fix warnings --- BGL/include/CGAL/boost/graph/named_params_helper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h index f5b8c44df82..1e0efd6faa6 100644 --- a/BGL/include/CGAL/boost/graph/named_params_helper.h +++ b/BGL/include/CGAL/boost/graph/named_params_helper.h @@ -141,14 +141,14 @@ struct GetVertexPointMap_impl template static const_type - get_const_map(const NamedParameters& np, const PolygonMesh& pm) + get_const_map(const NamedParameters& /* np */, const PolygonMesh& pm) { return get_const_property_map(boost::vertex_point, pm); } template static type - get_map(const NamedParameters& np, PolygonMesh& pm) + get_map(const NamedParameters& /* np */, PolygonMesh& pm) { return get_property_map(boost::vertex_point, pm); } From a361f79e1f29a24b5f905c9b6e2e95af33d598e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 12 Apr 2023 16:21:26 +0200 Subject: [PATCH 45/52] add missing parameter --- .../self_intersections.h | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index 01cf832155b..3524b46c775 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -822,6 +822,14 @@ struct Property_map_for_soup * @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below * * \cgalNamedParamsBegin + * \cgalParamNBegin{maximum_number} + * \cgalParamDescription{the maximum number of self intersections that will be detected and returned by the function.} + * \cgalParamType{unsigned int} + * \cgalParamDefault{No limit.} + * \cgalParamExtra{In parallel mode, the number of returned self-intersections is at least `maximum_number` + * (and not exactly that number) as no strong synchronization is put on threads for performance reasons.} + * \cgalParamNEnd + * * \cgalParamNBegin{point_map} * \cgalParamDescription{a property map associating points to the elements of the range `points`} * \cgalParamType{a model of `ReadablePropertyMap` whose value type is a point type from a \cgal `Kernel`.} @@ -855,6 +863,7 @@ triangle_soup_self_intersections(const PointRange& points, { using parameters::choose_parameter; using parameters::get_parameter; + using parameters::is_default_parameter; typedef typename CGAL::GetPointMap::const_type Point_map_base; Point_map_base pm_base = choose_parameter(get_parameter(np, internal_np::point_map)); @@ -862,6 +871,17 @@ triangle_soup_self_intersections(const PointRange& points, typedef typename GetPolygonSoupGeomTraits::type GT; GT gt = choose_parameter(get_parameter(np, internal_np::geom_traits)); + const bool do_limit = !(is_default_parameter::value); + if (do_limit) + { + return self_intersections(boost::irange(0, triangles.size()), + std::make_pair(std::cref(points), std::cref(triangles)), + out, + parameters::vertex_point_map(Point_map(points,pm_base)). + geom_traits(gt). + maximum_number(choose_parameter(get_parameter(np, internal_np::maximum_number), 0))); + } + return self_intersections(boost::irange(0, triangles.size()), std::make_pair(std::cref(points), std::cref(triangles)), out, From b123ccf125367c34150f2a84a0d990be469c29aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 12 Apr 2023 16:21:42 +0200 Subject: [PATCH 46/52] copy mesh test for soup --- .../Polygon_mesh_processing/CMakeLists.txt | 1 + .../self_intersection_triangle_soup_test.cpp | 190 ++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt index d3fc45f270e..3752a6cacd1 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt @@ -21,6 +21,7 @@ create_single_source_cgal_program("point_inside_surface_mesh_test.cpp") create_single_source_cgal_program("polygon_mesh_slicer_test.cpp") create_single_source_cgal_program("self_intersection_polyhedron_test.cpp") create_single_source_cgal_program("self_intersection_surface_mesh_test.cpp") +create_single_source_cgal_program("self_intersection_triangle_soup_test.cpp") create_single_source_cgal_program("pmp_do_intersect_test.cpp") create_single_source_cgal_program("test_is_polygon_soup_a_polygon_mesh.cpp") create_single_source_cgal_program("test_stitching.cpp") diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp new file mode 100644 index 00000000000..a6c88d934cc --- /dev/null +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp @@ -0,0 +1,190 @@ +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +typedef CGAL::Exact_predicates_inexact_constructions_kernel EPICK; +typedef CGAL::Exact_predicates_exact_constructions_kernel EPECK; + +namespace PMP = ::CGAL::Polygon_mesh_processing; +namespace CP = ::CGAL::parameters; + +template +int test_self_intersections(const std::string filename, + const bool expected) +{ + std::vector points; + std::vector< std::array > triangles; + + bool read_ok = CGAL::IO::read_polygon_soup(filename, points, triangles); + + if ( !read_ok ) { + std::cerr << "Error: cannot read file: " << filename << std::endl; + return 1; + } + + std::cout << "Reading file: " << filename << std::endl; + + CGAL::Timer timer; + timer.start(); + + std::vector > intersected_tris; + + PMP::triangle_soup_self_intersections(points, triangles, std::back_inserter(intersected_tris)); + bool intersecting_1 = !intersected_tris.empty(); + + std::cout << "self_intersections test took " << timer.time() << " sec." << std::endl; + std::cout << intersected_tris.size() << " pairs of triangles are intersecting." << std::endl; + + timer.reset(); + + bool intersecting_2 = + PMP::does_triangle_soup_self_intersect(points, triangles); + + std::cout << "does_self_intersect test took " << timer.time() << " sec." << std::endl; + std::cout << (intersecting_2 ? "There is a self-intersection." : + "There are no self-intersections.") << std::endl; + + assert(intersecting_1 == intersecting_2); + assert(intersecting_1 == expected); + + std::cout << filename << " passed the tests." << std::endl << std::endl; + + return 0; +} + +template +int test_limited_self_intersections(const std::string& filename) +{ + std::vector points; + std::vector< std::array > triangles; + + bool read_ok = CGAL::IO::read_polygon_soup(filename, points, triangles); + + if ( !read_ok ) { + std::cerr << "Error: cannot read file: " << filename << std::endl; + return 1; + } + + CGAL::Timer timer; + timer.start(); + + std::vector > intersected_tris; + +#ifdef CGAL_LINKED_WITH_TBB + PMP::triangle_soup_self_intersections()( + points, triangles, + std::back_inserter(intersected_tris), CGAL::parameters::maximum_number(40)); + std::cout << "self_intersections test for 40 SI took " << timer.time() << " sec." << std::endl; + std::cout << "Found " << intersected_tris.size() << " SIs." << std::endl; + if(intersected_tris.size() < 40) + { + std::cerr<<"Not enough intersections found in parallel."<( + points, triangles, + std::back_inserter(intersected_tris), CGAL::parameters::maximum_number(40)); + std::cout << "self_intersections test for 40 SI took " << timer.time() << " sec." << std::endl; + timer.reset(); + if(intersected_tris.size() != 40) + { + std::cerr<<"Too many intersections found in sequential"< self_intersection_surface_mesh_test data/U.off false + + // First test ---------------------------------------------------------------- + bool expected = false; + std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("meshes/elephant.off"); + if(argc > 1) { + assert(argc > 2); + std::stringstream ss(argv[2]); + ss >> std::boolalpha >> expected; + assert(!ss.fail()); // make sure that argv[2] is either 'true' or 'false' + } + + std::cout << "First test (EPICK):" << std::endl; + int r = test_self_intersections(filename, expected); + + std::cout << "First test (EPECK):" << std::endl; + r += test_self_intersections(filename, expected); + + // Second test --------------------------------------------------------------- + expected = true; + filename = (argc > 3) ? argv[3] : CGAL::data_file_path("meshes/mannequin-devil.off"); + if(argc > 3) { + assert(argc > 4); + std::stringstream ss(argv[4]); + ss >> std::boolalpha >> expected; + assert(!ss.fail()); + } + + std::cout << "Second test (EPICK):" << std::endl; + r += test_self_intersections(filename, expected); + + std::cout << "Second test (EPECK):" << std::endl; + r += test_self_intersections(filename, expected); + + // Third test ---------------------------------------------------------------- + expected = true; + filename = (argc > 5) ? argv[5] : "data/overlapping_triangles.off"; + if(argc > 5) { + assert(argc > 6); + std::stringstream ss(argv[6]); + ss >> std::boolalpha >> expected; + assert(!ss.fail()); + } + + std::cout << "Third test (EPICK):" << std::endl; + r += test_self_intersections(filename, expected); + + std::cout << "Third test (EPECK):" << std::endl; + r += test_self_intersections(filename, expected); + + // Fourth test ---------------------------------------------------------------- + expected = true; + filename = (argc > 7) ? argv[7] : "data_degeneracies/degtri_single.off"; + if(argc > 7) { + assert(argc > 8); + std::stringstream ss(argv[8]); + ss >> std::boolalpha >> expected; + assert(!ss.fail()); + } + + std::cout << "Fourth test (EPICK):" << std::endl; + r += test_self_intersections(filename, expected); + + std::cout << "Fourth test (EPECK):" << std::endl; + r += test_self_intersections(filename, expected); + + filename = (argc > 9) ? argv[9] : CGAL::data_file_path("meshes/mannequin-devil.off"); + + std::cout << "Test with maximum_number (EPICK):" << std::endl; + r += test_limited_self_intersections(filename); + + std::cout << "Test with maximum_number (EPECK):" << std::endl; + r += test_limited_self_intersections(filename); + + return r; +} From 23932583700deab21752ce8aec9cbc1cebe38290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 12 Apr 2023 16:59:05 +0200 Subject: [PATCH 47/52] add triangle soup specific tests --- .../self_intersection_triangle_soup_test.cpp | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp index a6c88d934cc..e067e13c129 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp @@ -186,5 +186,49 @@ int main(int argc, char** argv) std::cout << "Test with maximum_number (EPECK):" << std::endl; r += test_limited_self_intersections(filename); + // extra hand written tests + { + // shared edge with same point: no self-intersection + typedef EPICK::Point_3 Point_3; + std::vector points = {Point_3(0,0,0), Point_3(1,0,0), Point_3(0,1,0), Point_3(0,-1,0)}; + std::vector< std::array > triangles={{0,1,2}, {0,1,3}}; + assert(!PMP::does_triangle_soup_self_intersect(points, triangles)); + } + { + // shared edge with duplicated points: self-intersection + typedef EPICK::Point_3 Point_3; + std::vector points = {Point_3(0,0,0), Point_3(1,0,0), Point_3(0,1,0),Point_3(0,0,0), Point_3(1,0,0), Point_3(0,-1,0)}; + std::vector< std::array > triangles={{0,1,2}, {3,4,5}}; + assert(PMP::does_triangle_soup_self_intersect(points, triangles)); + } + { + // shared vertex with same point: no self-intersection + typedef EPICK::Point_3 Point_3; + std::vector points = {Point_3(0,0,0), Point_3(1,0,0), Point_3(0,1,0), Point_3(0,2,0), Point_3(1,2,0)}; + std::vector< std::array > triangles={{0,1,2}, {3,4,2}}; + assert(!PMP::does_triangle_soup_self_intersect(points, triangles)); + } + { + // shared vertex with duplicated points: self-intersection + typedef EPICK::Point_3 Point_3; + std::vector points = {Point_3(0,0,0), Point_3(1,0,0), Point_3(0,1,0), Point_3(0,2,0), Point_3(1,2,0), Point_3(0,1,0)}; + std::vector< std::array > triangles={{0,1,2}, {3,4,5}}; + assert(PMP::does_triangle_soup_self_intersect(points, triangles)); + } + { + // 4 triangles around a shared edge: no self-intersection + typedef EPICK::Point_3 Point_3; + std::vector points = {Point_3(0,0,0), Point_3(1,0,0), Point_3(0,1,0), Point_3(0,-1,0), Point_3(0,0,1), Point_3(0,0,-1)}; + std::vector< std::array > triangles={{0,1,2},{0,1,3},{0,1,4},{0,1,5}}; + assert(!PMP::does_triangle_soup_self_intersect(points, triangles)); + } + { + // 4 triangles around a shared edge but two triangles intersecting: self-intersection + typedef EPICK::Point_3 Point_3; + std::vector points = {Point_3(0,0,0), Point_3(1,0,0), Point_3(0,1,0), Point_3(0,0.5,0), Point_3(0,0,1), Point_3(0,0,-1)}; + std::vector< std::array > triangles={{0,1,2},{0,1,3},{0,1,4},{0,1,5}}; + assert(PMP::does_triangle_soup_self_intersect(points, triangles)); + } + return r; } From 8fe0633fb5895d1fdc1fdd7bc99f3b7ed8439d2c Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 13 Apr 2023 15:44:21 +0200 Subject: [PATCH 48/52] add new possible gmp name for MSVC gmp-10 was compiled with vcpkg and installed on Christo --- Installation/test/Installation/test_gmp_mpfr_dll.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Installation/test/Installation/test_gmp_mpfr_dll.cpp b/Installation/test/Installation/test_gmp_mpfr_dll.cpp index 3f407098996..fbc511c3889 100644 --- a/Installation/test/Installation/test_gmp_mpfr_dll.cpp +++ b/Installation/test/Installation/test_gmp_mpfr_dll.cpp @@ -8,6 +8,7 @@ int main() { #define GMP_SONAME "libgmp-10" #define MPFR_SONAME "libmpfr-4" #define GMP_SONAME_BACKUP "gmp" +#define GMP_SONAME_BACKUP_2 "gmp-10" #define MPFR_SONAME_BACKUP "mpfr-6" #define GMP_MAJOR 5 #define MPFR_MAJOR 3 @@ -66,7 +67,9 @@ int main() { int major, minor, patch, build; if(!get_version_info(GMP_SONAME, major, minor, patch, build)) { if(!get_version_info(GMP_SONAME_BACKUP, major, minor, patch, build)) { - return 1; + if (!get_version_info(GMP_SONAME_BACKUP_2, major, minor, patch, build)) { + return 1; + } } } From 3c6a4c16c4b4e92e77884485ffb6e8986e1e5d6a Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 13 Apr 2023 15:58:49 +0200 Subject: [PATCH 49/52] add debug info for the testsuite --- Installation/test/Installation/test_gmp_mpfr_dll.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Installation/test/Installation/test_gmp_mpfr_dll.cpp b/Installation/test/Installation/test_gmp_mpfr_dll.cpp index fbc511c3889..67ed1e76ee4 100644 --- a/Installation/test/Installation/test_gmp_mpfr_dll.cpp +++ b/Installation/test/Installation/test_gmp_mpfr_dll.cpp @@ -42,6 +42,12 @@ bool get_version_info(const LPCTSTR name, std::cerr << "Query FileVersion of \"" << fileName << "\"\n"; DWORD handle = 0; size = GetFileVersionInfoSize(fileName, &handle); + + DWORD err = GetLastError(); + if (size == 0) { + std::cerr << "GetFileVersionInfoSize failed with error " << err << std::endl; + } + BYTE* versionInfo = new BYTE[size]; if (!GetFileVersionInfo(fileName, handle, size, versionInfo)) { From 37c0b5eaa60558e5b4516608851ef0970fa4e176 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 13 Apr 2023 16:14:19 +0200 Subject: [PATCH 50/52] add gmp-10 as a hint for findGMP and add GMP_DIR and MPFR_DIR as hints to find all includes and libs --- Installation/cmake/modules/FindGMP.cmake | 7 +++++-- Installation/cmake/modules/FindMPFR.cmake | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake index 3a1d355d41f..f452c0287f7 100644 --- a/Installation/cmake/modules/FindGMP.cmake +++ b/Installation/cmake/modules/FindGMP.cmake @@ -26,22 +26,25 @@ if( NOT GMP_in_cache ) NAMES gmp.h HINTS ENV GMP_INC_DIR ENV GMP_DIR + $ENV{GMP_DIR}/include ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include PATH_SUFFIXES include DOC "The directory containing the GMP header files" ) - find_library(GMP_LIBRARY_RELEASE NAMES gmp libgmp-10 mpir + find_library(GMP_LIBRARY_RELEASE NAMES gmp libgmp-10 gmp-10 mpir HINTS ENV GMP_LIB_DIR ENV GMP_DIR + $ENV{GMP_DIR}/lib ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/lib PATH_SUFFIXES lib DOC "Path to the Release GMP library" ) - find_library(GMP_LIBRARY_DEBUG NAMES gmpd gmp libgmp-10 mpir + find_library(GMP_LIBRARY_DEBUG NAMES gmpd gmp libgmp-10 gmp-10 mpir HINTS ENV GMP_LIB_DIR ENV GMP_DIR + $ENV{GMP_DIR}/include ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/lib PATH_SUFFIXES lib DOC "Path to the Debug GMP library" diff --git a/Installation/cmake/modules/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake index b21fb1f678e..4d1bc43553d 100644 --- a/Installation/cmake/modules/FindMPFR.cmake +++ b/Installation/cmake/modules/FindMPFR.cmake @@ -25,6 +25,7 @@ if (NOT MPFR_in_cache) NAMES mpfr.h HINTS ENV MPFR_INC_DIR ENV MPFR_DIR + $ENV{MPFR_DIR}/include ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include PATH_SUFFIXES include DOC "The directory containing the MPFR header files" @@ -33,6 +34,7 @@ if (NOT MPFR_in_cache) find_library(MPFR_LIBRARIES NAMES mpfr libmpfr-4 libmpfr-1 HINTS ENV MPFR_LIB_DIR ENV MPFR_DIR + $ENV{MPFR_DIR}/lib ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/lib PATH_SUFFIXES lib DOC "Path to the MPFR library" From 3077d8b6572bd1d540b9519aae3842c450f16127 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 13 Apr 2023 16:33:20 +0200 Subject: [PATCH 51/52] remove useless definitions --- Installation/test/Installation/test_gmp_mpfr_dll.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Installation/test/Installation/test_gmp_mpfr_dll.cpp b/Installation/test/Installation/test_gmp_mpfr_dll.cpp index 67ed1e76ee4..e7ccd4307d2 100644 --- a/Installation/test/Installation/test_gmp_mpfr_dll.cpp +++ b/Installation/test/Installation/test_gmp_mpfr_dll.cpp @@ -10,9 +10,6 @@ int main() { #define GMP_SONAME_BACKUP "gmp" #define GMP_SONAME_BACKUP_2 "gmp-10" #define MPFR_SONAME_BACKUP "mpfr-6" -#define GMP_MAJOR 5 -#define MPFR_MAJOR 3 - #include #include From d4b5fec0a673a6c717a7d1d428f9beadc9539bfe Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 13 Apr 2023 16:40:15 +0200 Subject: [PATCH 52/52] be verbose when loading succeeded --- Installation/test/Installation/test_gmp_mpfr_dll.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Installation/test/Installation/test_gmp_mpfr_dll.cpp b/Installation/test/Installation/test_gmp_mpfr_dll.cpp index e7ccd4307d2..17ec0939d6a 100644 --- a/Installation/test/Installation/test_gmp_mpfr_dll.cpp +++ b/Installation/test/Installation/test_gmp_mpfr_dll.cpp @@ -33,6 +33,9 @@ bool get_version_info(const LPCTSTR name, std::cerr << name << " is not loaded!\n"; return false; } + else + std::cerr << name << " is loaded.\n"; + char fileName[_MAX_PATH]; DWORD size = GetModuleFileName(g_dllHandle, fileName, _MAX_PATH); fileName[size] = NULL;