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

Use Base_with_time_stamp

This commit is contained in:
Laurent Rineau 2023-01-20 13:54:29 +01:00
parent cddb01ab68
commit 1a9c20b5c0
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Triangulation_3.h> #include <CGAL/license/Triangulation_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Base_with_time_stamp.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/Constrained_triangulation_plus_2.h> #include <CGAL/Constrained_triangulation_plus_2.h>
@ -184,8 +185,9 @@ private:
std::bitset<3> is_edge_also_in_3d_triangulation; std::bitset<3> is_edge_also_in_3d_triangulation;
bool missing_subface = true; bool missing_subface = true;
}; };
using Vb = Triangulation_vertex_base_with_info_2<Vertex_info, using Vb1 = Triangulation_vertex_base_with_info_2<Vertex_info,
Projection_traits>; Projection_traits>;
using Vb = Base_with_time_stamp<Vb1>;
using Fb1 = Triangulation_face_base_with_info_2<Face_info, using Fb1 = Triangulation_face_base_with_info_2<Face_info,
Projection_traits>; Projection_traits>;
using Fb = Constrained_triangulation_face_base_2<Projection_traits, Fb1>; using Fb = Constrained_triangulation_face_base_2<Projection_traits, Fb1>;

19
Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Constrained_Delaunay_triangulation_3.h> #include <CGAL/Constrained_Delaunay_triangulation_3.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Surface_mesh.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/IO/File_binary_mesh_3.h> #include <CGAL/IO/File_binary_mesh_3.h>
@ -14,16 +14,17 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
typedef CGAL::Triangulation_data_structure_3< using K = CGAL::Exact_predicates_inexact_constructions_kernel;
CGAL::Constrained_Delaunay_triangulation_vertex_base_3<K>, using Vb = CGAL::Base_with_time_stamp<CGAL::Constrained_Delaunay_triangulation_vertex_base_3<K>>;
CGAL::Constrained_Delaunay_triangulation_cell_base_3<K> > Tds; using Cb = CGAL::Constrained_Delaunay_triangulation_cell_base_3<K>;
typedef CGAL::Delaunay_triangulation_3<K, Tds> Delaunay; using Tds = CGAL::Triangulation_data_structure_3<Vb, Cb>;
typedef Delaunay::Point Point; using Delaunay = CGAL::Delaunay_triangulation_3<K, Tds>;
using Point = Delaunay::Point;
using Point_3 = K::Point_3; using Point_3 = K::Point_3;
typedef CGAL::Surface_mesh<Point> Mesh; using Mesh = CGAL::Surface_mesh<Point>;
typedef boost::graph_traits<Mesh>::face_descriptor face_descriptor; using face_descriptor =boost::graph_traits<Mesh>::face_descriptor;
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {