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

replace operator() with more explicit visit() function

This commit is contained in:
Jane Tournois 2020-09-08 19:03:34 +02:00
parent 7f154f5c41
commit 268c0eabee
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/include/CGAL/boost/graph/named_params_helper.h
View File

@ -316,7 +316,7 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits<Graph>::fa
{}
template <typename T>
void operator()(const T&) const
void visit(const T&) const
{}
void done() const

5
Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp
View File

@ -42,7 +42,8 @@ public:
};
struct Visitor {
struct Visitor
{
typedef boost::unordered_map<face_descriptor,face_descriptor> Container;
Container& container;
@ -60,7 +61,7 @@ struct Visitor {
container.erase(it);
}
void operator()(face_descriptor fd)
void visit(face_descriptor fd)
{
std::cout << " " << fd;
container[fd]=qfd;

14
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
View File

@ -127,8 +127,8 @@ public:
{
res = CGAL::Euler::split_face(v1, v3, pmesh);
}
visitor(face(res,pmesh));
visitor(face(opposite(res,pmesh),pmesh));
visitor.visit(face(res,pmesh));
visitor.visit(face(opposite(res,pmesh),pmesh));
visitor.done();
}
else
@ -276,7 +276,7 @@ public:
set_next(h2, h0, pmesh);
Euler::fill_hole(h0, pmesh);
visitor(face(h0, pmesh));
visitor.visit(face(h0, pmesh));
}
}
visitor.done();
@ -327,8 +327,8 @@ public:
first=false;
else
f=add_face(pmesh);
visitor(f);
visitor.visit(f);
std::array<int, 4> indices =
make_array( triangle.first,
triangle.second,
@ -458,12 +458,12 @@ bool triangulate_face(typename boost::graph_traits<PolygonMesh>::face_descriptor
//Option
bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true);
typedef typename GetSplitVisitor<NamedParameters>::type SplitVisitor;
typedef typename GetSplitVisitor<NamedParameters>::DummySplitVisitor DummySplitVisitor;
SplitVisitor visitor = choose_param(get_param(np, internal_np::split_visitor),
DummySplitVisitor());
internal::Triangulate_modifier<PolygonMesh, VPMap, Kernel, SplitVisitor> modifier(vpmap);
return modifier.triangulate_face(f, pmesh, use_cdt, visitor);
}