From e154b407b879f87aadb4067c8a5e1709f7b481d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20B=C3=A4sken?= <Matthias.Baesken@mpi-sb.mpg.de>
Date: Mon, 3 Dec 2001 07:44:12 +0000
Subject: [PATCH] *** empty log message ***

---
 .../demo/GeoWin/CGAL_delaunay_triang_3.C      | 40 +++++++++----------
 Packages/GeoWin/demo/GeoWin/Makefile          |  2 +-
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C b/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C
index cab09cc9932..02233e066e7 100644
--- a/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C
+++ b/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C
@@ -56,23 +56,23 @@ int main(int argc, char *argv[])
 #include <CGAL/Triangulation_geom_traits_3.h>
 #include <CGAL/Delaunay_triangulation_3.h>
 
-typedef double NT;
-typedef CGAL::Cartesian<NT> rep3_t;
-typedef CGAL::Point_3<rep3_t> point_3;
-typedef CGAL::Triangulation_geom_traits_3<rep3_t>  traits_3;
-typedef CGAL::Triangulation_vertex_base_3<traits_3>     Vb ;
-typedef CGAL::Triangulation_cell_base_3<traits_3>       Fb;
-typedef CGAL::Triangulation_data_structure_3<Vb,Fb> TDS3 ;
-typedef CGAL::Triangulation_3< traits_3 , TDS3> Triangulation_3;
-typedef CGAL::Delaunay_triangulation_3<traits_3,TDS3> Delaunay_3;
+typedef double                                               NT;
+typedef CGAL::Cartesian<NT>                                  K;
+typedef K::Point_3                                           Point_3;
+typedef CGAL::Triangulation_geom_traits_3<K>                 Traits_3;
+typedef CGAL::Triangulation_vertex_base_3<Traits_3>          Vb ;
+typedef CGAL::Triangulation_cell_base_3<Traits_3>            Fb;
+typedef CGAL::Triangulation_data_structure_3<Vb,Fb>          TDS3 ;
+typedef CGAL::Delaunay_triangulation_3<Traits_3,TDS3>        Delaunay_3;
+typedef std::list<Point_3>                                   Point_3_list;
 
-static void show_d3_points(geo_scene sc, leda_d3_window& W, GRAPH<leda_d3_point,int>& H)
+void show_d3_points(geo_scene sc, leda_d3_window& W, GRAPH<leda_d3_point,int>& H)
 {
- GeoEditScene< CGALPoint_3_list >* esc = (GeoEditScene< CGALPoint_3_list > *) sc;
- CGALPoint_3_list& L= esc->get_objref();
+ GeoEditScene<Point_3_list>* esc = (GeoEditScene<Point_3_list> *) sc;
+ Point_3_list& L= esc->get_objref();
 
- CGALPoint_3 p;
- CGALPoint_3_list::const_iterator it = L.begin();
+ Point_3 p;
+ Point_3_list::const_iterator it = L.begin();
 
  // input points ...
  for(; it != L.end();++it) { p=*it; H.new_node(convert_to_leda(p)); }
@@ -85,22 +85,18 @@ static void show_d3_points(geo_scene sc, leda_d3_window& W, GRAPH<leda_d3_point,
  // construct graph for visualization ...
  typedef Delaunay_3::Vertex_handle Vertex_handle;
  typedef Delaunay_3::Cell_handle Cell_handle;
- typedef Delaunay_3::Vertex Vertex;
- typedef Delaunay_3::Cell Cell;
- typedef Delaunay_3::Edge_iterator Edge_iterator;
- typedef Delaunay_3::Cell_iterator Cell_iterator;
- typedef Delaunay_3::Triangle  Triangle; 
+ typedef Delaunay_3::Finite_edges_iterator Finite_edges_iterator;
 
  Vertex_handle v1, v2;
  Cell_handle f;
  int n1, n2;
 
- Edge_iterator eit = G_delaunay.finite_edges_begin();
- Edge_iterator beyond = G_delaunay.edges_end();
+ Finite_edges_iterator eit = G_delaunay.finite_edges_begin();
+ Finite_edges_iterator beyond = G_delaunay.finite_edges_end();
 
  // edges ...
  for ( ;eit != beyond; ++eit) {
-	f = (*eit).first;
+	f  = (*eit).first;
 	n1 = (*eit).second;
        	n2 = (*eit).third;
 	v1 = f->vertex(n1);
diff --git a/Packages/GeoWin/demo/GeoWin/Makefile b/Packages/GeoWin/demo/GeoWin/Makefile
index f9bf44554fb..28bb8999630 100644
--- a/Packages/GeoWin/demo/GeoWin/Makefile
+++ b/Packages/GeoWin/demo/GeoWin/Makefile
@@ -84,7 +84,7 @@ CGAL_min_sphere_3$(EXE_EXT) :  CGAL_min_sphere_3$(OBJ_EXT)
 CGAL_planar_map_2$(EXE_EXT) :  CGAL_planar_map_2$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)CGAL_planar_map_2 CGAL_planar_map_2$(OBJ_EXT)  $(CGDL)
 
-all: CGAL_alpha_shape_2 CGAL_arrangement_2 CGAL_constrained_triang_2 CGAL_min_sphere_3 CGAL_regular_triang_2 CGAL_delaunay_triang_3 CGAL_geometry_2 CGAL_min_circle_2 CGAL_delaunay_triang_2 CGAL_demo CGAL_convex_hull_2 CGAL_segment_intersection_2 CGAL_triangulation_2 CGAL_max_k_gon_2 CGAL_all_furthest_neighbors_2 CGAL_polygon_2 CGAL_convex_hull_3 CGAL_kdtree_2 CGAL_kdtree_3 CGAL_min_ellipse_2
+all: CGAL_alpha_shape_2 CGAL_arrangement_2 CGAL_delaunay_triang_3 CGAL_constrained_triang_2 CGAL_min_sphere_3 CGAL_regular_triang_2 CGAL_delaunay_triang_3 CGAL_geometry_2 CGAL_min_circle_2 CGAL_delaunay_triang_2 CGAL_demo CGAL_convex_hull_2 CGAL_segment_intersection_2 CGAL_triangulation_2 CGAL_max_k_gon_2 CGAL_all_furthest_neighbors_2 CGAL_polygon_2 CGAL_convex_hull_3 CGAL_kdtree_2 CGAL_kdtree_3 CGAL_min_ellipse_2
 
 
 clean :