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

Renamed the function parameterize_border() of border parameterizers 

to the simpler "parameterize()"
This commit is contained in:
Mael Rouxel-Labbé 2016-11-09 18:28:30 +01:00
parent a52040fb4e
commit fcfe9662af
7 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/BorderParameterizer_3.h
View File

@ -45,7 +45,7 @@ Assign a 2D position (i.e.\ a `(u, v)` pair) on the shape to (some of) the vert
border of the mesh. Mark them as <I>parameterized</I>.
*/
Error_code parameterize_border(const TriangleMesh& mesh);
Error_code parameterize(const TriangleMesh& mesh);
/*!

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

@ -347,9 +347,7 @@ private:
Useless_map useless_map;
Useless_pmap useless_uvpmap(useless_map);
status = get_border_parameterizer().parameterize_border(mesh, bhd,
useless_uvpmap,
vpmap);
status = get_border_parameterizer().parameterize(mesh, bhd, useless_uvpmap, vpmap);
}
return status;

8
Surface_mesh_parameterization/include/CGAL/Circular_border_parameterizer_3.h
View File

@ -106,10 +106,10 @@ public:
/// on the circle. Mark them as <i>parameterized</i>.
template <typename VertexUVmap, typename VertexParameterizedMap>
Error_code
parameterize_border(const TriangleMesh& mesh,
halfedge_descriptor bhd,
VertexUVmap uvmap,
VertexParameterizedMap vpmap)
parameterize(const TriangleMesh& mesh,
halfedge_descriptor bhd,
VertexUVmap uvmap,
VertexParameterizedMap vpmap)
{
// Nothing to do if no border
if (bhd == halfedge_descriptor())

5
Surface_mesh_parameterization/include/CGAL/Fixed_border_parameterizer_3.h
View File

@ -341,9 +341,8 @@ parameterize(TriangleMesh& mesh,
// Count vertices
int nbVertices = static_cast<int>(vertices.size());
// Compute (u,v) for border vertices
// and mark them as "parameterized"
status = get_border_parameterizer().parameterize_border(mesh, bhd, uvmap, vpm);
// Compute (u,v) for border vertices and mark them as "parameterized"
status = get_border_parameterizer().parameterize(mesh, bhd, uvmap, vpmap);
if (status != Base::OK)
return status;

2
Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h
View File

@ -202,7 +202,7 @@ public:
// Compute (u,v) for (at least two) border vertices
// and mark them as "parameterized"
Error_code status = get_border_parameterizer().parameterize_border(mesh,bhd,uvmap,vpmap);
Error_code status = get_border_parameterizer().parameterize(mesh, bhd, uvmap, vpmap);
if(status != Base::OK)
return status;

12
Surface_mesh_parameterization/include/CGAL/Square_border_parameterizer_3.h
View File

@ -114,7 +114,7 @@ private:
return len;
}
/// Utility method for parameterize_border().
/// Utility method for parameterize().
/// Compute the mesh iterator whose offset is closest to 'value'.
halfedge_around_face_iterator closest_iterator(const TriangleMesh& mesh,
halfedge_descriptor bhd,
@ -299,11 +299,11 @@ public:
/// Assign to the vertices of the border of the mesh a 2D position
/// (i.e.\ a (u,v) pair) on the border's shape. Mark them as <i>parameterized</i>.
template<typename VertexUVMap, typename VertexParameterizedMap>
Error_code parameterize_border(const TriangleMesh& mesh,
halfedge_descriptor bhd,
VertexUVMap uvmap,
VertexParameterizedMap vpmap,
const char* filename = "../data/square_corners.selection.txt")
Error_code parameterize(const TriangleMesh& mesh,
halfedge_descriptor bhd,
VertexUVMap uvmap,
VertexParameterizedMap vpmap,
const char* filename = "../data/square_corners.selection.txt")
{
#ifdef DEBUG_TRACE
std::cerr << "Map to a square" << std::endl;

8
Surface_mesh_parameterization/include/CGAL/Two_vertices_parameterizer_3.h
View File

@ -100,10 +100,10 @@ public:
///
template <typename VertexUVmap, typename VertexParameterizedMap>
typename Parameterizer_traits_3<TriangleMesh>::Error_code
parameterize_border(const TriangleMesh& mesh,
halfedge_descriptor,
VertexUVmap uvmap,
VertexParameterizedMap vpmap)
parameterize(const TriangleMesh& mesh,
halfedge_descriptor,
VertexUVmap uvmap,
VertexParameterizedMap vpmap)
{
if(vertices_given){
put(uvmap, vxmin, Point_2(0, 0.5));