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 45ae6a9d73697af9d9f705e2317dd1eb0d775928..5584f94564761158c28342ae2cd963585b72a682 100644 (file)
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -31,13 +31,17 @@
 
 
 #include <plib/sg.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;
 
@@ -58,12 +62,22 @@ class FGScenery : public FGSubsystem {
     // unit normal at point used to determine current elevation
     sgdVec3 cur_normal;
 
+    // SSG scene graph
+    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;
+
 public:
 
     FGScenery();
     ~FGScenery();
 
-    // Implementation of FGSubsystem.
+    // Implementation of SGSubsystem.
     void init ();
     void bind ();
     void unbind ();
@@ -80,14 +94,55 @@ public:
 
     inline void set_cur_radius( double r ) { cur_radius = r; }
     inline void set_cur_normal( sgdVec3 n ) { sgdCopyVec3( cur_normal, n ); }
-};
 
-
-extern FGScenery scenery;
-
-
-// Initialize the Scenery Management system
-int fgSceneryInit( void );
+    inline ssgRoot *get_scene_graph () const { return scene_graph; }
+    inline void set_scene_graph (ssgRoot * s) { scene_graph = s; }
+
+    inline ssgBranch *get_terrain_branch () const { return terrain_branch; }
+    inline void set_terrain_branch (ssgBranch * t) { terrain_branch = t; }
+
+    inline ssgRoot *get_gnd_lights_root () const {
+        return gnd_lights_root;
+    }
+    inline void set_gnd_lights_root (ssgRoot *r) {
+        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;
+    }
+    inline void set_rwy_lights_root (ssgRoot *r) {
+        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;
+    }
+    inline void set_models_branch (ssgBranch *t) {
+        models_branch = t;
+    }
+
+    inline ssgBranch *get_aircraft_branch () const {
+        return aircraft_branch;
+    }
+    inline void set_aircraft_branch (ssgBranch *t) {
+        aircraft_branch = t;
+    }
+};
 
 
 #endif // _SCENERY_HXX