Currently, when the sim pauses, all IO is also halted. To me it generally

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

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index 94c9cd336b51fd6bd1702fb6a65e2daab9e3c85c..0d61677fd81729b9f80417a61ab932e4c9a67018 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -33,13 +33,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/glut.h>
-#include <GL/gl.h>
-
 #include <simgear/compiler.h>
 
 #include <vector>
@@ -104,17 +97,6 @@ class FGTileEntry {
 
 public:
 
-    /* CLO123 FROM HERE TO THE CORRESPONDING MARKER ARE THINGS THAT
-       CAN BE DELETED AFTER WE DROP THE ASCII SCENERY FORMAT */
-    typedef vector < sgVec3 * > free_vec3_list;
-    typedef vector < sgVec2 * > free_vec2_list;
-    typedef vector < unsigned short * > free_index_list;
-
-    // node list
-    point_list nodes;
-    int ncount;
-    /* CLO123 MARKER */
-
     // global tile culling data
     Point3D center;
     double bounding_radius;
@@ -123,12 +105,6 @@ public:
     // this tile's official location in the world
     SGBucket tile_bucket;
 
-    // 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;
-
 private:
 
     // ssg tree structure for this tile is as follows:
@@ -144,7 +120,9 @@ private:
 
     // pointer to ssg transform for this tile
     ssgTransform *terra_transform;
+    ssgTransform *vasi_lights_transform;
     ssgTransform *rwy_lights_transform;
+    ssgTransform *taxi_lights_transform;
     ssgTransform *gnd_lights_transform;
 
     // pointer to ssg range selector for this tile
@@ -155,17 +133,13 @@ private:
     // want based on lighting conditions.
     ssgSelector *gnd_lights_brightness;
 
-    // ADA --->
-    // Runway centre coords.
-    Point3D rway_center; // Reqd. for switching as function of distance from runway center
-    //pointers for Runway lights    
-    ssgTransform *lightmaps_transform; // branch for runway lights
-    ssgRangeSelector *lightmaps_range; // tried to maintain same structure as Curt's ground
-    ssgSelector *lightmaps_brightness; // selector node for points/ lightmaps
-
-    ssgSimpleState *lightmap_state; // OpenGL state of the polygons that make up runway lights
-    ssgVertexArray *light_points; // array of runway light coords.
-    // <--- ADA
+    // we need to be able to turn runway lights on or off (doing this
+    // via a call back would be nifty, but then the call back needs to
+    // know about the higher level application's global state which is
+    // a problem if we move the code into simgear.)
+    ssgSelector *vasi_lights_selector;
+    ssgSelector *rwy_lights_selector;
+    ssgSelector *taxi_lights_selector;
 
     /**
      * Indicates this tile has been loaded from a file and connected
@@ -181,13 +155,16 @@ private:
      */
     volatile int pending_models;
 
-    bool obj_load( const std::string& path,
-                        ssgBranch* geometry,
-                        ssgBranch* rwy_lights,
-                        ssgVertexArray* gound_lights,
-                        bool is_base );
+    bool obj_load( const string& path,
+                   ssgBranch* geometry,
+                   ssgBranch* vasi_lights,
+                   ssgBranch* rwy_lights,
+                   ssgBranch* taxi_lights,
+                   ssgVertexArray* gound_lights,
+                   bool is_base );
 
-    ssgLeaf* gen_lights( ssgVertexArray *lights, int inc, float bright );
+    ssgLeaf* gen_lights( SGMaterialLib *matlib, ssgVertexArray *lights,
+                         int inc, float bright );
 
     double timestamp;
 
@@ -198,19 +175,15 @@ private:
         VEC_PTRS = 0x02,
         TERRA_NODE = 0x04,
         GROUND_LIGHTS = 0x08,
-        RWY_LIGHTS = 0x10,
-        LIGHTMAPS = 0x20
+        VASI_LIGHTS = 0x10,
+        RWY_LIGHTS = 0x20,
+        TAXI_LIGHTS = 0x40,
+        LIGHTMAPS = 0x80
     };
     int free_tracker;
 
 public:
 
-    // ADA --->
-    ssgTransform *ols_transform; // transform node for flols simulation
-    ssgSelector *lightmaps_sequence; // selector node for points/ lightmaps
-    ssgBranch* gen_runway_lights(ssgVertexArray *points,ssgVertexArray *normal, ssgVertexArray *dir, int *type);
-    // <--- ADA
-
     // Constructor
     FGTileEntry( const SGBucket& b );
 
@@ -243,7 +216,7 @@ public:
      * @param base name of directory containing tile data file.
      * @param is_base is this a base terrain object for which we should generate
      *        random ground light points */
-    void load( const SGPath& base, bool is_base );
+    void load( const string &base_path, bool is_base );
 
     /**
      * Return true if the tile entry is loaded, otherwise return false
@@ -269,9 +242,11 @@ public:
     /**
      * Add terrain mesh and ground lighting to scene graph.
      */
-    void add_ssg_nodes( ssgBranch* terrain_branch,
-                       ssgBranch* gnd_lights_branch,
-                       ssgBranch* rwy_lights_branch );
+    void add_ssg_nodes( ssgBranch *terrain_branch,
+                       ssgBranch *gnd_lights_branch,
+                        ssgBranch *vasi_lights_branch,
+                       ssgBranch *rwy_lights_branch,
+                       ssgBranch *taxi_lights_branch );
 
     /**
      * disconnect terrain mesh and ground lighting nodes from scene