mirror of https://github.com/CGAL/cgal
Merge remote-tracking branch 'cgal/5.5.x-branch'
This commit is contained in:
commit
15a8dbf7d9
|
|
@ -1150,6 +1150,9 @@ bool adapt_patch(std::vector<std::vector<Point> >& point_patch,
|
||||||
put(local_vpm, v, projector(get(local_vpm, v)));
|
put(local_vpm, v, projector(get(local_vpm, v)));
|
||||||
|
|
||||||
// The projector can create degenerate faces
|
// The projector can create degenerate faces
|
||||||
|
for (halfedge_descriptor h : border_hedges)
|
||||||
|
if (is_degenerate_triangle_face(face(opposite(h, local_mesh), local_mesh), local_mesh))
|
||||||
|
return !has_SI;
|
||||||
if(!remove_degenerate_faces(local_mesh))
|
if(!remove_degenerate_faces(local_mesh))
|
||||||
return !has_SI;
|
return !has_SI;
|
||||||
|
|
||||||
|
|
@ -2031,7 +2034,7 @@ remove_self_intersections_one_step(std::set<typename boost::graph_traits<Triangl
|
||||||
|
|
||||||
#ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_OUTPUT_INTERMEDIATE_FULL_MESH
|
#ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_OUTPUT_INTERMEDIATE_FULL_MESH
|
||||||
fname = "results/mesh_at_step_"+std::to_string(step)+"_CC_"+std::to_string(cc_id)+".off";
|
fname = "results/mesh_at_step_"+std::to_string(step)+"_CC_"+std::to_string(cc_id)+".off";
|
||||||
CGAL::IO::write_polygon_mesh(fname, tmesh, CGAL::parameters::stream_precision);
|
CGAL::IO::write_polygon_mesh(fname, tmesh, CGAL::parameters::stream_precision(17));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// expand the region to be filled
|
// expand the region to be filled
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue