Removed FGEnvironmentMgr as a special case in globals, initialization,

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index a8c9d475145264c60b9ffa317ff47a284d135656..7a0242c5392a307e3c667223d6a2a77411c2fead 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -22,10 +22,7 @@
 
 
 #include <simgear/misc/commands.hxx>
-
-#include <Environment/environment_mgr.hxx>
-#include <Instrumentation/instrument_mgr.hxx>
-#include <Systems/system_mgr.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include "globals.hxx"
 #include "viewmgr.hxx"
@@ -44,19 +41,38 @@ FGGlobals *globals;
 
 // Constructor
 FGGlobals::FGGlobals() :
-    sim_time_sec(0.0),
+    subsystem_mgr( new FGSubsystemMgr ),
+    sim_time_sec( 0.0 ),
+    fg_root( "" ),
+    fg_scenery( "" ),
 #if defined(FX) && defined(XMESA)
     fullscreen( true ),
 #endif
     warp( 0 ),
     warp_delta( 0 ),
-    logger(0),
-    systemmgr(new FGSystemMgr),
-    instrumentmgr(new FGInstrumentMgr),
-    props(new SGPropertyNode),
-    initial_state(0),
-    commands(new SGCommandMgr),
-    io(new FGIO)
+    time_params( NULL ),
+    ephem( NULL ),
+    mag( NULL ),
+    autopilot( NULL ),
+    route( NULL ),
+    current_panel( NULL ),
+    soundmgr( NULL ),
+    ATC_mgr( NULL ),
+    ATC_display( NULL ),
+    AI_mgr( NULL ),
+    controls( NULL ),
+    viewmgr( NULL ),
+    props( new SGPropertyNode ),
+    initial_state( NULL ),
+    locale( NULL ),
+    commands( new SGCommandMgr ),
+    model_lib( NULL ),
+    acmodel( NULL ),
+    model_mgr( NULL ),
+    channel_options_list( NULL ),
+    scenery( NULL ),
+    tile_mgr( NULL ),
+    io( new FGIO )
 {
 }
 
@@ -64,6 +80,7 @@ FGGlobals::FGGlobals() :
 // Destructor
 FGGlobals::~FGGlobals() 
 {
+  delete subsystem_mgr;
   delete initial_state;
   delete props;
   delete commands;
@@ -71,6 +88,42 @@ FGGlobals::~FGGlobals()
 }
 
 
+// set the fg_root path
+void FGGlobals::set_fg_root (const string &root) {
+    fg_root = root;
+    
+    // append /data to root if it exists
+    SGPath tmp( fg_root );
+    tmp.append( "data" );
+    tmp.append( "version" );
+    if ( ulFileExists( tmp.c_str() ) ) {
+        fg_root += "/data";
+        }
+}
+
+
+FGSubsystemMgr *
+FGGlobals::get_subsystem_mgr () const
+{
+    return subsystem_mgr;
+}
+
+FGSubsystem *
+FGGlobals::get_subsystem (const char * name)
+{
+    return subsystem_mgr->get_subsystem(name);
+}
+
+void
+FGGlobals::add_subsystem (const char * name,
+                          FGSubsystem * subsystem,
+                          FGSubsystemMgr::GroupType type,
+                          double min_time_sec)
+{
+    subsystem_mgr->add(name, subsystem, type, min_time_sec);
+}
+
+
 // Save the current state as the initial state.
 void
 FGGlobals::saveInitialState ()
@@ -86,14 +139,34 @@ FGGlobals::saveInitialState ()
 void
 FGGlobals::restoreInitialState ()
 {
-  if (initial_state == 0) {
-    SG_LOG(SG_GENERAL, SG_ALERT, "No initial state available to restore!!!");
-  } else if (!copyProperties(initial_state, props)) {
-    SG_LOG(SG_GENERAL, SG_INFO,
-          "Some errors restoring initial state (probably just read-only props)");
-  } else {
-    SG_LOG(SG_GENERAL, SG_INFO, "Initial state restored successfully");
-  }
+    if ( initial_state == 0 ) {
+        SG_LOG(SG_GENERAL, SG_ALERT,
+               "No initial state available to restore!!!");
+        return;
+    }
+
+    SGPropertyNode *currentPresets = new SGPropertyNode;
+    SGPropertyNode *targetNode = fgGetNode( "/sim/presets" );
+
+    // stash the /sim/presets tree
+    if ( !copyProperties(targetNode, currentPresets) ) {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to save /sim/presets subtree" );
+    }
+    
+    if ( copyProperties(initial_state, props) ) {
+        SG_LOG( SG_GENERAL, SG_INFO, "Initial state restored successfully" );
+    } else {
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Some errors restoring initial state (read-only props?)" );
+    }
+
+    // recover the /sim/presets tree
+    if ( !copyProperties(currentPresets, targetNode) ) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Failed to restore /sim/presets subtree" );
+    }
+
+   delete currentPresets;
 }
 
 FGViewer *