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

fix name of classes that do not respect CGAL naming conventions 

AABB_HalfedgeGraph_segment_primitive -> AABB_halfedge_graph_segment_primitive
AABB_FaceGraph_triangle_primitive -> AABB_face_graph_triangle_primitive
This commit is contained in:
Sébastien Loriot 2013-07-23 17:46:50 +02:00
parent 4d54051234
commit 9c0808cad1
42 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AABB_tree/demo/AABB_tree/Scene.cpp
View File

@ -460,7 +460,7 @@ void Scene::generate_points_in(const unsigned int nb_points,
return;
}
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
@ -512,7 +512,7 @@ void Scene::generate_inside_points(const unsigned int nb_points)
return;
}
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
@ -553,7 +553,7 @@ void Scene::generate_boundary_segments(const unsigned int nb_slices)
return;
}
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef Tree::Object_and_primitive_id Object_and_primitive_id;
@ -602,7 +602,7 @@ void Scene::generate_boundary_points(const unsigned int nb_points)
return;
}
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef Tree::Object_and_primitive_id Object_and_primitive_id;
@ -651,7 +651,7 @@ void Scene::generate_edge_points(const unsigned int nb_points)
return;
}
typedef CGAL::AABB_HalfedgeGraph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_halfedge_graph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef Tree::Object_and_primitive_id Object_and_primitive_id;

8
AABB_tree/demo/AABB_tree/Scene.h
View File

@ -12,8 +12,8 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h>
#include <CGAL/AABB_HalfedgeGraph_segment_primitive.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <QtCore/qglobal.h>
#include <QGLViewer/manipulatedFrame.h>
@ -30,11 +30,11 @@ public:
typedef CGAL::Bbox_3 Bbox;
private:
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Facet_Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Facet_Primitive;
typedef CGAL::AABB_traits<Kernel, Facet_Primitive> Facet_Traits;
typedef CGAL::AABB_tree<Facet_Traits> Facet_tree;
typedef CGAL::AABB_HalfedgeGraph_segment_primitive<Polyhedron> Edge_Primitive;
typedef CGAL::AABB_halfedge_graph_segment_primitive<Polyhedron> Edge_Primitive;
typedef CGAL::AABB_traits<Kernel, Edge_Primitive> Edge_Traits;
typedef CGAL::AABB_tree<Edge_Traits> Edge_tree;

4
AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h
View File

