This commit is contained in:
Maxime Gimeno 2021-03-19 12:00:08 +01:00
parent c2628c16e1
commit 735567531b
17 changed files with 39 additions and 39 deletions

View File

@ -15,7 +15,7 @@
#include <CGAL/license/GraphicsView.h> #include <CGAL/license/GraphicsView.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
@ -887,7 +887,7 @@ protected:
bool is_process; bool is_process;
}; };
typedef CGAL::Triangulation_2_projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits; typedef CGAL::Projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits;
typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb; typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb;
typedef CGAL::Triangulation_face_base_with_info_2<Face_info, P_traits> Fb1; typedef CGAL::Triangulation_face_base_with_info_2<Face_info, P_traits> Fb1;
typedef CGAL::Constrained_triangulation_face_base_2<P_traits, Fb1> Fb; typedef CGAL::Constrained_triangulation_face_base_2<P_traits, Fb1> Fb;

View File

@ -3,7 +3,7 @@ namespace CGAL{
/*! /*!
\ingroup PkgTriangulation2TriangulationClasses \ingroup PkgTriangulation2TriangulationClasses
The class `Triangulation_2_projection_traits_3` works similarly as the `Projection_traits_xy_3`, The class `Projection_traits_3` works similarly as the `Projection_traits_xy_3`,
`Projection_traits_xz_3` and `Projection_traits_yz_3` traits classes, by enabling `Projection_traits_xz_3` and `Projection_traits_yz_3` traits classes, by enabling
the use of 2D algorithms on the projections of 3D data on an arbitrary plane. the use of 2D algorithms on the projections of 3D data on an arbitrary plane.
@ -22,7 +22,7 @@ provides exact predicates.
*/ */
template <class K> template <class K>
class Triangulation_2_projection_traits_3 class Projection_traits_3
{ {
public: public:
///\name Types ///\name Types
@ -50,7 +50,7 @@ public:
* *
* \param normal a vector orthogonal to the projection plane. * \param normal a vector orthogonal to the projection plane.
*/ */
Triangulation_2_projection_traits_3(const typename K::Vector_3& normal); Projection_traits_3(const typename K::Vector_3& normal);
///@} ///@}
}; };

View File

@ -71,7 +71,7 @@
- `CGAL::Simple_cartesian<FieldNumberType>` - `CGAL::Simple_cartesian<FieldNumberType>`
- `CGAL::Simple_homogeneous<RingNumberType>` - `CGAL::Simple_homogeneous<RingNumberType>`
- `CGAL::Projection_traits_xy_3<K>` - `CGAL::Projection_traits_xy_3<K>`
- `CGAL::Triangulation_2_projection_traits_3<K>` - `CGAL::Projection_traits_3<K>`
\cgalCRPSection{Predefined Kernels} \cgalCRPSection{Predefined Kernels}

View File

@ -11,8 +11,8 @@
// Author(s) : Laurent Rineau // Author(s) : Laurent Rineau
#ifndef CGAL_TRIANGULATION_2_PROJECTION_TRAITS_3_H #ifndef CGAL_PROJECTION_TRAITS_3_H
#define CGAL_TRIANGULATION_2_PROJECTION_TRAITS_3_H #define CGAL_PROJECTION_TRAITS_3_H
#include <CGAL/internal/Triangulation_2_filtered_projection_traits_3.h> #include <CGAL/internal/Triangulation_2_filtered_projection_traits_3.h>
@ -24,27 +24,27 @@ template < class Filtered_kernel >
class Triangulation_2_filtered_projection_traits_3; class Triangulation_2_filtered_projection_traits_3;
template <class Kernel, bool Has_filtered_predicates=Kernel::Has_filtered_predicates> template <class Kernel, bool Has_filtered_predicates=Kernel::Has_filtered_predicates>
class Triangulation_2_projection_traits_3 class Projection_traits_3
: public Triangulation_2_projection_traits_base_3<Kernel> : public Triangulation_2_projection_traits_base_3<Kernel>
{ {
public: public:
explicit explicit
Triangulation_2_projection_traits_3(const typename Kernel::Vector_3& n_) Projection_traits_3(const typename Kernel::Vector_3& n_)
: Triangulation_2_projection_traits_base_3<Kernel>(n_) : Triangulation_2_projection_traits_base_3<Kernel>(n_)
{} {}
}; };
template <class Kernel> template <class Kernel>
class Triangulation_2_projection_traits_3<Kernel, true> class Projection_traits_3<Kernel, true>
: public Triangulation_2_filtered_projection_traits_3<Kernel> : public Triangulation_2_filtered_projection_traits_3<Kernel>
{ {
public: public:
explicit explicit
Triangulation_2_projection_traits_3(const typename Kernel::Vector_3& n_) Projection_traits_3(const typename Kernel::Vector_3& n_)
: Triangulation_2_filtered_projection_traits_3<Kernel>(n_) : Triangulation_2_filtered_projection_traits_3<Kernel>(n_)
{} {}
}; };
} // end namespace CGAL } // end namespace CGAL
#endif // CGAL_TRIANGULATION_2_PROJECTION_TRAITS_3_H #endif // CGAL_PROJECTION_TRAITS_3_H

