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

- Cleanup vertex_3 and cell_3. 

- Move #include <...short_names> before all the others.
This commit is contained in:
Sylvain Pion 2001-06-07 16:54:21 +00:00
parent e4e4d9dd54
commit 5f947ebea9
7 changed files with 36 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/Triangulation_3/changes.txt
View File

@ -1,3 +1,6 @@
Version 1.58 (7 June 01)
- Cleanup vertex_3 and cell_3.
Version 1.57 (5 June 01)
- Add missing typename for MipsPro.

2
Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -31,10 +31,10 @@
#include <list>
#include <algorithm>
#include <CGAL/Triangulation_short_names_3.h>
#include <CGAL/Triangulation_utils_3.h>
#include <CGAL/Triangulation_3.h>
#include <CGAL/Triangulation_short_names_3.h>
#include <CGAL/Delaunay_remove_tds_3.h>
#include <CGAL/Triangulation_face_base_2.h>

56
Packages/Triangulation_3/include/CGAL/Triangulation_cell_3.h
View File

@ -23,52 +23,37 @@
#ifndef CGAL_TRIANGULATION_CELL_3_H
#define CGAL_TRIANGULATION_CELL_3_H
#include <CGAL/Pointer.h>
#include <CGAL/Triangulation_data_structure_3.h>
#include <CGAL/Triangulation_short_names_3.h>
CGAL_BEGIN_NAMESPACE
template < class Gt, class Tds >
class Triangulation_vertex_3;
template < class Gt, class Tds >
class Triangulation_vertex_handle_3;
template < class Gt, class Tds >
class Triangulation_cell_handle_3;
template < class Gt, class Tds > class Triangulation_vertex_3;
template < class Gt, class Tds > class Triangulation_vertex_handle_3;
template < class Gt, class Tds > class Triangulation_cell_handle_3;
template < class Gt, class Tds >
class Triangulation_cell_3
: public Tds::Cell
{
public:
typedef typename Gt::Point_3 Point;
typedef typename Tds::Vertex Vtds;
typedef typename Tds::Cell Ctds;
typedef Triangulation_vertex_3<Gt,Tds> Vertex;
typedef Triangulation_vertex_handle_3<Gt,Tds> Vertex_handle;
typedef Triangulation_cell_handle_3<Gt,Tds> Cell_handle;
Triangulation_cell_3()
: Ctds()
{ }
public:
// Triangulation_cell_3(Tds& tds)
// : Ctds(tds)
// { }
typedef typename Gt::Point_3 Point;
Triangulation_cell_3()
: Ctds() {}
Triangulation_cell_3(Vertex_handle v0,
Vertex_handle v1,
Vertex_handle v2,
Vertex_handle v3)
: Ctds(&(*v0), &(*v1), &(*v2), &(*v3))
{}
: Ctds(&(*v0), &(*v1), &(*v2), &(*v3)) {}
Triangulation_cell_3(Vertex_handle v0,
Vertex_handle v1,
@ -79,8 +64,7 @@ public:
Cell_handle n2,
Cell_handle n3)
: Ctds(&(*v0), &(*v1), &(*v2), &(*v3),
&(*n0), &(*n1), &(*n2), &(*n3))
{}
&(*n0), &(*n1), &(*n2), &(*n3)) {}
// Vertex access functions
Vertex_handle vertex(int i) const
@ -119,11 +103,6 @@ public:
return Ctds::mirror_vertex(i);
}
int mirror_index(int i) const
{
return Ctds::mirror_index(i);
}
bool has_neighbor(Cell_handle c) const
{
return Ctds::has_neighbor( &(*c));
@ -156,16 +135,6 @@ public:
Ctds::set_neighbors(&(*n0), &(*n1), &(*n2), &(*n3));
}
void set_vertices()
{
Ctds::set_vertices();
}
void set_neighbors()
{
Ctds::set_neighbors();
}
void set_vertex(int i, Vertex_handle v)
{
Ctds::set_vertex(i, &(*v));
@ -175,11 +144,6 @@ public:
{
Ctds::set_neighbor(i, &(*n));
}
// bool is_valid(bool verbose = false, int level = 0) const
// {
// return Ctds::is_valid(verbose,level);
// }
};
CGAL_END_NAMESPACE

6
Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -37,8 +37,10 @@
#include <vector>
#include <CGAL/triple.h>
#include <CGAL/Triangulation_utils_3.h>
#include <CGAL/Triangulation_short_names_3.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_utils_3.h>
#include <CGAL/Triangulation_vertex_base_3.h>
#include <CGAL/Triangulation_cell_base_3.h>
@ -49,8 +51,6 @@
#include <CGAL/Triangulation_ds_iterators_3.h>
#include <CGAL/Triangulation_ds_circulators_3.h>
#include <CGAL/Triangulation_short_names_3.h>
CGAL_BEGIN_NAMESPACE
template <class TDS> class Triangulation_ds_cell_iterator_3;

