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

Also add it to OpenMesh

This commit is contained in:
Andreas Fabri 2022-05-03 14:21:43 +01:00
parent abb54bf0b8
commit 5e58f4a3a3
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
View File

@ -16,6 +16,7 @@
#include <boost/graph/properties.hpp> #include <boost/graph/properties.hpp>
#include <CGAL/boost/iterator/transform_iterator.hpp> #include <CGAL/boost/iterator/transform_iterator.hpp>
#include <boost/graph/adjacency_iterator.hpp>
#include <CGAL/boost/graph/internal/OM_iterator_from_circulator.h> #include <CGAL/boost/graph/internal/OM_iterator_from_circulator.h>
#include <CGAL/boost/graph/iterator.h> #include <CGAL/boost/graph/iterator.h>
@ -81,7 +82,8 @@ private:
struct SM_graph_traversal_category : public virtual boost::bidirectional_graph_tag, struct SM_graph_traversal_category : public virtual boost::bidirectional_graph_tag,
public virtual boost::vertex_list_graph_tag, public virtual boost::vertex_list_graph_tag,
public virtual boost::edge_list_graph_tag public virtual boost::edge_list_graph_tag,
public virtual boost::adjacency_graph_tag
{}; {};
public: public:
@ -124,10 +126,12 @@ public:
typedef CGAL::Out_edge_iterator<SM> out_edge_iterator; typedef CGAL::Out_edge_iterator<SM> out_edge_iterator;
typedef typename boost::adjacency_iterator_generator<SM, vertex_descriptor, out_edge_iterator>::type adjacency_iterator;
// nulls // nulls
static vertex_descriptor null_vertex() { return vertex_descriptor(); } static vertex_descriptor null_vertex() { return vertex_descriptor(); }
static face_descriptor null_face() { return face_descriptor(); } static face_descriptor null_face() { return face_descriptor(); }
static halfedge_descriptor null_halfedge() { return halfedge_descriptor(); } static halfedge_descriptor null_halfedge() { return halfedge_descriptor(); }
}; };
template<typename K> template<typename K>
@ -264,6 +268,19 @@ out_edges(typename boost::graph_traits<OPEN_MESH_CLASS >::vertex_descriptor v,
} }
template <typename K>
CGAL::Iterator_range<typename boost::graph_traits<OPEN_MESH_CLASS >::adjacency_iterator>
adjacnt_vertices(typename boost::graph_traits<OPEN_MESH_CLASS >::vertex_descriptor v,
const OPEN_MESH_CLASS& sm)
{
typedef typename boost::graph_traits<OPEN_MESH_CLASS >::out_edge_iterator OutEdgeIter;
typedef typename boost::graph_traits<OPEN_MESH_CLASS >::adjacency_iterator Iter;
return CGAL::make_range(Iter(OutEdgeIter(halfedge(v,sm),sm), &sm), Iter(OutEdgeIter(halfedge(v,sm),sm,1), &sm));
}
template<typename K> template<typename K>
std::pair<typename boost::graph_traits<OPEN_MESH_CLASS >::edge_descriptor, std::pair<typename boost::graph_traits<OPEN_MESH_CLASS >::edge_descriptor,
bool> bool>

1
BGL/test/BGL/graph_concept_OpenMesh.cpp
View File

@ -18,6 +18,7 @@ typedef Traits::face_descriptor face_descriptor;
template<typename Graph> template<typename Graph>
void concept_check_polyhedron() { void concept_check_polyhedron() {
boost::function_requires< boost::GraphConcept<Sm> >(); boost::function_requires< boost::GraphConcept<Sm> >();
boost::function_requires< boost::AdjacencyGraphConcept<Sm> >();
// Those have to be disabled due to OpenMesh's broken iterators. // Those have to be disabled due to OpenMesh's broken iterators.
// boost::function_requires< boost::VertexListGraphConcept<Sm> >(); // boost::function_requires< boost::VertexListGraphConcept<Sm> >();