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

be more permissive and allow duplicated points

This commit is contained in:
Sébastien Loriot 2025-05-13 14:49:46 +02:00
parent 2887ee0a36
commit 2d1a77cd67
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_self_intersections.h
View File

@ -19,6 +19,9 @@
#include <CGAL/Polygon_mesh_processing/self_intersections.h> #include <CGAL/Polygon_mesh_processing/self_intersections.h>
#include <CGAL/Polygon_mesh_processing/triangulate_faces.h> #include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
#include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
#include <boost/iterator/transform_iterator.hpp>
namespace CGAL::Polygon_mesh_processing { namespace CGAL::Polygon_mesh_processing {
@ -27,16 +30,28 @@ template <class ConcurrencyTag = Sequential_tag,
class PolygonRange, class PolygonRange,
class CGAL_NP_TEMPLATE_PARAMETERS> class CGAL_NP_TEMPLATE_PARAMETERS>
bool does_polygon_soup_self_intersect(const PointRange& points, bool does_polygon_soup_self_intersect(const PointRange& points,
const PolygonRange& polygons, PolygonRange polygons,
const CGAL_NP_CLASS& np = parameters::default_values()) const CGAL_NP_CLASS& np = parameters::default_values())
{ {
//let's be a bit more permissive and allow duplicated vertices
auto pm = parameters::choose_parameter<typename GetPointMap<PointRange, CGAL_NP_CLASS>::const_type>(parameters::get_parameter(np, internal_np::point_map));
using Point_3 = typename boost::property_traits<decltype(pm)>::value_type;
using PointRange_const_iterator = typename PointRange::const_iterator;
using PointRange_value_type = typename std::iterator_traits<PointRange_const_iterator>::value_type;
auto to_point =[pm](const PointRange_value_type& v) { return get(pm, v); };
std::vector<Point_3> unique_points(boost::make_transform_iterator(points.begin(), to_point),
boost::make_transform_iterator(points.end(), to_point));
merge_duplicate_points_in_polygon_soup(unique_points, polygons);
bool is_pure_triangles = std::all_of(polygons.begin(), polygons.end(), bool is_pure_triangles = std::all_of(polygons.begin(), polygons.end(),
[](const auto&f) { return f.size() == 3; }); [](const auto&f) { return f.size() == 3; });
if(is_pure_triangles) if(is_pure_triangles)
{ {
// if the polygon soup is pure triangles, // if the polygon soup is pure triangles,
// we can use the triangle soup self-intersection function // we can use the triangle soup self-intersection function
return does_triangle_soup_self_intersect<ConcurrencyTag>(points, polygons, np); return does_triangle_soup_self_intersect<ConcurrencyTag>(unique_points, polygons);
} }
// otherwise, we need to triangulate the polygons beforehand // otherwise, we need to triangulate the polygons beforehand
@ -53,7 +68,7 @@ bool does_polygon_soup_self_intersect(const PointRange& points,
if (!OK) return false; if (!OK) return false;
return does_triangle_soup_self_intersect<ConcurrencyTag>(points, triangles, np); return does_triangle_soup_self_intersect<ConcurrencyTag>(unique_points, triangles, np);
} }
} // namespace CGAL::Polygon_mesh_processing } // namespace CGAL::Polygon_mesh_processing