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

join ranges instead of copying them into a single std::vector

This commit is contained in:
Andreas Fabri 2017-05-30 11:02:28 +02:00
parent a8152a5bda
commit 845e319851
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
View File

@ -43,6 +43,7 @@
#include <boost/bimap/multiset_of.hpp>
#include <boost/bimap/set_of.hpp>
#include <boost/range.hpp>
#include <boost/range/join.hpp>
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
#include <boost/shared_ptr.hpp>
@ -1359,22 +1360,15 @@ private:
//move source at target
put(vpmap_, vs, get(vpmap_, vt));
//collect halfedges around vs and vt
std::vector<halfedge_descriptor> hedges;
BOOST_FOREACH(halfedge_descriptor hd,
halfedges_around_target(h, mesh_))
hedges.push_back(hd);
BOOST_FOREACH(halfedge_descriptor hd,
halfedges_around_target(opposite(h, mesh_), mesh_))
hedges.push_back(hd);
//collect normals to faces around vs AND vt
//vertices are at the same location, but connectivity is still be same,
//with plenty of degenerate triangles (which are common to both stars)
std::vector<Vector_3> normals_patch1;
std::vector<Vector_3> normals_patch2;
Patch_id patch1 = -1, patch2 = -1;
BOOST_FOREACH(halfedge_descriptor hd, hedges)
BOOST_FOREACH(halfedge_descriptor hd,
boost::range::join(halfedges_around_target(h, mesh_),
halfedges_around_target(opposite(h, mesh_), mesh_)))
{
Vector_3 n = compute_normal(face(hd, mesh_));
if (n == CGAL::NULL_VECTOR) //for degenerate faces