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

Merge remote-tracking branch 'cgal/5.6.x-branch'

This commit is contained in:
Sébastien Loriot 2024-11-14 07:48:10 +01:00
parent 400acfbf6c 6cb87048bd
commit 2e691b0d85
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Surface_mesh_deformation/include/CGAL/Surface_mesh_deformation.h
View File

@ -90,10 +90,10 @@ struct Types_selectors<TriangleMesh, VertexPointMap, CGAL::SPOKES_AND_RIMS>
struct ARAP_visitor struct ARAP_visitor
{ {
void init(TriangleMesh, VertexPointMap){} void init(const TriangleMesh&, VertexPointMap){}
void rotation_matrix_pre(typename boost::graph_traits<TriangleMesh>::vertex_descriptor, void rotation_matrix_pre(typename boost::graph_traits<TriangleMesh>::vertex_descriptor,
TriangleMesh&){} const TriangleMesh&){}
template <class Square_matrix_3> template <class Square_matrix_3>
void update_covariance_matrix(Square_matrix_3&, void update_covariance_matrix(Square_matrix_3&,
@ -125,7 +125,7 @@ struct Types_selectors<TriangleMesh, VertexPointMap, CGAL::SRE_ARAP>
public: public:
ARAP_visitor(): m_alpha(0.02) {} ARAP_visitor(): m_alpha(0.02) {}
void init(TriangleMesh triangle_mesh, const VertexPointMap& vpmap) void init(const TriangleMesh &triangle_mesh, const VertexPointMap& vpmap)
{ {
// calculate area // calculate area
m_area = 0; m_area = 0;
@ -143,7 +143,7 @@ struct Types_selectors<TriangleMesh, VertexPointMap, CGAL::SRE_ARAP>
void rotation_matrix_pre( void rotation_matrix_pre(
typename boost::graph_traits<TriangleMesh>::vertex_descriptor vi, typename boost::graph_traits<TriangleMesh>::vertex_descriptor vi,
TriangleMesh& hg) const TriangleMesh& hg)
{ {
typename boost::graph_traits<TriangleMesh>::in_edge_iterator e, e_end; typename boost::graph_traits<TriangleMesh>::in_edge_iterator e, e_end;
std::tie(e,e_end) = in_edges(vi, hg); std::tie(e,e_end) = in_edges(vi, hg);