2
Packages/Triangulation_3/include/CGAL/Triangulation_ds_cell_3.h
View File

@ -27,8 +27,8 @@
#ifndef CGAL_TRIANGULATION_DS_CELL_3_H
#define CGAL_TRIANGULATION_DS_CELL_3_H
#include <CGAL/Triangulation_utils_3.h>
#include <CGAL/Triangulation_short_names_3.h>
#include <CGAL/Triangulation_utils_3.h>
CGAL_BEGIN_NAMESPACE

3
Packages/Triangulation_3/include/CGAL/Triangulation_handles_3.h
View File

@ -23,14 +23,13 @@
#ifndef CGAL_TRIANGULATION_HANDLES_3_H
#define CGAL_TRIANGULATION_HANDLES_3_H
#include <CGAL/Triangulation_short_names_3.h>
#include <CGAL/Pointer.h>
#include <CGAL/Triangulation_vertex_3.h>
#include <CGAL/Triangulation_cell_3.h>
#include <CGAL/Triangulation_iterators_3.h>
#include <CGAL/Triangulation_circulators_3.h>
#include <CGAL/Triangulation_short_names_3.h>
CGAL_BEGIN_NAMESPACE
template < class Gt, class Tds > class Triangulation_cell_3;

87
Packages/Triangulation_3/include/CGAL/Triangulation_vertex_3.h
View File

@ -23,112 +23,59 @@
#ifndef CGAL_TRIANGULATION_VERTEX_3_H
#define CGAL_TRIANGULATION_VERTEX_3_H
#include <CGAL/Pointer.h>
//#include <CGAL/Triangulation_data_structure_3.h>
#include <CGAL/Triangulation_circulators_3.h>
#include <CGAL/Triangulation_short_names_3.h>
#include <CGAL/Triangulation_cell_3.h>
#include <CGAL/Triangulation_vertex_3.h>
#include <CGAL/Triangulation_handles_3.h>
#include <CGAL/Triangulation_short_names_3.h>
CGAL_BEGIN_NAMESPACE
template < class Gt, class Tds >
class Triangulation_cell_3;
template < class Gt, class Tds >
class Triangulation_vertex_handle_3;
template < class Gt, class Tds >
class Triangulation_cell_handle_3;
template < class Gt, class Tds > class Triangulation_cell_3;
template < class Gt, class Tds > class Triangulation_vertex_handle_3;
template < class Gt, class Tds > class Triangulation_cell_handle_3;
template<class Gt, class Tds >
class Triangulation_vertex_3
: public Tds::Vertex
{
public:
typedef typename Gt::Point_3 Point;
typedef typename Tds::Vertex Vtds;
typedef typename Tds::Cell Ctds;
typedef Triangulation_cell_3<Gt,Tds> Cell;
typedef Triangulation_vertex_handle_3<Gt,Tds> Vertex_handle;
typedef Triangulation_cell_handle_3<Gt,Tds> Cell_handle;
public:
typedef typename Gt::Point_3 Point;
Triangulation_vertex_3()
: Vtds()
{}
: Vtds() {}
Triangulation_vertex_3(const Point & p)
: Vtds(p)
{}
: Vtds(p) {}
Triangulation_vertex_3(const Point & p, Cell_handle c)
: Vtds(p, &(*c))
{}
: Vtds(p, &(*c)) {}
Triangulation_vertex_3(Cell_handle c)
: Vtds(&(*c))
{}
: Vtds(&(*c)) {}
void set_cell(Cell_handle c)
{
Vtds::set_cell(&(*c));
}
void set_point(const Point & p)
{
Vtds::set_point(p);
}
Cell_handle cell() const
{
return (Cell *) Vtds::cell();
}
Vertex_handle handle()
{
return Vertex_handle(this);
}
bool is_valid(bool verbose = false, int level = 0) const
{
return Vtds::is_valid(verbose,level);
}
// Vertex_circulator incident_vertices()
// {
// return Vertex_circulator(handle(), cell());
// }
// Vertex_circulator incident_vertices(const Cell_handle& c)
// {
// return Vertex_circulator(handle(), c);
// }
// Cell_circulator incident_cells()
// {
// return Cell_circulator(handle(), cell());
// }
// Cell_circulator incident_cells(const Cell_handle& c)
// {
// return Cell_circulator(handle(), c);
// }
// Edge_circulator incident_edges()
// {
// return Edge_circulator(handle(), cell());
// }
// Edge_circulator incident_edges(const Cell_handle& c)
// {
// return Edge_circulator(handle(), c);
// }
};
CGAL_END_NAMESPACE