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

Merge pull request #4178 from janetournois/PMP-fix_isotropic_remeshing_degenerate_flip-jtournois 

`PMP::isotropic_remeshing()` - prevent creating non-manifold configurations
This commit is contained in:
Sebastien Loriot 2019-08-29 07:32:44 +02:00 committed by GitHub
parent ce82120d61 77c8e68e07
commit aa3b75a596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
View File

@ -787,8 +787,8 @@ namespace internal {
//fix constrained case //fix constrained case
CGAL_assertion((is_constrained(vkept) || is_corner(vkept) || is_on_patch_border(vkept)) == CGAL_assertion((is_constrained(vkept) || is_corner(vkept) || is_on_patch_border(vkept)) ==
(is_va_constrained || is_vb_constrained || is_va_on_constrained_polyline || is_vb_on_constrained_polyline)); (is_va_constrained || is_vb_constrained || is_va_on_constrained_polyline || is_vb_on_constrained_polyline));
fix_degenerate_faces(vkept, short_edges, sq_low, collapse_constraints); if (fix_degenerate_faces(vkept, short_edges, sq_low, collapse_constraints))
{
#ifdef CGAL_PMP_REMESHING_DEBUG #ifdef CGAL_PMP_REMESHING_DEBUG
debug_status_map(); debug_status_map();
CGAL_assertion(!incident_to_degenerate(halfedge(vkept, mesh_))); CGAL_assertion(!incident_to_degenerate(halfedge(vkept, mesh_)));
@ -801,6 +801,7 @@ namespace internal {
if ((sqlen < sq_low) && is_collapse_allowed(edge(ht, mesh_), collapse_constraints)) if ((sqlen < sq_low) && is_collapse_allowed(edge(ht, mesh_), collapse_constraints))
short_edges.insert(short_edge(ht, sqlen)); short_edges.insert(short_edge(ht, sqlen));
} }
}
}//end if(collapse_ok) }//end if(collapse_ok)
} }
@ -1599,7 +1600,7 @@ private:
} }
template<typename Bimap> template<typename Bimap>
void fix_degenerate_faces(const vertex_descriptor& v, bool fix_degenerate_faces(const vertex_descriptor& v,
Bimap& short_edges, Bimap& short_edges,
const double& sq_low, const double& sq_low,
const bool collapse_constraints) const bool collapse_constraints)
@ -1617,6 +1618,10 @@ private:
degenerate_faces.insert(h); degenerate_faces.insert(h);
} }
if(degenerate_faces.empty())
return true;
bool done = false;
while(!degenerate_faces.empty()) while(!degenerate_faces.empty())
{ {
halfedge_descriptor h = *(degenerate_faces.begin()); halfedge_descriptor h = *(degenerate_faces.begin());
@ -1653,10 +1658,15 @@ private:
short_edges.left.erase(hf); short_edges.left.erase(hf);
short_edges.left.erase(hfo); short_edges.left.erase(hfo);
CGAL_assertion( is_flip_topologically_allowed(edge(hf, mesh_)) );
CGAL_assertion( !get(ecmap_, edge(hf, mesh_)) ); CGAL_assertion( !get(ecmap_, edge(hf, mesh_)) );
if (!is_flip_topologically_allowed(edge(hf, mesh_)))
continue;
CGAL::Euler::flip_edge(hf, mesh_); CGAL::Euler::flip_edge(hf, mesh_);
CGAL_assertion_code(++nb_done); CGAL_assertion_code(++nb_done);
done = true;
//update status //update status
set_status(h_ab, merge_status(h_ab, hf, hfo)); set_status(h_ab, merge_status(h_ab, hf, hfo));
@ -1696,6 +1706,7 @@ private:
#ifdef CGAL_PMP_REMESHING_DEBUG #ifdef CGAL_PMP_REMESHING_DEBUG
debug_status_map(); debug_status_map();
#endif #endif
return done;
} }
bool incident_to_degenerate(const halfedge_descriptor& he) bool incident_to_degenerate(const halfedge_descriptor& he)