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

Some progress towards compilation of ARAP with a seam_mesh 

Most of the issues come from the incomplete seam_mesh graph traits now.
This commit is contained in:
Mael Rouxel-Labbé 2016-10-24 17:07:19 +02:00
parent 4b0243d263
commit e8d22d0f24
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/parameterization_tests.cpp
View File

@ -8,6 +8,7 @@
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/Seam_mesh.h>
#include <CGAL/boost/graph/graph_traits_Seam_mesh.h>
#include <CGAL/ARAP_parameterizer_3.h>
#include <CGAL/Barycentric_mapping_parameterizer_3.h>

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

@ -239,18 +239,24 @@ private:
CGAL_precondition(!vertices.empty());
if(m_lambda != 0.){
// Fix a random vertex, the value in uvmap is already set
// Fix a random vertex, the value in uvmap is already set
vertex_descriptor vd = *(vertices.begin());
put(vpmap, vd, true);
} else {
// This fixes two vertices that are far in the original geometry
// This fixes two vertices that are far in the original geometry
// A local uvmap (that is then discarded) is passed to avoid changing
// the values of the real uvmap
CGAL::Unique_hash_map<vertex_descriptor, Point_2> useless_uvmap;
status = get_border_parameterizer().parameterize_border(mesh, bhd,
VertexUVMap(useless_uvmap),
vpmap);
// A local uvmap (that is then discarded) is passed to avoid changing
// the values of the real uvmap. Since we can't get VertexUVMap::C,
// we build a map with the same key and value type
typedef boost::unordered_map<typename VertexUVMap::key_type,
typename VertexUVMap::value_type> Useless_map;
typedef boost::associative_property_map<Useless_map> Useless_pmap;
Useless_map useless_map;
Useless_pmap useless_uvpmap(useless_map);
status = get_border_parameterizer().parameterize_border(mesh, bhd,
useless_uvpmap,
vpmap);
}
return status;