Added a new 'delimiter' property to allow an alternative delimiter to

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index c68053602f65061a13295c16f50d46a1dc29ed20..bbfe639399b004cbb8d3a62c071902ab13987444 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -37,10 +37,6 @@
 #include <simgear/misc/commands.hxx>
 #include <simgear/misc/props.hxx>
 
-// #include <Controls/controls.hxx>
-// #include <Sound/soundmgr.hxx>
-// #include "viewmgr.hxx"
-
 SG_USING_STD( vector );
 SG_USING_STD( string );
 
@@ -48,23 +44,39 @@ typedef vector<string> string_list;
 
 
 // Forward declarations
+class FGLogger;
+class FGEnvironmentMgr;
+class FGEnvironment;
 class FGControls;
 class FGSoundMgr;
+class FGFX;
 class FGViewMgr;
 class FGViewer;
+class FGATCMgr;
+class FGATCDisplay;
 
 class FGGlobals {
 
 private:
 
+    // Number of milliseconds elapsed since the start of the program.
+    long elapsed_time_ms;
+
     // Root of FlightGear data tree
     string fg_root;
 
     // Root of FlightGear scenery tree
     string fg_scenery;
 
+#if 0
     // Freeze sim
     bool freeze;
+#endif
+
+    // Fullscreen mode for old 3DFX cards.
+#if defined(FX) && defined(XMESA)
+    bool fullscreen;
+#endif
 
     // An offset in seconds from the true time.  Allows us to adjust
     // the effective time of day.
@@ -74,6 +86,9 @@ private:
     // to make time progress faster than normal (or even run in reverse.)
     long int warp_delta;
 
+    // Logger
+    FGLogger * logger;
+
     // Time structure
     SGTime *time_params;
 
@@ -89,6 +104,18 @@ private:
     // sound manager
     FGSoundMgr *soundmgr;
 
+    // sound-effects manager
+    FGFX *fx;
+
+    // environment information
+    FGEnvironmentMgr * environment_mgr;
+
+    // ATC manager
+    FGATCMgr *ATC_mgr;
+
+    // ATC Renderer
+    FGATCDisplay *ATC_display;
+
     // control input state
     FGControls *controls;
 
@@ -110,6 +137,9 @@ 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 const string &get_fg_root () const { return fg_root; }
     inline void set_fg_root (const string &root) { fg_root = root; }
 
@@ -118,8 +148,15 @@ public:
       fg_scenery = scenery;
     }
 
+#if 0
     inline bool get_freeze() const { return freeze; }
     inline void set_freeze( bool f ) { freeze = f; }
+#endif
+
+#if defined(FX) && defined(XMESA)
+    inline bool get_fullscreen() const { return fullscreen; }
+    inline bool set_fullscreen( bool f ) { fullscreen = f; }
+#endif
 
     inline long int get_warp() const { return warp; }
     inline void set_warp( long int w ) { warp = w; }
@@ -129,6 +166,9 @@ public:
     inline void set_warp_delta( long int d ) { warp_delta = d; }
     inline void inc_warp_delta( long int d ) { warp_delta += d; }
 
+    inline FGLogger * get_logger () { return logger; }
+    inline void set_logger (FGLogger * l) { logger = l; }
+
     inline SGTime *get_time_params() const { return time_params; }
     inline void set_time_params( SGTime *t ) { time_params = t; }
 
@@ -141,9 +181,28 @@ public:
     inline SGRoute *get_route() const { return route; }
     inline void set_route( SGRoute *r ) { route = r; }
 
+    inline FGEnvironmentMgr * get_environment_mgr() {
+      return environment_mgr;
+    }
+    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; }
+
+    inline FGATCDisplay *get_ATC_display() const { return ATC_display; }
+    inline void set_ATC_display( FGATCDisplay *d ) {ATC_display = d; }  
+
     inline FGSoundMgr *get_soundmgr() const { return soundmgr; }
     inline void set_soundmgr( FGSoundMgr *sm ) { soundmgr = sm; }
 
+    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; }
 
@@ -183,5 +242,3 @@ extern FGGlobals *globals;
 
 
 #endif // _GLOBALS_HXX
-
-