From 91dde8b2c076018419d56e8b2eb85c307fa50c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 26 Jun 2013 08:55:14 +0200 Subject: [PATCH] use undirected_edges to have only one primitive per edge --- AABB_tree/demo/AABB_tree/Scene.cpp | 4 ++-- AABB_tree/demo/AABB_tree/Scene.h | 1 + Operations_on_polyhedra/include/CGAL/Polyhedron_slicer_3.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/AABB_tree/demo/AABB_tree/Scene.cpp b/AABB_tree/demo/AABB_tree/Scene.cpp index fd383e491f6..bacb0c16269 100644 --- a/AABB_tree/demo/AABB_tree/Scene.cpp +++ b/AABB_tree/demo/AABB_tree/Scene.cpp @@ -657,8 +657,8 @@ void Scene::generate_edge_points(const unsigned int nb_points) typedef Tree::Object_and_primitive_id Object_and_primitive_id; std::cout << "Construct AABB tree..."; - Tree tree( boost::edges(*m_pPolyhedron).first, - boost::edges(*m_pPolyhedron).second, + Tree tree( CGAL::undirected_edges(*m_pPolyhedron).first, + CGAL::undirected_edges(*m_pPolyhedron).second, *m_pPolyhedron); std::cout << "done." << std::endl; diff --git a/AABB_tree/demo/AABB_tree/Scene.h b/AABB_tree/demo/AABB_tree/Scene.h index ba6d3998812..1b2209c0a3d 100644 --- a/AABB_tree/demo/AABB_tree/Scene.h +++ b/AABB_tree/demo/AABB_tree/Scene.h @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/Operations_on_polyhedra/include/CGAL/Polyhedron_slicer_3.h b/Operations_on_polyhedra/include/CGAL/Polyhedron_slicer_3.h index bed493b9498..bfb96df2e38 100644 --- a/Operations_on_polyhedra/include/CGAL/Polyhedron_slicer_3.h +++ b/Operations_on_polyhedra/include/CGAL/Polyhedron_slicer_3.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -418,8 +419,8 @@ public: */ Polyhedron_slicer_3(const Polyhedron& polyhedron, const Kernel& kernel = Kernel()) : intersect_3_functor(kernel.intersect_3_object()), - tree( boost::edges(polyhedron).first, - boost::edges(polyhedron).second, + tree( undirected_edges(polyhedron).first, + undirected_edges(polyhedron).second, polyhedron) { }