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

Merge pull request #6370 from MaelRL/PMP-Fix_NP_forwarding_in_degen_removal-GF 

Fix not using / forwarding traits
This commit is contained in:
Laurent Rineau 2022-03-09 11:35:20 +01:00
parent 48d61394d8 cc0f3493d5
commit 25b6d76737
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h
View File

@ -187,6 +187,7 @@ bool is_collapse_geometrically_valid(typename boost::graph_traits<TriangleMesh>:
}
*/
// @todo handle boundary edges
template <class TriangleMesh, typename VPM, typename Traits>
boost::optional<typename Traits::FT>
get_collapse_volume(typename boost::graph_traits<TriangleMesh>::halfedge_descriptor h,
@ -202,10 +203,10 @@ get_collapse_volume(typename boost::graph_traits<TriangleMesh>::halfedge_descrip
const typename Traits::Point_3 origin(ORIGIN);
// @todo handle boundary edges
h = opposite(h, tmesh); // Euler::collapse edge keeps the target and removes the source
typename Traits::Compute_volume_3 volume = gt.compute_volume_3_object();
// source is kept, target is removed
Point_ref kept = get(vpm, source(h, tmesh));
Point_ref removed= get(vpm, target(h, tmesh));
@ -1242,7 +1243,7 @@ bool remove_degenerate_edges(const EdgeRange& edge_range,
all_removed = true;
std::set<edge_descriptor> degenerate_edges_to_remove;
degenerate_edges(local_edge_range, tmesh, std::inserter(degenerate_edges_to_remove,
degenerate_edges_to_remove.end()));
degenerate_edges_to_remove.end()), np);
#ifdef CGAL_PMP_REMOVE_DEGENERATE_FACES_DEBUG
std::cout << "Found " << degenerate_edges_to_remove.size() << " null edges.\n";