View File

@ -14,7 +14,7 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
@ -178,7 +178,7 @@ struct Face_info {
bool is_process; bool is_process;
}; };
typedef CGAL::Triangulation_2_projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits; typedef CGAL::Projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits;
typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb; typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb;
typedef CGAL::Triangulation_face_base_with_info_2<Face_info,P_traits> Fb1; typedef CGAL::Triangulation_face_base_with_info_2<Face_info,P_traits> Fb1;

View File

@ -22,7 +22,7 @@
#include <QGLBuffer> #include <QGLBuffer>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
@ -211,7 +211,7 @@ class Basic_viewer : public CGAL::QGLViewer, public QOpenGLFunctions
bool is_process; bool is_process;
}; };
typedef CGAL::Triangulation_2_projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits; typedef CGAL::Projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits;
typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb; typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb;
typedef CGAL::Triangulation_face_base_with_info_2<Face_info, P_traits> Fb1; typedef CGAL::Triangulation_face_base_with_info_2<Face_info, P_traits> Fb1;

View File

@ -3,12 +3,12 @@
#include <CGAL/Delaunay_mesher_2.h> #include <CGAL/Delaunay_mesher_2.h>
#include <CGAL/Delaunay_mesh_face_base_2.h> #include <CGAL/Delaunay_mesh_face_base_2.h>
#include <CGAL/Delaunay_mesh_size_criteria_2.h> #include <CGAL/Delaunay_mesh_size_criteria_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <iostream> #include <iostream>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K1; typedef CGAL::Exact_predicates_inexact_constructions_kernel K1;
typedef CGAL::Triangulation_2_projection_traits_3<K1> K; typedef CGAL::Projection_traits_3<K1> K;
typedef CGAL::Triangulation_vertex_base_2<K> Vb; typedef CGAL::Triangulation_vertex_base_2<K> Vb;
typedef CGAL::Delaunay_mesh_face_base_2<K> Fb; typedef CGAL::Delaunay_mesh_face_base_2<K> Fb;
typedef CGAL::Triangulation_data_structure_2<Vb, Fb> Tds; typedef CGAL::Triangulation_data_structure_2<Vb, Fb> Tds;

View File

@ -22,7 +22,7 @@
#include <CGAL/Cartesian_converter.h> #include <CGAL/Cartesian_converter.h>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Kernel/global_functions_3.h> #include <CGAL/Kernel/global_functions_3.h>
@ -211,7 +211,7 @@ struct Shell_polygons_visitor
// cases where a cdt is needed // cases where a cdt is needed
typedef typename Nef_polyhedron::Kernel Kernel; typedef typename Nef_polyhedron::Kernel Kernel;
typedef Triangulation_2_projection_traits_3<Kernel> P_traits; typedef Projection_traits_3<Kernel> P_traits;
typedef Triangulation_vertex_base_with_info_2<std::size_t, P_traits> Vb; typedef Triangulation_vertex_base_with_info_2<std::size_t, P_traits> Vb;
typedef Triangulation_face_base_with_info_2<FaceInfo2,P_traits> Fbb; typedef Triangulation_face_base_with_info_2<FaceInfo2,P_traits> Fbb;
typedef Constrained_triangulation_face_base_2<P_traits,Fbb> Fb; typedef Constrained_triangulation_face_base_2<P_traits,Fbb> Fb;

