Added static port system and a new altimeter model connected to it.

[flightgear.git] / src / Main / globals.hxx

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 5a02dbd10c6b6485a7b4a78e5f5ed4affc7480e3..4346f6e6a88c672ccd7b7a55879ca74fcb39f6a1 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -46,6 +46,7 @@ typedef vector<string> string_list;
 // anyway.
 
 class SGEphemeris;
+
 class SGMagVar;
 class SGRoute;
 class SGTime;
@@ -56,7 +57,10 @@ class FGLogger;
 class FGEnvironmentMgr;
 class FGEnvironment;
 class FGControls;
+class FGSteam;
 class FGSoundMgr;
+class FGSystemMgr;
+class FGInstrumentMgr;
 class FGAutopilot;
 class FGFX;
 class FGViewMgr;
@@ -64,12 +68,12 @@ class FGViewer;
 class FGATCMgr;
 class FGATCDisplay;
 class FGAIMgr;
+class FGModelLoader;
+class FGTextureLoader;
 class FGAircraftModel;
 class FGModelMgr;
-
-class ssgRoot;
-class ssgBranch;
-
+class FGScenery;
+class FGIO;
 
 /**
  * Bucket for subsystem pointers representing the sim's state.
@@ -130,6 +134,12 @@ private:
     // sound-effects manager
     FGFX *fx;
 
+    // aircraft system manager
+    FGSystemMgr * systemmgr;
+
+    // aircraft instrument manager
+    FGInstrumentMgr * instrumentmgr;
+
     // environment information
     FGEnvironmentMgr * environment_mgr;
 
@@ -145,6 +155,9 @@ private:
     // control input state
     FGControls *controls;
 
+    // Steam instruments
+    FGSteam *steam;
+
     // viewer manager
     FGViewMgr *viewmgr;
 
@@ -154,6 +167,10 @@ private:
 
     SGCommandMgr *commands;
 
+    FGModelLoader * model_loader;
+
+    FGTextureLoader * texture_loader;
+
     FGAircraftModel *acmodel;
 
     FGModelMgr * model_mgr;
@@ -161,13 +178,10 @@ private:
     // list of serial port-like configurations
     string_list *channel_options_list;
 
-    // SSG scene graph
-    ssgRoot * scene_graph;
-    ssgBranch * terrain_branch;
-    ssgBranch * gnd_lights_branch;
-    ssgBranch * rwy_lights_branch;
-    ssgBranch * models_branch;
-    ssgBranch * aircraft_branch;
+    // FlightGear scenery manager
+    FGScenery *scenery;
+
+    FGIO* io;
 
 public:
 
@@ -228,9 +242,6 @@ public:
     inline void set_environment_mgr(FGEnvironmentMgr * mgr) {
       environment_mgr = mgr;
     }
-    const FGEnvironment * get_environment() const;
-    const FGEnvironment * get_environment(double lat, double lon,
-                                         double alt) const;
 
     inline FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }
@@ -244,12 +255,19 @@ public:
     inline FGSoundMgr *get_soundmgr() const { return soundmgr; }
     inline void set_soundmgr( FGSoundMgr *sm ) { soundmgr = sm; }
 
+    inline FGSystemMgr *get_systemmgr() const { return systemmgr; }
+
+    inline FGInstrumentMgr *get_instrumentmgr() const { return instrumentmgr; }
+
     inline FGFX *get_fx() const { return fx; }
     inline void set_fx( FGFX *x ) { fx = x; }
 
     inline FGControls *get_controls() const { return controls; }
     inline void set_controls( FGControls *c ) { controls = c; }
 
+    inline FGSteam *get_steam() const { return steam; }
+    inline void set_steam( FGSteam *s ) { steam = s; }
+
     inline FGViewMgr *get_viewmgr() const { return viewmgr; }
     inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
     FGViewer *get_current_view() const;
@@ -259,6 +277,18 @@ public:
 
     inline SGCommandMgr *get_commands () { return commands; }
 
+    inline FGModelLoader * get_model_loader () { return model_loader; }
+
+    inline void set_model_loader (FGModelLoader * loader) {
+        model_loader = loader;
+    }
+
+    inline FGTextureLoader * get_texture_loader () { return texture_loader; }
+
+    inline void set_texture_loader (FGTextureLoader * loader) {
+        texture_loader = loader;
+    }
+
     inline FGAircraftModel *get_aircraft_model () { return acmodel; }
 
     inline void set_aircraft_model (FGAircraftModel * model)
@@ -280,40 +310,10 @@ public:
        channel_options_list = l;
     }
 
-    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 ssgBranch * get_gnd_lights_branch () const {
-      return gnd_lights_branch;
-    }
-    inline void set_gnd_lights_branch (ssgBranch * t) {
-      gnd_lights_branch = t;
-    }
-
-    inline ssgBranch * get_rwy_lights_branch () const {
-      return rwy_lights_branch;
-    }
-    inline void set_rwy_lights_branch (ssgBranch * t) {
-      rwy_lights_branch = t;
-    }
-
-    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;
-    }
+    inline FGScenery * get_scenery () const { return scenery; }
+    inline void set_scenery ( FGScenery *s ) { scenery = s; }
 
+    FGIO* get_io() const { return io; }
 
     /**
      * Save the current state as the initial state.