@ -15,8 +15,8 @@ The `Primitive` type can be, e.g., a wrapper around a `Handle`. Assume for insta
\cgalHasModel `CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,Tag_false,CacheDatum>`
\cgalHasModel `CGAL::AABB_segment_primitive<Iterator,CacheDatum>`
\cgalHasModel `CGAL::AABB_triangle_primitive<Iterator,CacheDatum>`
\cgalHasModel `CGAL::AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,Tag_false,CacheDatum>`
\cgalHasModel `CGAL::AABB_FaceGraph_triangle_primitive<FaceGraph,Tag_false,CacheDatum>`
\cgalHasModel `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,Tag_false,CacheDatum>`
\cgalHasModel `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,Tag_false,CacheDatum>`
*/
class AABBPrimitive {

4
AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h
View File

@ -22,8 +22,8 @@ The `Datum` would be a `Triangle_3` and the `Id` a `std::size_t`. The shared dat
The method `datum(const Shared_data&)` then returns a triangle from the vector.
\cgalHasModel `CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,Tag_true,CacheDatum>`
\cgalHasModel `CGAL::AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,Tag_true,CacheDatum>`
\cgalHasModel `CGAL::AABB_FaceGraph_triangle_primitive<FaceGraph,Tag_true,CacheDatum>`
\cgalHasModel `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,Tag_true,CacheDatum>`
\cgalHasModel `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,Tag_true,CacheDatum>`
*/
class AABBPrimitiveWithSharedData {

4
AABB_tree/doc/AABB_tree/PackageDescription.txt
View File

@ -36,6 +36,6 @@
- `CGAL::AABB_triangle_primitive<Iterator,CacheDatum>`
- `CGAL::AABB_segment_primitive<Iterator,CacheDatum>`
- `CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
- `CGAL::AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
- `CGAL::AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
- `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
- `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
*/

4
AABB_tree/doc/AABB_tree/examples.txt
View File

@ -9,6 +9,6 @@
\example AABB_tree/AABB_polyhedron_facet_intersection_example.cpp
\example AABB_tree/AABB_segment_3_example.cpp
\example AABB_tree/AABB_triangle_3_example.cpp
\example AABB_tree/AABB_HalfedgeGraph_edge_example.cpp
\example AABB_tree/AABB_FaceGraph_triangle_example.cpp
\example AABB_tree/AABB_halfedge_graph_edge_example.cpp
\example AABB_tree/AABB_face_graph_triangle_example.cpp
*/

4
AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitive.tex
View File

@ -60,8 +60,8 @@ The \ccc{Primitive} type can be, e.g., a wrapper around a \ccc{Handle}. Assume f
\ccc{AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,Tag_false,CacheDatum>},\\
\ccc{AABB_segment_primitive<Iterator,CacheDatum>},\\
\ccc{AABB_triangle_primitive<Iterator,CacheDatum>},\\
\ccc{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,Tag_false,CacheDatum>},\\
\ccc{AABB_FaceGraph_triangle_primitive<FaceGraph,Tag_false,CacheDatum>}.\\
\ccc{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,Tag_false,CacheDatum>},\\
\ccc{AABB_face_graph_triangle_primitive<FaceGraph,Tag_false,CacheDatum>}.\\
\end{ccRefConcept}

4
AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitiveWithSharedData.tex
View File

@ -47,8 +47,8 @@ The \ccc{Primitive} type can be, e.g., a wrapper around a \ccc{Handle}. Assume f
\ccHasModels
\ccc{AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,Tag_true,CacheDatum>},\\
\ccc{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,Tag_true,CacheDatum>},\\
\ccc{AABB_FaceGraph_triangle_primitive<FaceGraph,Tag_true,CacheDatum>}.\\
\ccc{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,Tag_true,CacheDatum>},\\
\ccc{AABB_face_graph_triangle_primitive<FaceGraph,Tag_true,CacheDatum>}.\\
\end{ccRefConcept}

8
AABB_tree/doc_tex/AABB_tree_ref/AABB_FaceGraph_triangle_primitive.tex
View File

@ -1,6 +1,6 @@
\ccRefPageBegin
\begin{ccRefClass}{AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}
\begin{ccRefClass}{AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}
\ccDefinition
@ -19,7 +19,7 @@ will be factorized so that the size of the primitive is reduced. In the latter c
\ccc{CacheDatum} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce
the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored).\\
\ccInclude{CGAL/AABB_FaceGraph_triangle_primitive.h}
\ccInclude{CGAL/AABB_face_graph_triangle_primitive.h}
\ccTypes
\ccTypedef{typedef boost::property_traits< boost::property_map< FaceGraph, vertex_point_t>::type >::value_type Point;}{The point type.}
@ -33,7 +33,7 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored)
\ccConstructor{
template <class Iterator>
AABB_FaceGraph_triangle_primitive(Iterator it,const FaceGraph& graph)}
AABB_face_graph_triangle_primitive(Iterator it,const FaceGraph& graph)}
{Constructs a primitive. \ccc{Iterator} is an input iterator with \ccc{Id} as \ccc{value_type}.}
@ -41,7 +41,7 @@ AABB_FaceGraph_triangle_primitive(Iterator it,const FaceGraph& graph)}
\ccc{AABBPrimitive},\\
\ccc{AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>},\\
\ccc{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>}.\\
\ccc{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>}.\\
\end{ccRefClass}

10
AABB_tree/doc_tex/AABB_tree_ref/AABB_HalfedgeGraph_segment_primitive.tex
View File

@ -1,6 +1,6 @@
\ccRefPageBegin
\begin{ccRefClass}{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>}
\begin{ccRefClass}{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>}
\ccDefinition
@ -19,7 +19,7 @@ will be factorized so that the size of the primitive is reduced. In the latter c
\ccc{CacheDatum} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce
the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored).
\ccInclude{CGAL/AABB_HalfedgeGraph_segment_primitive.h}
\ccInclude{CGAL/AABB_halfedge_graph_segment_primitive.h}
\ccTypes
\ccTypedef{typedef boost::property_traits< boost::property_map< HalfedgeGraph, vertex_point_t>::type >::value_type Point;}{The point type.}
@ -33,7 +33,7 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored)
\ccConstructor{
template <class Iterator>
AABB_HalfedgeGraph_segment_primitive(Iterator it,const HalfedgeGraph& graph)}
AABB_halfedge_graph_segment_primitive(Iterator it,const HalfedgeGraph& graph)}
{Constructs a primitive. \ccc{Iterator} is an input iterator with \ccc{Id} as \ccc{value_type}.
The example below gives a way to call this constructor the insert-by-range method of the class \ccc{CGAL::AABB_tree<Traits>}.}
@ -42,9 +42,9 @@ The example below gives a way to call this constructor the insert-by-range metho
\ccc{AABBPrimitive},\\
\ccc{AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>},\\
\ccc{AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.\\
\ccc{AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.\\
\ccIncludeExampleCode{AABB_tree/AABB_HalfedgeGraph_edge_example.cpp}
\ccIncludeExampleCode{AABB_tree/AABB_halfedge_graph_edge_example.cpp}
\end{ccRefClass}

2
AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_segment_primitive.tex
View File

@ -17,7 +17,7 @@
%% \ccHtmlCrossLink{} %% add further rules for cross referencing links
%% \ccHtmlIndexC[class]{} %% add further index entries
This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>} should be used instead.
This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>} should be used instead.
\begin{ccDeprecated}

2
AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_triangle_primitive.tex
View File

@ -18,7 +18,7 @@
%% \ccHtmlCrossLink{} %% add further rules for cross referencing links
%% \ccHtmlIndexC[class]{} %% add further index entries
This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>} should be used instead.
This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>} should be used instead.
\begin{ccDeprecated}
\ccDefinition

4
AABB_tree/doc_tex/AABB_tree_ref/AABB_primitive.tex
View File

@ -40,8 +40,8 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored)
\ccc{AABBPrimitive},\\
\ccc{AABB_segment_primitive<Iterator,CacheDatum>},\\
\ccc{AABB_triangle_primitive<Iterator,CacheDatum>},\\
\ccc{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>},\\
\ccc{AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.
\ccc{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>},\\
\ccc{AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.
\end{ccRefClass}

4
AABB_tree/doc_tex/AABB_tree_ref/AABB_segment_primitive.tex
View File

@ -33,8 +33,8 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored)
\ccc{AABBPrimitive},\\
\ccc{AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>},\\
\ccc{AABB_triangle_primitive<Iterator,CacheDatum>},\\
\ccc{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>},\\
\ccc{AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.
\ccc{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>},\\
\ccc{AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.
\end{ccRefClass}

4
AABB_tree/doc_tex/AABB_tree_ref/AABB_triangle_primitive.tex
View File

@ -33,8 +33,8 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored)
\ccc{AABBPrimitive},\\
\ccc{AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>},\\
\ccc{AABB_segment_primitive<Iterator,CacheDatum>},\\
\ccc{AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>},\\
\ccc{AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.
\ccc{AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>},\\
\ccc{AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}.
\end{ccRefClass}

4
AABB_tree/doc_tex/AABB_tree_ref/introduction.tex
View File

@ -17,5 +17,5 @@
\ccRefIdfierPage{CGAL::AABB_triangle_primitive<Iterator,CacheDatum>}\\
\ccRefIdfierPage{CGAL::AABB_segment_primitive<Iterator,CacheDatum>}\\
\ccRefIdfierPage{CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>}\\
\ccRefIdfierPage{CGAL::AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>}\\
\ccRefIdfierPage{AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}
\ccRefIdfierPage{CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>}\\
\ccRefIdfierPage{AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>}

4
AABB_tree/doc_tex/AABB_tree_ref/main.tex
View File

@ -14,8 +14,8 @@
\input{AABB_tree_ref/AABB_primitive.tex}
\input{AABB_tree_ref/AABB_triangle_primitive.tex}
\input{AABB_tree_ref/AABB_segment_primitive.tex}
\input{AABB_tree_ref/AABB_HalfedgeGraph_segment_primitive.tex}
\input{AABB_tree_ref/AABB_FaceGraph_triangle_primitive.tex}
\input{AABB_tree_ref/AABB_halfedge_graph_segment_primitive.tex}
\input{AABB_tree_ref/AABB_face_graph_triangle_primitive.tex}
\input{AABB_tree_ref/AABBTraits.tex}
\input{AABB_tree_ref/AABB_traits.tex}
\input{AABB_tree_ref/AABB_polyhedron_triangle_primitive.tex}

4
AABB_tree/examples/AABB_tree/AABB_FaceGraph_triangle_example.cpp → AABB_tree/examples/AABB_tree/AABB_face_graph_triangle_example.cpp
View File

@ -6,7 +6,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/bind.hpp>
@ -15,7 +15,7 @@ typedef K::FT FT;
typedef K::Point_3 Point;
typedef K::Segment_3 Segment;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_FaceGraph_triangle_primitive<const Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<const Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;

4
AABB_tree/examples/AABB_tree/AABB_HalfedgeGraph_edge_example.cpp → AABB_tree/examples/AABB_tree/AABB_halfedge_graph_edge_example.cpp
View File

@ -7,7 +7,7 @@
#include <CGAL/AABB_traits.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h>
#include <CGAL/AABB_HalfedgeGraph_segment_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/bind.hpp>
@ -16,7 +16,7 @@ typedef K::FT FT;
typedef K::Point_3 Point;
typedef K::Triangle_3 Triangle;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_HalfedgeGraph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_halfedge_graph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;

4
AABB_tree/examples/AABB_tree/AABB_insertion_example.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
typedef CGAL::Simple_cartesian<double> K;
@ -12,7 +12,7 @@ typedef K::FT FT;
typedef K::Point_3 Point;
typedef K::Segment_3 Segment;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef Tree::Point_and_primitive_id Point_and_primitive_id;

4
AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp
View File

@ -6,7 +6,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_HalfedgeGraph_segment_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
typedef CGAL::Simple_cartesian<double> K;
@ -14,7 +14,7 @@ typedef K::FT FT;
typedef K::Point_3 Point;
typedef K::Triangle_3 Triangle;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_HalfedgeGraph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_halfedge_graph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;

4
AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_distance_example.cpp
View File

@ -7,14 +7,14 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
typedef CGAL::Simple_cartesian<double> K;
typedef K::FT FT;
typedef K::Point_3 Point;
typedef K::Segment_3 Segment;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef Tree::Point_and_primitive_id Point_and_primitive_id;

4
AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_intersection_example.cpp
View File

@ -5,7 +5,7 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/Polyhedron_3.h>
typedef CGAL::Simple_cartesian<double> K;
@ -14,7 +14,7 @@ typedef K::Plane_3 Plane;
typedef K::Vector_3 Vector;
typedef K::Segment_3 Segment;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef boost::optional< Tree::Intersection_and_primitive_id<Segment>::Type > Segment_intersection;

14
AABB_tree/include/CGAL/AABB_FaceGraph_triangle_primitive.h → AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
View File

@ -19,8 +19,8 @@
// Author(s) : Sebastien Loriot
//
#ifndef CGAL_AABB_FACEGRAPH_TRIANGLE_PRIMITIVE_H
#define CGAL_AABB_FACEGRAPH_TRIANGLE_PRIMITIVE_H
#ifndef CGAL_AABB_FACE_GRAPH_TRIANGLE_PRIMITIVE_H
#define CGAL_AABB_FACE_GRAPH_TRIANGLE_PRIMITIVE_H
#include <CGAL/AABB_primitive.h>
#include <CGAL/Polyhedron_3.h>
@ -48,13 +48,13 @@ namespace CGAL {
* The default is `CGAL::Tag_false` (datum is not stored).
*\sa `AABBPrimitive`
*\sa `AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
*\sa `AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
*\sa `AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
*/
template < class FaceGraph,
class VertexPointPMap = Default,
class OneFaceGraphPerTree = Default,
class CacheDatum=Tag_false >
class AABB_FaceGraph_triangle_primitive
class AABB_face_graph_triangle_primitive
#ifndef DOXYGEN_RUNNING
: public AABB_primitive< typename boost::mpl::if_<
typename boost::is_const<FaceGraph>::type,
@ -105,14 +105,14 @@ public:
Constructs a primitive.
*/
template <class Iterator>
AABB_FaceGraph_triangle_primitive(Iterator it, FaceGraph& graph)
AABB_face_graph_triangle_primitive(Iterator it, FaceGraph& graph)
: Base( Id_(it),
Triangle_property_map(&graph),
Point_property_map(&graph) ){}
/// For backward-compatibility with AABB_polyhedron_triangle_primitive only.
/// `Id_` is `Facet_const_handle` if `FaceGraph` is const and `Facet_handle` otherwise.
AABB_FaceGraph_triangle_primitive(Id_ id)
AABB_face_graph_triangle_primitive(Id_ id)
: Base( id,
Triangle_property_map(NULL),
Point_property_map(NULL) ){}
@ -132,5 +132,5 @@ public:
} // end namespace CGAL
#endif // CGAL_AABB_FACEGRAPH_TRIANGLE_PRIMITIVE_H
#endif // CGAL_AABB_FACE_GRAPH_TRIANGLE_PRIMITIVE_H

18
AABB_tree/include/CGAL/AABB_HalfedgeGraph_segment_primitive.h → AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
View File

@ -19,8 +19,8 @@
// Author(s) : Sebastien Loriot
//
#ifndef CGAL_AABB_HALFEDGEGRAPH_SEGMENT_PRIMITIVE_H
#define CGAL_AABB_HALFEDGEGRAPH_SEGMENT_PRIMITIVE_H
#ifndef CGAL_AABB_HALFEDGE_GRAPH_SEGMENT_PRIMITIVE_H
#define CGAL_AABB_HALFEDGE_GRAPH_SEGMENT_PRIMITIVE_H
#include <CGAL/AABB_primitive.h>
#include <CGAL/Polyhedron_3.h>
@ -62,13 +62,13 @@ namespace CGAL {
*
* \sa `AABBPrimitive`
* \sa `AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
* \sa `AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
* \sa `AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
*/
template < class HalfedgeGraph,
class VertexPointPMap = typename boost::property_map< HalfedgeGraph, vertex_point_t>::type,
class OneHalfedgeGraphPerTree = Tag_true,
class CacheDatum = Tag_false >
class AABB_HalfedgeGraph_segment_primitive
class AABB_halfedge_graph_segment_primitive
#ifndef DOXYGEN_RUNNING
: public AABB_primitive< typename boost::graph_traits<HalfedgeGraph>::edge_descriptor,
Segment_from_edge_descriptor_property_map<HalfedgeGraph,VertexPointPMap>,
@ -110,13 +110,13 @@ public:
/*!
Constructs a primitive.
\tparam Iterator is an input iterator with `Id` as value type.
This \ref AABB_tree/AABB_HalfedgeGraph_edge_example.cpp "example" gives a way to call this constructor
This \ref AABB_tree/AABB_halfedge_graph_edge_example.cpp "example" gives a way to call this constructor
using the insert-by-range method of the class `AABB_tree<Traits>`.
If `VertexPointPMap` is the default of the class, an additional constructor
is available with `vppm` set to `boost::get(vertex_point, graph)`.
*/
template <class Iterator>
AABB_HalfedgeGraph_segment_primitive(Iterator it, HalfedgeGraph& graph, VertexPointPMap vppm)
AABB_halfedge_graph_segment_primitive(Iterator it, HalfedgeGraph& graph, VertexPointPMap vppm)
: Base( Id_(*it),
Segment_property_map(&graph, vppm),
Point_property_map(&graph, vppm) )
@ -124,14 +124,14 @@ public:
#ifndef DOXYGEN_RUNNING
template <class Iterator>
AABB_HalfedgeGraph_segment_primitive(Iterator it, HalfedgeGraph& graph)
AABB_halfedge_graph_segment_primitive(Iterator it, HalfedgeGraph& graph)
: Base( Id_(*it),
Segment_property_map(&graph),
Point_property_map(&graph) ){}
#endif
/// For backward-compatibility with AABB_polyhedron_segment_primitive only
AABB_HalfedgeGraph_segment_primitive(Id_ id)
AABB_halfedge_graph_segment_primitive(Id_ id)
: Base( id,
Segment_property_map(NULL),
Point_property_map(NULL) ){}
@ -151,5 +151,5 @@ public:
} // end namespace CGAL
#endif // CGAL_AABB_HALFEDGEGRAPH_SEGMENT_PRIMITIVE_H
#endif // CGAL_AABB_HALFEDGE_GRAPH_SEGMENT_PRIMITIVE_H

4
AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h
View File

@ -27,7 +27,7 @@
#define CGAL_AABB_POLYHEDRON_SEGMENT_PRIMITIVE_H_
#define CGAL_DEPRECATED_HEADER "<CGAL/AABB_polyhedron_segment_primitive.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_HalfedgeGraph_segment_primitive.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_halfedge_graph_segment_primitive.h>"
#include <CGAL/internal/deprecation_warning.h>
namespace CGAL {
@ -35,7 +35,7 @@ namespace CGAL {
/// \addtogroup PkgAABB_tree
/// @{
/// \deprecated This class is deprecated since \cgal 4.3, the class
/// `AABB_HalfedgeGraph_segment_primitive` should be used instead.
/// `AABB_halfedge_graph_segment_primitive` should be used instead.
///
/// Primitive type that wraps a halfedge handle of a
/// polyhedron, which is used as id, and allows the construction

4
AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
View File

@ -23,13 +23,13 @@
#define CGAL_AABB_POLYHEDRON_TRIANGLE_PRIMITIVE_H_
#define CGAL_DEPRECATED_HEADER "<CGAL/AABB_polyhedron_triangle_primitive.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_FaceGraph_triangle_primitive.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_face_graph_triangle_primitive.h>"
#include <CGAL/internal/deprecation_warning.h>
namespace CGAL {
/// \ingroup PkgAABB_tree
/// \deprecated This class is deprecated since \cgal 4.3, the class
/// `AABB_HalfedgeGraph_triangle_primitive` should be used instead.
/// `AABB_face_graph_triangle_primitive` should be used instead.
///
/// Primitive type that wraps a facet handle of a polyhedron,
/// which is used as id, and allows the construction of the datum on

4
AABB_tree/include/CGAL/AABB_primitive.h
View File

@ -76,8 +76,8 @@ public:
* \sa `AABBPrimitive`
* \sa `AABB_segment_primitive<Iterator,CacheDatum>`
* \sa `AABB_triangle_primitive<Iterator,CacheDatum>`
* \sa `AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
* \sa `AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
* \sa `AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
* \sa `AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
*/
template < class Id,
class ObjectPropertyMap,

4
AABB_tree/include/CGAL/AABB_segment_primitive.h
View File

@ -71,8 +71,8 @@ namespace internal {
* \sa `AABBPrimitive`
* \sa `AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
* \sa `AABB_triangle_primitive<Iterator,CacheDatum>`
* \sa `AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
* \sa `AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
* \sa `AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
* \sa `AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
*/
template < class GeomTraits,
class Iterator,

4
AABB_tree/include/CGAL/AABB_triangle_primitive.h
View File

@ -71,8 +71,8 @@ namespace internal {
* \sa `AABBPrimitive`
* \sa `AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
* \sa `AABB_segment_primitive<Iterator,CacheDatum>`
* \sa `AABB_HalfedgeGraph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
* \sa `AABB_FaceGraph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
* \sa `AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>`
* \sa `AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>`
*/
template < class GeomTraits,
class Iterator,

8
AABB_tree/test/AABB_tree/AABB_test_util.h
View File

@ -27,8 +27,8 @@
#include <CGAL/Cartesian.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_HalfedgeGraph_segment_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/internal/AABB_tree/Primitive_helper.h>
#include <boost/mem_fn.hpp>
@ -214,7 +214,7 @@ struct Primitive_generator {};
template<class K, class Polyhedron>
struct Primitive_generator<SEGMENT, K, Polyhedron>
{
typedef CGAL::AABB_HalfedgeGraph_segment_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_halfedge_graph_segment_primitive<Polyhedron> Primitive;
typedef typename Polyhedron::Edge_iterator iterator;
iterator begin(Polyhedron& p) { return p.edges_begin(); }
@ -224,7 +224,7 @@ struct Primitive_generator<SEGMENT, K, Polyhedron>
template<class K, class Polyhedron>
struct Primitive_generator<TRIANGLE, K, Polyhedron>
{
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef typename Polyhedron::Facet_iterator iterator;
iterator begin(Polyhedron& p) { return p.facets_begin(); }

4
AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
View File

@ -14,7 +14,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
@ -68,7 +68,7 @@ boost::tuple<std::size_t, std::size_t, std::size_t, long> test(const char* name)
typedef typename K::Segment_3 Segment;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_FaceGraph_triangle_primitive<const Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<const Polyhedron> Primitive;
typedef CGAL::AABB_traits<K, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;

4
AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
View File

@ -37,7 +37,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
template <class K>
int test()
@ -55,7 +55,7 @@ int test()
ifs >> polyhedron;
// construct tree from facets
typedef typename CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef typename CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef typename CGAL::AABB_traits<K,Primitive> Traits;
typedef typename CGAL::AABB_tree<Traits> Tree;
typedef typename Tree::Object_and_primitive_id Object_and_primitive_id;

4
Installation/CHANGES
View File

@ -116,11 +116,11 @@ Release date: September 2013
replaced by a template class Intersection_and_primitive_id<Query> to
determine the type depending on the query object type.
- Introduce the class AABB_HalfedgeGraph_segment_primitive which replaces the
- Introduce the class AABB_halfedge_graph_segment_primitive which replaces the
class AABB_polyhedron_segment_primitive (which is now deprecated). The new
class is more general and can be used with any model of HalfedgeGraph.
- Introduce the class AABB_FaceGraph_triangle_primitive which replaces the
- Introduce the class AABB_face_graph_triangle_primitive which replaces the
class AABB_polyhedron_triangle_primitive (which is now deprecated).
- Document the classes AABB_segment_primitive and AABB_triangle_primitive

4
Installation/changes.html
View File

@ -175,9 +175,9 @@ David A. Wheeler's 'SLOCCount'</a>, restricted to the <code>include/CGAL/</code>
<code>Intersection_and_primitive_id&lt;Query&gt;</code> to determine the type depending on the
query object type.
</li>
<li> Introduce the class <code>AABB_HalfedgeGraph_segment_primitive</code> which replaces the class <code>AABB_polyhedron_segment_primitive</code> (which is now deprecated).
<li> Introduce the class <code>AABB_halfedge_graph_segment_primitive</code> which replaces the class <code>AABB_polyhedron_segment_primitive</code> (which is now deprecated).
The new class is more general and can be used with any model of <code>HalfedgeGraph</code>.</li>
<li>Introduce the class <code>AABB_FaceGraph_triangle_primitive</code> which replaces the class <code>AABB_polyhedron_triangle_primitive</code> (which is now deprecated).</li>
<li>Introduce the class <code>AABB_face_graph_triangle_primitive</code> which replaces the class <code>AABB_polyhedron_triangle_primitive</code> (which is now deprecated).</li>
<li>Document the classes <code>AABB_segment_primitive</code> and <code>AABB_triangle_primitive</code> that were already used in some examples.</li>
<li>Add a generic primitive class <code>AABB_primitive</code> that allows to define a primitive type by defining only two property maps.</li>
<li>Introduce a new concept of primitive <code>AABBPrimitiveWithSharedData</code>. It allows to have some data shared between the primitives stored in a <code>AABB_tree</code>.

4
Operations_on_polyhedra/include/CGAL/AABB_polyhedral_oracle.h
View File

@ -28,7 +28,7 @@
#include <CGAL/point_generators_3.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <boost/shared_ptr.hpp>
@ -50,7 +50,7 @@ namespace CGAL {
typedef Self Surface_3;
// AABB tree
typedef AABB_FaceGraph_triangle_primitive<const Polyhedron> AABB_primitive;
typedef AABB_face_graph_triangle_primitive<const Polyhedron> AABB_primitive;
typedef class AABB_traits<Kernel,AABB_primitive> AABB_traits;
typedef AABB_tree<AABB_traits> Tree;
typedef typename AABB_traits::Bounding_box Bounding_box;

4
Operations_on_polyhedra/include/CGAL/Polyhedron_slicer_3.h
View File

@ -23,7 +23,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_HalfedgeGraph_segment_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h>
#include <CGAL/Vector_3.h>
@ -48,7 +48,7 @@ template<class Polyhedron, class Kernel>
class Polyhedron_slicer_3
{
private:
typedef AABB_HalfedgeGraph_segment_primitive<const Polyhedron> AABB_primitive;
typedef AABB_halfedge_graph_segment_primitive<const Polyhedron> AABB_primitive;
typedef AABB_traits<Kernel, AABB_primitive> AABB_traits_;
typedef AABB_tree<AABB_traits_> AABB_tree_;

4
Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
View File

@ -10,7 +10,7 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/internal/AABB_tree/AABB_drawing_traits.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -27,7 +27,7 @@
//typedef CGAL::Simple_cartesian<double> Epic_kernel;
typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic_kernel;
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> AABB_primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> AABB_primitive;
typedef CGAL::AABB_traits<Epic_kernel,AABB_primitive> AABB_traits;
typedef CGAL::AABB_tree<AABB_traits> AABB_tree;

4
Polyhedron/demo/Polyhedron/Polyhedron_demo_poisson_plugin_impl.cpp
View File

@ -7,7 +7,7 @@
// CGAL
#include <CGAL/AABB_tree.h> // must be included before kernel
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/Timer.h>
#include <CGAL/Surface_mesh_default_triangulation_3.h>
#include <CGAL/make_surface_mesh.h>
@ -39,7 +39,7 @@ typedef CGAL::Surface_mesh_complex_2_in_triangulation_3<STr> C2t3;
typedef CGAL::Implicit_surface_3<Kernel, Poisson_reconstruction_function> Surface_3;
// AABB tree
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_traits;
typedef CGAL::AABB_tree<AABB_traits> AABB_tree;

4
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
View File

@ -6,12 +6,12 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <QVariant>
#include <list>
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_traits;
typedef CGAL::AABB_tree<AABB_traits> Input_facets_AABB_tree;

4
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
View File

@ -8,7 +8,7 @@
// CGAL
#include <CGAL/AABB_tree.h> // must be included before kernel
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/Timer.h>
#include <CGAL/Surface_mesh_default_triangulation_3.h>
#include <CGAL/make_surface_mesh.h>
@ -40,7 +40,7 @@ typedef CGAL::Surface_mesh_complex_2_in_triangulation_3<STr> C2t3;
typedef CGAL::Poisson_implicit_surface_3<Kernel, Poisson_reconstruction_function> Surface_3;
// AABB tree
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_traits;
typedef CGAL::AABB_tree<AABB_traits> AABB_tree;

4
Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/poisson_reconstruction.cpp
View File

@ -11,7 +11,7 @@
// CGAL
#include <CGAL/AABB_tree.h> // must be included before kernel
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_FaceGraph_triangle_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Timer.h>
#include <CGAL/trace.h>
@ -64,7 +64,7 @@ typedef CGAL::Surface_mesh_complex_2_in_triangulation_3<STr> C2t3;
typedef CGAL::Poisson_implicit_surface_3<Kernel, Poisson_reconstruction_function> Surface_3;
// AABB tree
typedef CGAL::AABB_FaceGraph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_traits;
typedef CGAL::AABB_tree<AABB_traits> AABB_tree;