Lots of changes to the ATC/AI system for initial revision of random AI GA VFR traffic

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

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index d323aaaf8cf489c1aec6698b0d61304a4b6b5d8e..2bf8130b90aac0fac6769ac8d6028982e98c155c 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -120,6 +120,7 @@ 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;
@@ -132,6 +133,14 @@ private:
     // want based on lighting conditions.
     ssgSelector *gnd_lights_brightness;
 
+    // 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
      * into the scene graph.  Note that this may be set asynchronously
@@ -148,6 +157,7 @@ private:
 
     bool obj_load( const string& path,
                    ssgBranch* geometry,
+                   ssgBranch* vasi_lights,
                    ssgBranch* rwy_lights,
                    ssgBranch* taxi_lights,
                    ssgVertexArray* gound_lights,
@@ -158,16 +168,28 @@ private:
 
     double timestamp;
 
+    /**
+     * this value is used by the tile scheduler/loader to mark which
+     * tiles are in the primary ring (i.e. the current tile or the
+     * surrounding eight.)  Other routines then can use this as an
+     * optimization and not do some operation to tiles outside of this
+     * inner ring.  (For instance vasi color updating)
+     */
+    bool is_inner_ring;
 
-    // this variable tracks the status of the incremental memory freeing.
+    /**
+     * this variable tracks the status of the incremental memory
+     * freeing.
+     */
     enum {
         NODES = 0x01,
         VEC_PTRS = 0x02,
         TERRA_NODE = 0x04,
         GROUND_LIGHTS = 0x08,
-        RWY_LIGHTS = 0x10,
-        TAXI_LIGHTS = 0x20,
-        LIGHTMAPS = 0x40
+        VASI_LIGHTS = 0x10,
+        RWY_LIGHTS = 0x20,
+        TAXI_LIGHTS = 0x40,
+        LIGHTMAPS = 0x80
     };
     int free_tracker;
 
@@ -205,7 +227,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
@@ -231,10 +253,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,
-                       ssgBranch* taxi_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
@@ -248,10 +271,11 @@ public:
      */
     inline ssgTransform *get_terra_transform() { return terra_transform; }
 
-    void set_timestamp(double time_ms) { timestamp = time_ms; }
-
     inline double get_timestamp() const { return timestamp; }
+    inline void set_timestamp( double time_ms ) { timestamp = time_ms; }
 
+    inline bool get_inner_ring() const { return is_inner_ring; }
+    inline void set_inner_ring( bool val ) { is_inner_ring = val; }
 };