View File

@ -23,7 +23,7 @@
#include <CGAL/Default.h> #include <CGAL/Default.h>
#include <CGAL/boost/graph/Euler_operations.h> #include <CGAL/boost/graph/Euler_operations.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <boost/container/flat_map.hpp> #include <boost/container/flat_map.hpp>
@ -389,7 +389,7 @@ private:
typedef Intersection_nodes<TriangleMesh, VertexPointMap1, VertexPointMap2, typedef Intersection_nodes<TriangleMesh, VertexPointMap1, VertexPointMap2,
Predicates_on_constructions_needed> INodes; Predicates_on_constructions_needed> INodes;
typedef typename INodes::Exact_kernel EK; typedef typename INodes::Exact_kernel EK;
typedef Triangulation_2_projection_traits_3<EK> CDT_traits; typedef Projection_traits_3<EK> CDT_traits;
typedef Triangulation_vertex_base_with_info_2<Node_id,CDT_traits> Vb; typedef Triangulation_vertex_base_with_info_2<Node_id,CDT_traits> Vb;
typedef Constrained_triangulation_face_base_2<CDT_traits> Fb; typedef Constrained_triangulation_face_base_2<CDT_traits> Fb;
typedef Triangulation_data_structure_2<Vb,Fb> TDS_2; typedef Triangulation_data_structure_2<Vb,Fb> TDS_2;

View File

