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

Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch'

This commit is contained in:
Sébastien Loriot 2018-10-30 16:06:22 +01:00
parent 9eb521d4d7 bb7be574a5
commit a7f08e5172
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
View File

@ -29,6 +29,7 @@
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Polygon_mesh_processing/bbox.h>
#include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
#include <CGAL/Polygon_mesh_processing/orientation.h>
#include <CGAL/AABB_triangle_primitive.h>
@ -77,6 +78,10 @@ clip_open_impl( TriangleMesh& tm,
Clipper_tree clipper_tree(clipper_triangles.begin(), clipper_triangles.end());
// predicate functor
Side_of_triangle_mesh<TriangleMesh, GeomTraits, Vpm, Clipper_tree> side_of(clipper_tree);
const bool clipper_outward_oriented =
CGAL::Polygon_mesh_processing::is_outward_oriented(clipper, np_c);
const CGAL::Bounded_side REGION_TO_REMOVE = clipper_outward_oriented
? ON_UNBOUNDED_SIDE:ON_BOUNDED_SIDE;
// Second corefine the meshes
typedef CGAL::dynamic_edge_property_t<bool> Ecm_tag;
@ -131,7 +136,7 @@ clip_open_impl( TriangleMesh& tm,
break;
}
if (no_marked_edge){
if ( side_of( get(vpm1, target(h, tm) ) ) == ON_UNBOUNDED_SIDE )
if ( side_of( get(vpm1, target(h, tm) ) ) == REGION_TO_REMOVE )
ccs_to_remove.push_back(cc_id);
cc_not_handled.reset(cc_id);
break;
@ -143,7 +148,7 @@ clip_open_impl( TriangleMesh& tm,
if (cc_not_handled.any())
{
// A patch without no vertex incident to a non-constrained edges
// A patch with no vertex incident to a non-constrained edges
// is a coplanar patch: drop it or keep it!
if (!boost::choose_param(boost::get_param(np_tm, internal_np::use_compact_clipper), true))
{