From cc0f3493d520b46bbd3fc717caadacb535e0d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 1 Mar 2022 22:03:39 +0100 Subject: [PATCH] Fix not using/fwing traits --- .../CGAL/Polygon_mesh_processing/repair_degeneracies.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h index cb4a1ce9e08..abd2ef83231 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h @@ -186,6 +186,7 @@ bool is_collapse_geometrically_valid(typename boost::graph_traits: } */ +// @todo handle boundary edges template boost::optional get_collapse_volume(typename boost::graph_traits::halfedge_descriptor h, @@ -201,10 +202,10 @@ get_collapse_volume(typename boost::graph_traits::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)); @@ -1052,7 +1053,7 @@ bool remove_degenerate_edges(const EdgeRange& edge_range, all_removed = true; std::set 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";