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

Use f2f argument

This commit is contained in:
Philipp Möller 2016-01-22 17:13:00 +01:00 committed by Jane Tournois
parent e664952918
commit 0fa954bc8a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BGL/include/CGAL/boost/graph/copy_face_graph.h
View File

@ -82,18 +82,21 @@ void copy_face_graph(const SourceMesh& sm, TargetMesh& tm,
put(tm_pmap, tvd, get(sm_pmap, svd)); put(tm_pmap, tvd, get(sm_pmap, svd));
} }
boost::unordered_map<sm_face_descriptor, tm_face_descriptor> f2f; // internal f2f
boost::unordered_map<sm_face_descriptor, tm_face_descriptor> f2f_;
BOOST_FOREACH(sm_face_descriptor sfd, faces(sm)){ BOOST_FOREACH(sm_face_descriptor sfd, faces(sm)){
std::vector<tm_vertex_descriptor> tv; std::vector<tm_vertex_descriptor> tv;
BOOST_FOREACH(sm_vertex_descriptor svd, vertices_around_face(halfedge(sfd,sm),sm)){ BOOST_FOREACH(sm_vertex_descriptor svd, vertices_around_face(halfedge(sfd,sm),sm)){
tv.push_back(v2v.at(svd)); tv.push_back(v2v.at(svd));
} }
f2f[sfd] = Euler::add_face(tv,tm); tm_face_descriptor new_face = Euler::add_face(tv,tm);
f2f_[sfd] = new_face;
*f2f++ = std::make_pair(sfd, new_face);
} }
BOOST_FOREACH(sm_face_descriptor sfd, faces(sm)){ BOOST_FOREACH(sm_face_descriptor sfd, faces(sm)){
sm_halfedge_descriptor shd = halfedge(sfd,sm), done(shd); sm_halfedge_descriptor shd = halfedge(sfd,sm), done(shd);
tm_halfedge_descriptor thd = halfedge(f2f[sfd],tm); tm_halfedge_descriptor thd = halfedge(f2f_[sfd],tm);
tm_vertex_descriptor tvd = v2v.at(target(shd,sm)); tm_vertex_descriptor tvd = v2v.at(target(shd,sm));
while(target(thd,tm) != tvd){ while(target(thd,tm) != tvd){
thd = next(thd,tm); thd = next(thd,tm);