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

fix collapsibility test, and reorder things dealing with the tags 

collapse on face range border was broken
This commit is contained in:
Jane Tournois 2015-09-15 14:57:35 +02:00
parent 549266bb8a
commit a0ba10438e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/remesh_impl.h
View File

@ -500,6 +500,7 @@ namespace internal {
}
//before collapse
bool mesh_border_case = is_on_border(opposite(he, mesh_));
halfedge_descriptor ep_p = prev(opposite(he, mesh_), mesh_);
halfedge_descriptor epo_p = opposite(ep_p, mesh_);
halfedge_descriptor en = next(he, mesh_);
@ -509,18 +510,17 @@ namespace internal {
Halfedge_status s_ep = status(prev(he, mesh_));
Halfedge_status s_epo = status(opposite(prev(he, mesh_), mesh_));
bool mesh_border_case = is_on_border(opposite(he, mesh_));
if (!mesh_border_case)
halfedge_and_opp_removed(prev(opposite(he, mesh_), mesh_));
halfedge_and_opp_removed(he);
halfedge_and_opp_removed(prev(he, mesh_));
// merge halfedge_status to keep the more important on both sides
//do it before collapse is performed to be sure everything is valid
merge_status(en, s_epo, s_ep);
if (!mesh_border_case)
merge_status(en_p, s_epo_p, s_ep_p);
if (!mesh_border_case)
halfedge_and_opp_removed(prev(opposite(he, mesh_), mesh_));
halfedge_and_opp_removed(he);
halfedge_and_opp_removed(prev(he, mesh_));
//perform collapse
Point target_point = get(vpmap_, vb);
vertex_descriptor vkept = CGAL::Euler::collapse_edge(edge(he, mesh_), mesh_);
@ -866,12 +866,16 @@ namespace internal {
halfedge_descriptor he = halfedge(e, mesh_);
halfedge_descriptor hopp = opposite(he, mesh_);
if (is_on_patch(he)) //hopp is also on patch
return true;
if (!is_on_patch(he)) //hopp is also on patch
return false;
else if (is_on_patch_border(next(he, mesh_)) && is_on_patch_border(prev(he, mesh_)))
return false;//too many cases to be handled
else if (is_on_patch_border(next(hopp, mesh_)) && is_on_patch_border(prev(hopp, mesh_)))
return false;//too many cases to be handled
else if (is_on_patch_border(he) || is_on_patch_border(hopp))
return !protect_constraints_;//allowed only when no protection
else
return false;
return true;
}
bool collapse_does_not_invert_face(const halfedge_descriptor& h) const