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

fixes

This commit is contained in:
Andreas Fabri 2019-11-07 21:26:53 +01:00
parent 21bd1af505
commit e18413c9b5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
View File

@ -122,13 +122,18 @@ struct Intersect_facets
if(face(opp_h, m_tmesh) == c->info()){
// there is an intersection if the four points are coplanar and
// the triangles overlap
get(m_vpmap, hv[i]);
get(m_vpmap, hv[(i + 1) % 3]);
get(m_vpmap, hv[(i + 2) % 3]);
get(m_vpmap, target(next(opp_h, m_tmesh), m_tmesh));
if(CGAL::coplanar(get(m_vpmap, hv[i]),
get(m_vpmap, hv[(i+1)&3]),
get(m_vpmap, hv[(i+2)&3]),
get(m_vpmap, hv[(i+1)%3]),
get(m_vpmap, hv[(i+2)%3]),
get(m_vpmap, target(next(opp_h, m_tmesh), m_tmesh))) &&
CGAL::coplanar_orientation(get(m_vpmap, hv[(i+2)&3]),
CGAL::coplanar_orientation(get(m_vpmap, hv[(i+2)%3]),
get(m_vpmap, hv[i]),
get(m_vpmap, hv[(i+1)&3]),
get(m_vpmap, hv[(i+1)%3]),
get(m_vpmap, target(next(opp_h, m_tmesh), m_tmesh)))
== CGAL::POSITIVE){
*m_iterator_wrapper++ = std::make_pair(b->info(), c->info());
@ -152,14 +157,14 @@ struct Intersect_facets
shared = true;
break;
}
if(shared){
break;
}
}
if (shared) {
break;
}
}
if(shared){
// found shared vertex:
CGAL_assertion(target(h,m_tmesh) == target(v,m_tmesh));
assert(hv[i] == gv[j]);
// geometric check if the opposite segments intersect the triangles
Triangle t1 = triangle_functor( get(m_vpmap, hv[0]),
get(m_vpmap, hv[1]),
@ -168,10 +173,10 @@ struct Intersect_facets
get(m_vpmap, gv[1]),
get(m_vpmap, gv[2]));
Segment s1 = segment_functor( get(m_vpmap, hv[(i+1)&3]),
get(m_vpmap, hv[(i+2)&3]) );
Segment s2 = segment_functor( get(m_vpmap, gv[(j+1)&3]),
get(m_vpmap, gv[(j+2)&3]));
Segment s1 = segment_functor( get(m_vpmap, hv[(i+1)%3]),
get(m_vpmap, hv[(i+2)%3]) );
Segment s2 = segment_functor( get(m_vpmap, gv[(j+1)%3]),
get(m_vpmap, gv[(j+2)%3]));
if(do_intersect_3_functor(t1,s2)){
*m_iterator_wrapper++ = std::make_pair(b->info(), c->info());