Major overhaul:

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 4bcdf73e9b641e0cf311e9c05fbf448bcb4eccee..5a02dbd10c6b6485a7b4a78e5f5ed4affc7480e3 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -29,8 +29,6 @@
 #include <vector>
 #include STL_STRING
 
-#include "viewmgr.hxx"
-
 SG_USING_STD( vector );
 SG_USING_STD( string );
 
@@ -61,10 +59,16 @@ class FGControls;
 class FGSoundMgr;
 class FGAutopilot;
 class FGFX;
+class FGViewMgr;
 class FGViewer;
 class FGATCMgr;
 class FGATCDisplay;
 class FGAIMgr;
+class FGAircraftModel;
+class FGModelMgr;
+
+class ssgRoot;
+class ssgBranch;
 
 
 /**
@@ -76,7 +80,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;
@@ -103,7 +107,7 @@ private:
     long int warp_delta;
 
     // Logger
-    FGLogger * logger;
+    FGLogger *logger;
 
     // Time structure
     SGTime *time_params;
@@ -150,16 +154,29 @@ private:
 
     SGCommandMgr *commands;
 
+    FGAircraftModel *acmodel;
+
+    FGModelMgr * model_mgr;
+
     // 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;
+
 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; }
@@ -235,15 +252,27 @@ public:
 
     inline FGViewMgr *get_viewmgr() const { return viewmgr; }
     inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
-    inline FGViewer *get_current_view() const {
-      return viewmgr->get_current_view();
-    }
+    FGViewer *get_current_view() const;
 
     inline SGPropertyNode *get_props () { return props; }
     inline void set_props( SGPropertyNode *n ) { props = n; }
 
     inline SGCommandMgr *get_commands () { return commands; }
 
+    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;
     }
@@ -251,6 +280,40 @@ 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;
+    }
+
 
     /**
      * Save the current state as the initial state.