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

Change Itag to No_constraints + try-catch

This commit is contained in:
Mael Rouxel-Labbé 2023-03-29 16:07:42 +02:00
parent c95cbe559e
commit eacbb7c94c
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Straight_skeleton_extrusion_2/include/CGAL/extrude_skeleton.h
View File

@ -296,7 +296,7 @@ class Extrusion_builder
using Vbb = CGAL::Triangulation_vertex_base_2<Geom_traits, Vb>; using Vbb = CGAL::Triangulation_vertex_base_2<Geom_traits, Vb>;
using Fb = CGAL::Constrained_triangulation_face_base_2<Geom_traits>; using Fb = CGAL::Constrained_triangulation_face_base_2<Geom_traits>;
using TDS = CGAL::Triangulation_data_structure_2<Vb,Fb>; using TDS = CGAL::Triangulation_data_structure_2<Vb,Fb>;
using Itag = CGAL::No_constraint_intersection_requiring_constructions_tag; using Itag = CGAL::No_constraint_intersection_tag;
using CDT = CGAL::Constrained_Delaunay_triangulation_2<Geom_traits, TDS, Itag>; using CDT = CGAL::Constrained_Delaunay_triangulation_2<Geom_traits, TDS, Itag>;
using CDT_Vertex_handle = typename CDT::Vertex_handle; using CDT_Vertex_handle = typename CDT::Vertex_handle;
using CDT_Face_handle = typename CDT::Face_handle; using CDT_Face_handle = typename CDT::Face_handle;
@ -341,9 +341,18 @@ public:
#endif #endif
CDT cdt; CDT cdt;
cdt.insert_constraint(p.outer_boundary().begin(), p.outer_boundary().end(), true /*close*/);
for(auto h_it=p.holes_begin(); h_it!=p.holes_end(); ++h_it) try
cdt.insert_constraint(h_it->begin(), h_it->end(), true /*close*/); {
cdt.insert_constraint(p.outer_boundary().begin(), p.outer_boundary().end(), true /*close*/);
for(auto h_it=p.holes_begin(); h_it!=p.holes_end(); ++h_it)
cdt.insert_constraint(h_it->begin(), h_it->end(), true /*close*/);
}
catch(const typename CDT::Intersection_of_constraints_exception& e)
{
std::cerr << "Warning: Failed to triangulate horizontal face" << std::endl;
return;
}
std::size_t id = points.size(); // point ID offset (previous faces inserted their points) std::size_t id = points.size(); // point ID offset (previous faces inserted their points)
for(CDT_Vertex_handle vh : cdt.finite_vertex_handles()) for(CDT_Vertex_handle vh : cdt.finite_vertex_handles())
@ -399,7 +408,16 @@ public:
const Vector_3 n = CGAL::cross_product(face_points[1] - face_points[0], face_points[2] - face_points[0]); const Vector_3 n = CGAL::cross_product(face_points[1] - face_points[0], face_points[2] - face_points[0]);
PK traits(n); PK traits(n);
PCDT pcdt(traits); PCDT pcdt(traits);
pcdt.insert_constraint(face_points.begin(), face_points.end(), true /*close*/);
try
{
pcdt.insert_constraint(face_points.begin(), face_points.end(), true /*close*/);
}
catch(const typename PCDT::Intersection_of_constraints_exception& e)
{
std::cerr << "Warning: Failed to triangulate skeleton face" << std::endl;
return;
}
std::size_t id = points.size(); // point ID offset (previous faces inserted their points); std::size_t id = points.size(); // point ID offset (previous faces inserted their points);
for(PCDT_Vertex_handle vh : pcdt.finite_vertex_handles()) for(PCDT_Vertex_handle vh : pcdt.finite_vertex_handles())