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

Fix constructor of Mean_curvature_flow_skeletonization + weight API

This commit is contained in:
Mael Rouxel-Labbé 2022-10-21 12:47:52 +02:00
parent 8d7669d559
commit 4d4bf04b83
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h
View File

@ -223,7 +223,7 @@ public:
typedef typename boost::graph_traits<mTriangleMesh>::edge_iterator edge_iterator; typedef typename boost::graph_traits<mTriangleMesh>::edge_iterator edge_iterator;
// Get weight from the weight interface. // Get weight from the weight interface.
typedef CGAL::Weights::Cotangent_weight<mTriangleMesh> Weight_calculator; typedef CGAL::Weights::Cotangent_weight<mTriangleMesh, mVertexPointMap, Traits> Weight_calculator;
typedef internal::Curve_skeleton<mTriangleMesh, typedef internal::Curve_skeleton<mTriangleMesh,
VertexIndexMap, VertexIndexMap,
@ -371,17 +371,15 @@ public:
Mean_curvature_flow_skeletonization(const TriangleMesh& tmesh, Mean_curvature_flow_skeletonization(const TriangleMesh& tmesh,
VertexPointMap vertex_point_map, VertexPointMap vertex_point_map,
const Traits& traits = Traits()) const Traits& traits = Traits())
: m_traits(traits), m_weight_calculator(true /* use_clamped_version */) : m_traits(traits), m_weight_calculator(tmesh, vertex_point_map, traits, true /* use_clamped_version */)
{ {
init(tmesh, vertex_point_map); init(tmesh, vertex_point_map);
} }
Mean_curvature_flow_skeletonization(const TriangleMesh& tmesh, Mean_curvature_flow_skeletonization(const TriangleMesh& tmesh,
const Traits& traits = Traits()) const Traits& traits = Traits())
: m_traits(traits), m_weight_calculator(true /* use_clamped_version */) : Mean_curvature_flow_skeletonization(tmesh, get(vertex_point, tmesh), traits)
{ { }
init(tmesh);
}
#endif #endif
/// @} Constructor /// @} Constructor
@ -831,12 +829,13 @@ private:
} }
/// Initialize some global data structures such as vertex id. /// Initialize some global data structures such as vertex id.
void init(const TriangleMesh& tmesh) void init(const TriangleMesh& tmesh, VertexPointMap vpm)
{ {
typedef std::pair<Input_vertex_descriptor, vertex_descriptor> Vertex_pair; typedef std::pair<Input_vertex_descriptor, vertex_descriptor> Vertex_pair;
std::vector<Vertex_pair> v2v; std::vector<Vertex_pair> v2v;
copy_face_graph(tmesh, m_tmesh, copy_face_graph(tmesh, m_tmesh,
CGAL::parameters::vertex_to_vertex_output_iterator(std::back_inserter(v2v))); CGAL::parameters::vertex_to_vertex_output_iterator(std::back_inserter(v2v))
.vertex_point_map(vpm));
// copy input vertices to keep correspondence // copy input vertices to keep correspondence
for(const Vertex_pair& vp : v2v) for(const Vertex_pair& vp : v2v)