First mostly successful tile triangulation works. There's plenty of tweaking

[flightgear.git] / Triangulate / triangle.hxx

diff --git a/Triangulate/triangle.hxx b/Triangulate/triangle.hxx
index 9c9b133cddb89a9a1242fe1c59dee3c37146a631..0a115fd7342f4e60629a4aa9675576c968a0b485 100644 (file)
--- a/Triangulate/triangle.hxx
+++ b/Triangulate/triangle.hxx
@@ -1,4 +1,4 @@
-// triandgle.hxx -- "Triangle" interface class
+// triangle.hxx -- "Triangle" interface class
 //
 // Written by Curtis Olson, started March 1999.
 //
@@ -35,6 +35,7 @@
 
 #include <vector>
 
+#include <Array/array.hxx>
 #include <Clipper/clipper.hxx>
 #include <Math/point3d.hxx>
 #include <Polygon/names.hxx>
@@ -45,15 +46,13 @@ extern "C" {
 }
 
 #include "trinodes.hxx"
+#include "tripoly.hxx"
+#include "trisegs.hxx"
 
 FG_USING_STD(vector);
 
 
-typedef vector < int > tripoly;
-typedef tripoly::iterator tripoly_iterator;
-typedef tripoly::const_iterator const_tripoly_iterator;
-
-typedef vector < tripoly > tripoly_list;
+typedef vector < FGTriPoly > tripoly_list;
 typedef tripoly_list::iterator tripoly_list_iterator;
 typedef tripoly_list::const_iterator const_tripoly_list_iterator;
 
@@ -62,9 +61,15 @@ class FGTriangle {
 
 private:
 
+    // list of nodes
     FGTriNodes trinodes;
-    tripoly_list polylist[FG_MAX_AREA_TYPES];
 
+    // list of segments
+    FGTriSegments trisegs;
+
+    // polygon list
+    tripoly_list polylist[FG_MAX_AREA_TYPES];
+    
 public:
 
     // Constructor and destructor
@@ -75,13 +80,10 @@ public:
     int add_nodes();
 
     // populate this class based on the specified gpc_polys list
-    int build( const FGgpcPolyList& gpc_polys );
-
-    // do actual triangulation
-    int do_triangulate( const tripoly& poly );
+    int build( const fitnode_list& fit_list, const FGgpcPolyList& gpc_polys );
 
     // front end triangulator for polygon list
-    int triangulate();
+    int run_triangulate();
 };
 
 
@@ -89,6 +91,14 @@ public:
 
 
 // $Log$
+// Revision 1.6  1999/03/20 20:32:56  curt
+// First mostly successful tile triangulation works.  There's plenty of tweaking
+// to do, but we are marching in the right direction.
+//
+// Revision 1.5  1999/03/20 02:21:53  curt
+// Continue shaping the code towards triangulation bliss.  Added code to
+// calculate some point guaranteed to be inside a polygon.
+//
 // Revision 1.4  1999/03/19 22:29:05  curt
 // Working on preparationsn for triangulation.
 //