Check for the plib version when using display lists, just to be sure.

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

diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index aa9e111032fe9f73fba10352ebd98eb0f4c1f3eb..5584f94564761158c28342ae2cd963585b72a682 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -31,15 +31,17 @@
 
 
 #include <plib/sg.h>
-#include <plib/ssg.h>
 
+#include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/point3d.hxx>
 
-#include <Main/fgfs.hxx>
+
+class ssgRoot;
+class ssgBranch;
 
 
 // Define a structure containing global scenery parameters
-class FGScenery : public FGSubsystem {
+class FGScenery : public SGSubsystem {
     // center of current scenery chunk
     Point3D center;
 
@@ -64,7 +66,9 @@ class FGScenery : public FGSubsystem {
     ssgRoot *scene_graph;
     ssgBranch *terrain_branch;
     ssgRoot *gnd_lights_root;
+    ssgRoot *vasi_lights_root;
     ssgRoot *rwy_lights_root;
+    ssgRoot *taxi_lights_root;
     ssgBranch *models_branch;
     ssgBranch *aircraft_branch;
 
@@ -73,7 +77,7 @@ public:
     FGScenery();
     ~FGScenery();
 
-    // Implementation of FGSubsystem.
+    // Implementation of SGSubsystem.
     void init ();
     void bind ();
     void unbind ();
@@ -104,6 +108,13 @@ public:
         gnd_lights_root = r;
     }
 
+    inline ssgRoot *get_vasi_lights_root () const {
+        return vasi_lights_root;
+    }
+    inline void set_vasi_lights_root (ssgRoot *r) {
+        vasi_lights_root = r;
+    }
+
     inline ssgRoot *get_rwy_lights_root () const {
         return rwy_lights_root;
     }
@@ -111,6 +122,13 @@ public:
         rwy_lights_root = r;
     }
 
+    inline ssgRoot *get_taxi_lights_root () const {
+        return taxi_lights_root;
+    }
+    inline void set_taxi_lights_root (ssgRoot *r) {
+        taxi_lights_root = r;
+    }
+
     inline ssgBranch *get_models_branch () const {
         return models_branch;
     }