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

Improved cone locating functions

This commit is contained in:
Mael Rouxel-Labbé 2016-12-09 12:03:42 +01:00
parent adb03e8ee9
commit 80f673fa24
3 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbital.cpp
View File

@ -79,8 +79,8 @@ int main(int argc, char * argv[])
// Read the cones and find the corresponding vertex_descriptor in the underlying mesh 'sm' // Read the cones and find the corresponding vertex_descriptor in the underlying mesh 'sm'
typedef std::vector<SM_vertex_descriptor> Cones_in_smesh_container; typedef std::vector<SM_vertex_descriptor> Cones_in_smesh_container;
Cones_in_smesh_container cone_vds_in_sm; Cones_in_smesh_container cone_sm_vds;
SMP::internal::read_cones<SurfaceMesh>(sm, cone_filename, cone_vds_in_sm); SMP::internal::read_cones<SurfaceMesh>(sm, cone_filename, cone_sm_vds);
// Two property maps to store the seam edges and vertices // Two property maps to store the seam edges and vertices
Seam_edge_pmap seam_edge_pm = sm.add_property_map<SM_edge_descriptor, bool>("e:on_seam", false).first; Seam_edge_pmap seam_edge_pm = sm.add_property_map<SM_edge_descriptor, bool>("e:on_seam", false).first;
@ -94,7 +94,7 @@ int main(int argc, char * argv[])
if(smhd == SM_halfedge_descriptor() ) { if(smhd == SM_halfedge_descriptor() ) {
std::cout << "No seams were given in input, computing shortest paths between cones" << std::endl; std::cout << "No seams were given in input, computing shortest paths between cones" << std::endl;
std::list<SM_edge_descriptor> seam_edges; std::list<SM_edge_descriptor> seam_edges;
SMP::internal::compute_shortest_paths_between_cones(sm, cone_vds_in_sm, seam_edges); SMP::internal::compute_shortest_paths_between_cones(sm, cone_sm_vds, seam_edges);
// Add the seams to the seam mesh // Add the seams to the seam mesh
BOOST_FOREACH(SM_edge_descriptor e, seam_edges) { BOOST_FOREACH(SM_edge_descriptor e, seam_edges) {
@ -117,9 +117,9 @@ int main(int argc, char * argv[])
// Mark the cones in the seam mesh // Mark the cones in the seam mesh
typedef boost::unordered_map<vertex_descriptor, SMP::Cone_type> Cones; typedef boost::unordered_map<vertex_descriptor, SMP::Cone_type> Cones;
Cones cmap; Cones cmap;
SMP::internal::locate_cones<Mesh, SurfaceMesh, SMP::internal::locate_cones<Mesh,
Cones_in_smesh_container, Cones_in_smesh_container,
Cones>(mesh, cone_vds_in_sm, cmap); Cones>(mesh, cone_sm_vds, cmap);
// The 2D points of the uv parametrisation will be written into this map // The 2D points of the uv parametrisation will be written into this map
// Note that this is a halfedge property map, and that uv values // Note that this is a halfedge property map, and that uv values

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

@ -292,7 +292,7 @@ private:
// Initialize some variables used in the seam walk // Initialize some variables used in the seam walk
int start_cone_index = -1; // index of the beginning of the seam int start_cone_index = -1; // index of the beginning of the seam
vertex_descriptor start_cone; vertex_descriptor start_cone;
find_start_cone(cmap, vimap, start_cone, start_cone_index); internal::find_start_cone(cmap, vimap, start_cone, start_cone_index);
CGAL_postcondition(start_cone != vertex_descriptor() && start_cone_index != -1); CGAL_postcondition(start_cone != vertex_descriptor() && start_cone_index != -1);
// parameterize the initial cone // parameterize the initial cone

92
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/orbital_cone_helper.h
View File

@ -166,43 +166,68 @@ Error_code read_cones(const Polygon_mesh& pm, const char* filename,
return OK; return OK;
} }
template<typename vertex_descriptor,
typename ConeMap,
typename VertexIndexMap>
void find_start_cone(const ConeMap& cmap,
VertexIndexMap vimap,
vertex_descriptor& cone,
int& cone_index)
{
CGAL_precondition(!cmap.empty());
typename ConeMap::const_iterator cmit = cmap.begin(), cend = cmap.end();
for(; cmit!=cend; ++cmit) {
if(cmit->second != First_unique_cone)
continue;
cone = cmit->first;
cone_index = get(vimap, cone);
return;
}
std::cerr << "Error: did not find first cone" << std::endl;
CGAL_postcondition(false);
}
/// Locate the cones on the seam mesh (find the corresponding seam mesh /// Locate the cones on the seam mesh (find the corresponding seam mesh
/// vertex_descriptor) and mark them with a tag that indicates whether it is a /// vertex_descriptor) and mark them with a tag that indicates whether it is a
/// simple cone or a duplicated cone. /// simple cone or a duplicated cone.
/// ///
/// The cones are ordered: the first and last cones are the extremetities of the seam. /// The cones are ordered: the first and last cones are the extremetities of the seam.
/// ///
/// \tparam Mesh is a seam mesh /// \tparam SeamMesh is a seam mesh
/// \tparam BaseMesh is the underlying mesh of `Mesh`
/// \tparam ConeMap a map vertex_descriptor --> Cone_type /// \tparam ConeMap a map vertex_descriptor --> Cone_type
template<typename Mesh, template<typename SeamMesh,
typename BaseMesh,
typename Cones_in_pmesh_vector, typename Cones_in_pmesh_vector,
typename ConeMap> typename ConeMap>
void locate_cones(const Mesh& mesh, void locate_cones(const SeamMesh& mesh,
const Cones_in_pmesh_vector& cone_vds_in_sm, const Cones_in_pmesh_vector& cone_tm_vds,
ConeMap& cones) ConeMap& cones)
{ {
CGAL_precondition(cones.empty()); CGAL_precondition(cones.empty());
typedef typename boost::graph_traits<BaseMesh>::vertex_descriptor BM_vertex_descriptor; typedef typename SeamMesh::TriangleMesh TriangleMesh;
typedef typename boost::graph_traits<Mesh>::vertex_descriptor vertex_descriptor;
// property map to go from BM_vertex_descriptor to Point_3 typedef typename boost::graph_traits<TriangleMesh>::vertex_descriptor TM_vertex_descriptor;
typedef typename Kernel_traits<BaseMesh>::PPM PM_PPM; typedef typename boost::graph_traits<SeamMesh>::vertex_descriptor vertex_descriptor;
// property map to go from TM_vertex_descriptor to Point_3
typedef typename Kernel_traits<TriangleMesh>::PPM PM_PPM;
const PM_PPM pm_ppmap = get(boost::vertex_point, mesh.mesh()); const PM_PPM pm_ppmap = get(boost::vertex_point, mesh.mesh());
// property map to go from vertex_descriptor to Point_3 // property map to go from vertex_descriptor to Point_3
typedef typename Kernel_traits<Mesh>::PPM PPM; typedef typename Kernel_traits<SeamMesh>::PPM PPM;
const PPM ppmap = get(boost::vertex_point, mesh); const PPM ppmap = get(boost::vertex_point, mesh);
// the cones in the underlying mesh // the cones in the underlying mesh
std::size_t cvdss = cone_vds_in_sm.size(); std::size_t cvdss = cone_tm_vds.size();
std::cout << cvdss << " cones to locate" << std::endl; std::cout << cvdss << " cones to locate" << std::endl;
for(std::size_t i=0; i<cvdss; ++i) { for(std::size_t i=0; i<cvdss; ++i) {
BM_vertex_descriptor smvd = cone_vds_in_sm[i]; TM_vertex_descriptor smvd = cone_tm_vds[i];
BOOST_FOREACH(vertex_descriptor vd, vertices(mesh)) { BOOST_FOREACH(vertex_descriptor vd, vertices(mesh)) {
if(get(ppmap, vd) == get(pm_ppmap, smvd)) { if(get(ppmap, vd) == get(pm_ppmap, smvd)) {
Cone_type ct; Cone_type ct;
@ -220,33 +245,30 @@ void locate_cones(const Mesh& mesh,
} }
} }
CGAL_postcondition((cone_vds_in_sm.size() == 3 && cones.size() == 4) || check_seam_validity(mesh, cones, cone_tm_vds);
(cone_vds_in_sm.size() == 4 && cones.size() == 6));
std::cout << cone_vds_in_sm.size() << " cones in sm" << std::endl;
std::cout << cones.size() << " cones in mesh" << std::endl;
} }
/// Same as above, but the cones are NOT ordered and we thus use seam mesh /// Same as above, but the cones are NOT ordered and we thus use seam mesh
/// information to determine which cones are Duplicate_cones and which cones /// information to determine which cones are Duplicate_cones and which cones
/// are unique /// are unique
/// ///
/// \tparam Mesh is a seam mesh /// \tparam SeamMesh is a seam mesh
/// \tparam BaseMesh is the type of the underlying mesh in the seam mesh /// \tparam Cones_in_pmesh_set is a set of cones (vertex_descriptor of SeamMesh)
/// \tparam ConeMap a map vertex_descriptor --> Cone_type /// \tparam ConeMap a map vertex_descriptor of SeamMesh --> Cone_type
template<typename Mesh, template<typename SeamMesh,
typename BaseMesh,
typename Cones_in_pmesh_set, typename Cones_in_pmesh_set,
typename ConeMap> typename ConeMap>
void locate_unordered_cones(const Mesh& mesh, void locate_unordered_cones(const SeamMesh& mesh,
const Cones_in_pmesh_set& cone_vds_in_sm, const Cones_in_pmesh_set& cone_tm_vds,
ConeMap& cones) ConeMap& cones)
{ {
CGAL_precondition(cones.empty()); CGAL_precondition(cones.empty());
typedef typename boost::graph_traits<BaseMesh>::vertex_descriptor BM_vertex_descriptor; typedef typename SeamMesh::TriangleMesh TriangleMesh;
typedef typename boost::graph_traits<Mesh>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<Mesh>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<TriangleMesh>::vertex_descriptor TM_vertex_descriptor;
typedef typename boost::graph_traits<SeamMesh>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<SeamMesh>::halfedge_descriptor halfedge_descriptor;
// find a vertex on the seam // find a vertex on the seam
vertex_descriptor vertex_on_seam; vertex_descriptor vertex_on_seam;
@ -259,12 +281,12 @@ void locate_unordered_cones(const Mesh& mesh,
CGAL_assertion(vertex_on_seam != vertex_descriptor()); CGAL_assertion(vertex_on_seam != vertex_descriptor());
// property map to go from BM_vertex_descriptor to Point_3 // property map to go from TM_vertex_descriptor to Point_3
typedef typename Kernel_traits<BaseMesh>::PPM PM_PPM; typedef typename Kernel_traits<TriangleMesh>::PPM PM_PPM;
const PM_PPM pm_ppmap = get(boost::vertex_point, mesh.mesh()); const PM_PPM pm_ppmap = get(boost::vertex_point, mesh.mesh());
// property map to go from vertex_descriptor to Point_3 // property map to go from vertex_descriptor to Point_3
typedef typename Kernel_traits<Mesh>::PPM PPM; typedef typename Kernel_traits<SeamMesh>::PPM PPM;
const PPM ppmap = get(boost::vertex_point, mesh); const PPM ppmap = get(boost::vertex_point, mesh);
bool first_cone_met = false; bool first_cone_met = false;
@ -272,7 +294,7 @@ void locate_unordered_cones(const Mesh& mesh,
// walk on the seam and mark if we encounter a cone // walk on the seam and mark if we encounter a cone
vertex_descriptor end = vertex_on_seam; vertex_descriptor end = vertex_on_seam;
do { do {
BOOST_FOREACH(BM_vertex_descriptor smvd, cone_vds_in_sm) { BOOST_FOREACH(TM_vertex_descriptor smvd, cone_tm_vds) {
if(get(ppmap, vertex_on_seam) == get(pm_ppmap, smvd)) { // the seam mesh vertex is a cone if(get(ppmap, vertex_on_seam) == get(pm_ppmap, smvd)) { // the seam mesh vertex is a cone
// we have encountered a cone. Must check if the cone is a Unique_cone // we have encountered a cone. Must check if the cone is a Unique_cone
@ -314,11 +336,7 @@ void locate_unordered_cones(const Mesh& mesh,
} while(vertex_on_seam != end); } while(vertex_on_seam != end);
CGAL_postcondition((cone_vds_in_sm.size() == 3 && cones.size() == 4) || check_seam_validity(mesh, cones, cone_tm_vds);
(cone_vds_in_sm.size() == 4 && cones.size() == 6));
std::cout << cone_vds_in_sm.size() << " cones in sm" << std::endl;
std::cout << cones.size() << " cones in mesh" << std::endl;
} }
} // namespace internal } // namespace internal