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

Removed superfluous references to property maps

This commit is contained in:
Mael Rouxel-Labbé 2016-10-17 12:34:23 +02:00
parent 4388da9582
commit 18091ce6df
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Surface_mesh_parameterization/include/CGAL/ARAP_parameterizer_3.h
View File

@ -254,7 +254,7 @@ private:
vertex_descriptor vi, vertex_descriptor vi,
vertex_descriptor vj, vertex_descriptor vj,
vertex_descriptor vk, vertex_descriptor vk,
Cot_map& ctmap) const Cot_map ctmap) const
{ {
typedef typename boost::property_map<TriangleMesh, typedef typename boost::property_map<TriangleMesh,
boost::vertex_point_t>::const_type PPmap; boost::vertex_point_t>::const_type PPmap;
@ -271,7 +271,7 @@ private:
// Filling ctmap with the cotangent of the angles opposite of halfedges // Filling ctmap with the cotangent of the angles opposite of halfedges
Error_code compute_cotangent_angles(const TriangleMesh& mesh, Error_code compute_cotangent_angles(const TriangleMesh& mesh,
const Faces_vector& faces, const Faces_vector& faces,
Cot_map& ctmap) const Cot_map ctmap) const
{ {
BOOST_FOREACH(face_descriptor fd, faces){ BOOST_FOREACH(face_descriptor fd, faces){
halfedge_descriptor hd = halfedge(fd, mesh), hdb = hd; halfedge_descriptor hd = halfedge(fd, mesh), hdb = hd;
@ -298,7 +298,7 @@ private:
/// Compute w_ij = (i, j) coefficient of matrix A for j neighbor vertex of i. /// Compute w_ij = (i, j) coefficient of matrix A for j neighbor vertex of i.
NT compute_w_ij(const TriangleMesh& mesh, NT compute_w_ij(const TriangleMesh& mesh,
halfedge_descriptor hd, halfedge_descriptor hd,
const Cot_map& ctmap) const const Cot_map ctmap) const
{ {
// Note that halfedge and vertex circulators move clockwise!! // Note that halfedge and vertex circulators move clockwise!!
@ -325,7 +325,7 @@ private:
Error_code fill_linear_system_matrix(Matrix& A, Error_code fill_linear_system_matrix(Matrix& A,
const TriangleMesh& mesh, const TriangleMesh& mesh,
vertex_descriptor vertex, vertex_descriptor vertex,
const Cot_map& ct_map, const Cot_map ct_map,
VertexIndexMap vimap) const VertexIndexMap vimap) const
{ {
int i = get(vimap, vertex); int i = get(vimap, vertex);
@ -367,7 +367,7 @@ private:
typename VertexParameterizedMap> typename VertexParameterizedMap>
Error_code initialize_matrix_A(const TriangleMesh& mesh, Error_code initialize_matrix_A(const TriangleMesh& mesh,
const Vertex_set& vertices, const Vertex_set& vertices,
const Cot_map& ctmap, const Cot_map ctmap,
VertexIndexMap vimap, VertexIndexMap vimap,
VertexParameterizedMap vpmap, VertexParameterizedMap vpmap,
Matrix& A) const Matrix& A) const
@ -507,9 +507,9 @@ private:
/// Compute the root that gives the lowest face energy. /// Compute the root that gives the lowest face energy.
std::size_t compute_root_with_lowest_energy(const TriangleMesh& mesh, std::size_t compute_root_with_lowest_energy(const TriangleMesh& mesh,
face_descriptor fd, face_descriptor fd,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const NT C2_denom, const NT C3, const NT C2_denom, const NT C3,
const std::vector<NT>& roots) const const std::vector<NT>& roots) const
{ {
@ -532,9 +532,9 @@ private:
/// Compute the root that gives the lowest face energy. /// Compute the root that gives the lowest face energy.
std::size_t compute_root_with_lowest_energy(const TriangleMesh& mesh, std::size_t compute_root_with_lowest_energy(const TriangleMesh& mesh,
face_descriptor fd, face_descriptor fd,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const std::vector<NT>& a_roots, const std::vector<NT>& a_roots,
const std::vector<NT>& b_roots) const const std::vector<NT>& b_roots) const
{ {
@ -556,10 +556,10 @@ private:
/// Compute the optimal values of the linear transformation matrices Lt. /// Compute the optimal values of the linear transformation matrices Lt.
Error_code compute_optimal_Lt_matrices(const TriangleMesh& mesh, Error_code compute_optimal_Lt_matrices(const TriangleMesh& mesh,
const Faces_vector& faces, const Faces_vector& faces,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
Lt_map& ltmap) const Lt_map ltmap) const
{ {
Error_code status = Base::OK; Error_code status = Base::OK;
@ -717,7 +717,7 @@ private:
Error_code compute_local_parametrisation(const TriangleMesh& mesh, Error_code compute_local_parametrisation(const TriangleMesh& mesh,
const Faces_vector& faces, const Faces_vector& faces,
Local_points& lp, Local_points& lp,
Lp_map& lpmap) const Lp_map lpmap) const
{ {
int global_index = 0; int global_index = 0;
@ -753,10 +753,10 @@ private:
/// Compute b_ij = (i, j) coefficient of matrix B for j neighbor vertex of i. /// Compute b_ij = (i, j) coefficient of matrix B for j neighbor vertex of i.
void compute_b_ij(const TriangleMesh& mesh, void compute_b_ij(const TriangleMesh& mesh,
halfedge_descriptor hd, halfedge_descriptor hd,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const Lt_map& ltmap, const Lt_map ltmap,
NT& x, NT& y) const // x for Bu and y for Bv NT& x, NT& y) const // x for Bu and y for Bv
{ {
CGAL_precondition(x == 0.0 && y == 0.0); CGAL_precondition(x == 0.0 && y == 0.0);
@ -827,10 +827,10 @@ private:
template<typename VertexIndexMap> template<typename VertexIndexMap>
Error_code fill_linear_system_rhs(const TriangleMesh& mesh, Error_code fill_linear_system_rhs(const TriangleMesh& mesh,
vertex_descriptor vertex, vertex_descriptor vertex,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const Lt_map& ltmap, const Lt_map ltmap,
VertexIndexMap vimap, VertexIndexMap vimap,
Vector& Bu, Vector& Bv) const Vector& Bu, Vector& Bv) const
{ {
@ -868,10 +868,10 @@ private:
typename VertexParameterizedMap> typename VertexParameterizedMap>
Error_code compute_rhs(const TriangleMesh& mesh, Error_code compute_rhs(const TriangleMesh& mesh,
const Vertex_set& vertices, const Vertex_set& vertices,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const Lt_map& ltmap, const Lt_map ltmap,
VertexUVmap uvmap, VertexUVmap uvmap,
VertexIndexMap vimap, VertexIndexMap vimap,
VertexParameterizedMap vpmap, VertexParameterizedMap vpmap,
@ -920,10 +920,10 @@ private:
typename VertexParameterizedMap> typename VertexParameterizedMap>
Error_code update_solution(const TriangleMesh& mesh, Error_code update_solution(const TriangleMesh& mesh,
const Vertex_set& vertices, const Vertex_set& vertices,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const Lt_map& ltmap, const Lt_map ltmap,
VertexUVmap uvmap, VertexUVmap uvmap,
VertexIndexMap vimap, VertexIndexMap vimap,
VertexParameterizedMap vpmap, VertexParameterizedMap vpmap,
@ -979,9 +979,9 @@ private:
/// Compute the energy of a face, given a linear transformation matrix /// Compute the energy of a face, given a linear transformation matrix
NT compute_current_face_energy(const TriangleMesh& mesh, NT compute_current_face_energy(const TriangleMesh& mesh,
face_descriptor fd, face_descriptor fd,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const NT a, const NT b) const const NT a, const NT b) const
{ {
typedef typename boost::property_map<TriangleMesh, typedef typename boost::property_map<TriangleMesh,
@ -1024,10 +1024,10 @@ private:
/// Compute the energy of a face. /// Compute the energy of a face.
NT compute_current_face_energy(const TriangleMesh& mesh, NT compute_current_face_energy(const TriangleMesh& mesh,
face_descriptor fd, face_descriptor fd,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const Lt_map& ltmap) const const Lt_map ltmap) const
{ {
NT Ef = 0.; NT Ef = 0.;
@ -1041,10 +1041,10 @@ private:
/// Compute the current energy of the parameterization. /// Compute the current energy of the parameterization.
NT compute_current_energy(const TriangleMesh& mesh, NT compute_current_energy(const TriangleMesh& mesh,
const Faces_vector& faces, const Faces_vector& faces,
const Cot_map& ctmap, const Cot_map ctmap,
const Local_points& lp, const Local_points& lp,
const Lp_map& lpmap, const Lp_map lpmap,
const Lt_map& ltmap) const const Lt_map ltmap) const
{ {
NT E = 0.; NT E = 0.;