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 0ec5980b96d5acccdec843bc97945db48601d3eb..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,7 +68,12 @@ class FGViewer;
 class FGATCMgr;
 class FGATCDisplay;
 class FGAIMgr;
-
+class FGModelLoader;
+class FGTextureLoader;
+class FGAircraftModel;
+class FGModelMgr;
+class FGScenery;
+class FGIO;
 
 /**
  * Bucket for subsystem pointers representing the sim's state.
@@ -75,7 +84,7 @@ class FGGlobals
 private:
 
     // Number of milliseconds elapsed since the start of the program.
-    long elapsed_time_ms;
+    double sim_time_sec;
 
     // Root of FlightGear data tree
     string fg_root;
@@ -125,6 +134,12 @@ private:
     // sound-effects manager
     FGFX *fx;
 
+    // aircraft system manager
+    FGSystemMgr * systemmgr;
+
+    // aircraft instrument manager
+    FGInstrumentMgr * instrumentmgr;
+
     // environment information
     FGEnvironmentMgr * environment_mgr;
 
@@ -140,6 +155,9 @@ private:
     // control input state
     FGControls *controls;
 
+    // Steam instruments
+    FGSteam *steam;
+
     // viewer manager
     FGViewMgr *viewmgr;
 
@@ -149,16 +167,30 @@ private:
 
     SGCommandMgr *commands;
 
+    FGModelLoader * model_loader;
+
+    FGTextureLoader * texture_loader;
+
+    FGAircraftModel *acmodel;
+
+    FGModelMgr * model_mgr;
+
     // list of serial port-like configurations
     string_list *channel_options_list;
 
+    // FlightGear scenery manager
+    FGScenery *scenery;
+
+    FGIO* io;
+
 public:
 
     FGGlobals();
     ~FGGlobals();
 
-    inline long get_elapsed_time_ms () const { return elapsed_time_ms; }
-    inline void set_elapsed_time_ms (long t) { elapsed_time_ms = t; }
+    inline double get_sim_time_sec () const { return sim_time_sec; }
+    inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
+    inline void set_sim_time_sec (double t) { sim_time_sec = t; }
 
     inline const string &get_fg_root () const { return fg_root; }
     inline void set_fg_root (const string &root) { fg_root = root; }
@@ -210,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; }
@@ -226,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;
@@ -241,6 +277,32 @@ 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)
+    {
+        acmodel = model;
+    }
+
+    inline FGModelMgr *get_model_mgr () { return model_mgr; }
+
+    inline void set_model_mgr (FGModelMgr * mgr)
+    {
+      model_mgr = mgr;
+    }
+
     inline string_list *get_channel_options_list () {
        return channel_options_list;
     }
@@ -248,6 +310,10 @@ public:
        channel_options_list = l;
     }
 
+    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.