Code reorganization.

[flightgear.git] / src / Scenery / tileentry.hxx

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index 8607591ff2f77cfc6afafb9a81cd3b89eee386dd..f17fb75cedbf1d1ed46653a95597d21245c02215 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -38,20 +38,21 @@
 #endif
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
+#include <simgear/xgl.h>
 
-#include <Include/compiler.h>
+#include <simgear/compiler.h>
 
 #include <vector>
 #include STL_STRING
 
-#include <ssg.h>               // plib includes
+#include <plib/ssg.h>          // plib includes
+
+#include <simgear/newbucket.hxx>
+#include <simgear/point3d.hxx>
 
-#include <Bucket/newbucket.hxx>
-#include <Math/point3d.hxx>
 #include <Objects/fragment.hxx>
 
-#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#if defined( sgi )
 #include <strings.h>
 #endif
 
@@ -84,7 +85,9 @@ public:
     typedef container::iterator FragmentIterator;
     typedef container::const_iterator FragmentConstIterator;
 
-    typedef vector < unsigned short * > free_list;
+    typedef vector < sgVec3 * > free_vec3_list;
+    typedef vector < sgVec2 * > free_vec2_list;
+    typedef vector < unsigned short * > free_index_list;
 
 public:
     // node list (the per fragment face lists reference this node list)
@@ -108,11 +111,15 @@ public:
     container fragment_list;
 
     // ssg related structures
-    sgVec3 *vtlist;
-    sgVec3 *vnlist;
-    sgVec2 *tclist;
-    free_list free_ptrs; // list of pointers to free when tile
-                                 // entry goes away
+    // sgVec3 *vtlist;
+    // sgVec3 *vnlist;
+    // sgVec2 *tclist;
+
+    // list of pointers to memory chunks that need to be freed when
+    // tile entry goes away
+    free_vec3_list vec3_ptrs;
+    free_vec2_list vec2_ptrs;
+    free_index_list index_ptrs;
 
     // ssg tree structure for this tile is as follows:
     // ssgRoot(scene)