@ -28,7 +28,7 @@
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <queue> #include <queue>
#endif #endif
@ -1374,7 +1374,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
} }
// Checking the hole simplicity. // Checking the hole simplicity.
typedef Triangulation_2_projection_traits_3<Traits> P_traits; typedef Projection_traits_3<Traits> P_traits;
const P_traits p_traits(avg_normal); const P_traits p_traits(avg_normal);
if (!is_simple_2(P.begin(), P.end() - 1, p_traits)) { if (!is_simple_2(P.begin(), P.end() - 1, p_traits)) {
// std::cerr << "WARNING: simplicity, cdt 2 falls back to the original solution!" << std::endl; // std::cerr << "WARNING: simplicity, cdt 2 falls back to the original solution!" << std::endl;

View File

@ -24,7 +24,7 @@
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#else #else
#include <CGAL/use.h> #include <CGAL/use.h>
#endif #endif
@ -152,7 +152,7 @@ public:
#ifndef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2 #ifndef CGAL_TRIANGULATE_FACES_DO_NOT_USE_CDT2
if (use_cdt) if (use_cdt)
{ {
typedef CGAL::Triangulation_2_projection_traits_3<Traits> P_traits; typedef CGAL::Projection_traits_3<Traits> P_traits;
typedef CGAL::Triangulation_vertex_base_with_info_2<halfedge_descriptor, typedef CGAL::Triangulation_vertex_base_with_info_2<halfedge_descriptor,
P_traits> Vb; P_traits> Vb;
typedef CGAL::Triangulation_face_base_with_info_2<Face_info, typedef CGAL::Triangulation_face_base_with_info_2<Face_info,

View File

@ -154,7 +154,7 @@ struct lcc_priv{
bool is_process; bool is_process;
}; };
typedef CGAL::Triangulation_2_projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits; typedef CGAL::Projection_traits_3<CGAL::Exact_predicates_inexact_constructions_kernel> P_traits;
typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb; typedef CGAL::Triangulation_vertex_base_with_info_2<Vertex_info, P_traits> Vb;
typedef CGAL::Triangulation_face_base_with_info_2<Face_info, P_traits> Fb1; typedef CGAL::Triangulation_face_base_with_info_2<Face_info, P_traits> Fb1;
typedef CGAL::Constrained_triangulation_face_base_2<P_traits, Fb1> Fb; typedef CGAL::Constrained_triangulation_face_base_2<P_traits, Fb1> Fb;

View File

@ -18,7 +18,7 @@
#include <CGAL/minkowski_sum_3.h> #include <CGAL/minkowski_sum_3.h>
#include <CGAL/convex_decomposition_3.h> #include <CGAL/convex_decomposition_3.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h> #include <CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h>
@ -33,7 +33,7 @@ typedef Point_container Pc;
typedef Nef_polyhedron::Traits Traits; typedef Nef_polyhedron::Traits Traits;
typedef Nef_polyhedron::Halffacet Facet; typedef Nef_polyhedron::Halffacet Facet;
typedef CGAL::Triangulation_2_projection_traits_3<Traits> P_traits; typedef CGAL::Projection_traits_3<Traits> P_traits;
typedef Nef_polyhedron::Halfedge_const_handle Halfedge_handle; typedef Nef_polyhedron::Halfedge_const_handle Halfedge_handle;
struct Face_info { struct Face_info {
Nef_polyhedron::Halfedge_const_handle e[3]; Nef_polyhedron::Halfedge_const_handle e[3];

View File

@ -3,7 +3,7 @@
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Three/Scene_item.h> #include <CGAL/Three/Scene_item.h>
#include <queue> #include <queue>
@ -20,7 +20,7 @@ class FacetTriangulator
typedef typename Kernel::Vector_3 Vector; typedef typename Kernel::Vector_3 Vector;
typedef CGAL::Triangulation_2_projection_traits_3<Traits> P_traits; typedef CGAL::Projection_traits_3<Traits> P_traits;
typedef CGAL::Triangulation_vertex_base_with_info_2<halfedge_descriptor, typedef CGAL::Triangulation_vertex_base_with_info_2<halfedge_descriptor,
P_traits> Vb; P_traits> Vb;

View File

@ -488,7 +488,7 @@ See Section \ref Section_2D_Triangulations_Delaunay for an example.
deal with projections on the deal with projections on the
`yz` plane and `xz`-plane, `yz` plane and `xz`-plane,
respectively, as well as the geometric traits class respectively, as well as the geometric traits class
`Triangulation_2_projection_traits_3` that deals with projections on an `Projection_traits_3` that deals with projections on an
arbitrary plane, defined by its orthogonal vector. arbitrary plane, defined by its orthogonal vector.
\subsection Subsection_2D_Triangulations_Basic_Example Example of a Basic Triangulation \subsection Subsection_2D_Triangulations_Basic_Example Example of a Basic Triangulation

View File

@ -1,12 +1,12 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K1; typedef CGAL::Exact_predicates_inexact_constructions_kernel K1;
typedef CGAL::Triangulation_2_projection_traits_3<K1> K; typedef CGAL::Projection_traits_3<K1> K;
typedef CGAL::Exact_predicates_tag Itag; typedef CGAL::Exact_predicates_tag Itag;
typedef CGAL::Constrained_Delaunay_triangulation_2<K, CGAL::Default, Itag> CDT; typedef CGAL::Constrained_Delaunay_triangulation_2<K, CGAL::Default, Itag> CDT;

View File

@ -1,8 +1,8 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h> #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <CGAL/Triangulation_2_projection_traits_3.h> #include <CGAL/Projection_traits_3.h>
#include <string> #include <string>
#include <fstream> #include <fstream>
@ -69,11 +69,11 @@ int main()
bool ok = true; bool ok = true;
ok = ok && ok = ok &&
test<CGAL::Epick, test<CGAL::Epick,
CGAL::Triangulation_2_projection_traits_3<Epick> > CGAL::Projection_traits_3<Epick> >
("CDT_2 in a 3D plane, with Epick"); ("CDT_2 in a 3D plane, with Epick");
ok = ok && ok = ok &&
test<CGAL::Epeck, test<CGAL::Epeck,
CGAL::Triangulation_2_projection_traits_3<Epeck> > CGAL::Projection_traits_3<Epeck> >
("CDT_2 in a 3D plane, with Epeck"); ("CDT_2 in a 3D plane, with Epeck");
return ok ? 0 : 1; return ok ? 0 : 1;
} }