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

Merge pull request #8070 from sloriot/Shape_detection-vpm_polyline_graph 

Forward the VPM to polyline graph
This commit is contained in:
Laurent Rineau 2024-03-14 11:04:53 +01:00
parent 8c65aff6c1 3bfc61af58
commit 0c3fa3cf79
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shape_detection/include/CGAL/Polygon_mesh_processing/region_growing.h
View File

@ -354,6 +354,7 @@ detect_corners_of_regions(
using parameters::get_parameter; using parameters::get_parameter;
using parameters::is_default_parameter; using parameters::is_default_parameter;
using VPM = typename GetVertexPointMap < PolygonMesh, NamedParameters>::const_type;
using Traits = typename GetGeomTraits<PolygonMesh, NamedParameters>::type; using Traits = typename GetGeomTraits<PolygonMesh, NamedParameters>::type;
using Graph_traits = boost::graph_traits<PolygonMesh>; using Graph_traits = boost::graph_traits<PolygonMesh>;
using halfedge_descriptor = typename Graph_traits::halfedge_descriptor; using halfedge_descriptor = typename Graph_traits::halfedge_descriptor;
@ -377,7 +378,7 @@ detect_corners_of_regions(
} }
Ecm ecm = choose_parameter(get_parameter(np, internal_np::edge_is_constrained), dynamic_ecm); Ecm ecm = choose_parameter(get_parameter(np, internal_np::edge_is_constrained), dynamic_ecm);
using Polyline_graph = CGAL::Shape_detection::Polygon_mesh::Polyline_graph<PolygonMesh>; using Polyline_graph = CGAL::Shape_detection::Polygon_mesh::Polyline_graph<PolygonMesh, VPM>;
using Segment_map = typename Polyline_graph::Segment_map; using Segment_map = typename Polyline_graph::Segment_map;
using Item = typename Polyline_graph::Item; using Item = typename Polyline_graph::Item;
@ -424,7 +425,7 @@ detect_corners_of_regions(
filtered_edges.push_back(e); filtered_edges.push_back(e);
} }
Polyline_graph pgraph(mesh, filtered_edges, region_map); Polyline_graph pgraph(mesh, filtered_edges, region_map, np);
const auto& segment_range = pgraph.segment_range(); const auto& segment_range = pgraph.segment_range();
Line_region line_region(np.segment_map(pgraph.segment_map())); Line_region line_region(np.segment_map(pgraph.segment_map()));