Goodbye automake.

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 2c1156c1a60d863de4940b7c85848e7e62d7557d..bf302987c420b556a250d75ac05d4b884caab755 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -24,6 +24,9 @@
 #  include <config.h>
 #endif
 
+#include <boost/foreach.hpp>
+#include <algorithm>
+
 #include <simgear/structure/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sg_dir.hxx>
@@ -36,6 +39,8 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/misc/ResourceManager.hxx>
 #include <simgear/props/propertyObject.hxx>
+#include <simgear/props/props_io.hxx>
+#include <simgear/scene/model/placement.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Airports/runways.hxx>
@@ -182,7 +187,12 @@ FGGlobals::~FGGlobals()
     delete current_panel;
 
     delete ATC_mgr;
-    delete controls;
+
+    if (controls)
+    {
+        controls->unbind();
+        delete controls;
+    }
 
     delete channel_options_list;
     delete initial_waypoints;
@@ -229,25 +239,30 @@ void FGGlobals::set_fg_root (const string &root) {
       simgear::ResourceManager::PRIORITY_DEFAULT);
 }
 
-void FGGlobals::set_fg_scenery (const string &scenery)
+void FGGlobals::append_fg_scenery (const string &paths)
 {
-    SGPath s;
-    if (scenery.empty()) {
-        s.set( fg_root );
-        s.append( "Scenery" );
-    } else
-        s.set( scenery );
-
-    string_list path_list = sgPathSplit( s.str() );
-    fg_scenery.clear();
-
-    for (unsigned i = 0; i < path_list.size(); i++) {
-        SGPath path(path_list[i]);
+//    fg_scenery.clear();
+    SGPropertyNode* sim = fgGetNode("/sim", true);
+
+  // find first unused fg-scenery property in /sim
+    int propIndex = 0;
+    while (sim->getChild("fg-scenery", propIndex) != NULL) {
+      ++propIndex; 
+    }
+  
+    BOOST_FOREACH(const SGPath& path, sgPathSplit( paths )) {
         if (!path.exists()) {
           SG_LOG(SG_GENERAL, SG_WARN, "scenery path not found:" << path.str());
           continue;
         }
 
+      // check for duplicates
+      string_list::const_iterator ex = std::find(fg_scenery.begin(), fg_scenery.end(), path.str());
+      if (ex != fg_scenery.end()) {
+        SG_LOG(SG_GENERAL, SG_INFO, "skipping duplicate add of scenery path:" << path.str());
+        continue;
+      }
+      
         simgear::Dir dir(path);
         SGPath terrainDir(dir.file("Terrain"));
         SGPath objectsDir(dir.file("Objects"));
@@ -270,6 +285,11 @@ void FGGlobals::set_fg_scenery (const string &scenery)
         // FG_SCENERY=A:B becomes list ["A/Terrain", "A/Objects", "",
         // "B/Terrain", "B/Objects", ""]
         fg_scenery.push_back("");
+        
+      // make scenery dirs available to Nasal
+        SGPropertyNode* n = sim->getChild("fg-scenery", propIndex++, true);
+        n->setStringValue(path.str());
+        n->setAttribute(SGPropertyNode::WRITE, false);
     } // of path list iteration
 }
 
@@ -349,6 +369,23 @@ FGGlobals::get_event_mgr () const
     return event_mgr;
 }
 
+const SGGeod &
+FGGlobals::get_aircraft_position() const
+{
+    if( acmodel != NULL ) {
+        SGModelPlacement * mp = acmodel->get3DModel();
+        if( mp != NULL )
+            return mp->getPosition();
+    }
+    throw sg_exception("Can't get aircraft position", "FGGlobals::get_aircraft_position()" );
+}
+
+SGVec3d
+FGGlobals::get_aircraft_positon_cart() const
+{
+    return SGVec3d::fromGeod(get_aircraft_position());
+}
+
 
 // Save the current state as the initial state.
 void
@@ -356,18 +393,18 @@ FGGlobals::saveInitialState ()
 {
   initial_state = new SGPropertyNode();
 
-  if (!copyProperties(props, initial_state))
+  // copy properties which are READ/WRITEable - but not USERARCHIVEd or PRESERVEd
+  int checked  = SGPropertyNode::READ+SGPropertyNode::WRITE+
+                 SGPropertyNode::USERARCHIVE+SGPropertyNode::PRESERVE;
+  int expected = SGPropertyNode::READ+SGPropertyNode::WRITE;
+  if (!copyProperties(props, initial_state, expected, checked))
     SG_LOG(SG_GENERAL, SG_ALERT, "Error saving initial state");
     
   // delete various properties from the initial state, since we want to
   // preserve their values even if doing a restore
-  
+  // => Properties should now use the PRESERVE flag to protect their values
+  // on sim-reset. Remove some specific properties for backward compatibility.
   SGPropertyNode* sim = initial_state->getChild("sim");
-  sim->removeChild("presets");
-  SGPropertyNode* simStartup = sim->getChild("startup");
-  simStartup->removeChild("xsize");
-  simStartup->removeChild("ysize");
-  
   SGPropertyNode* cameraGroupNode = sim->getNode("rendering/camera-group");
   if (cameraGroupNode) {
     cameraGroupNode->removeChild("camera");
@@ -385,8 +422,11 @@ FGGlobals::restoreInitialState ()
                "No initial state available to restore!!!");
         return;
     }
-
-    if ( copyProperties(initial_state, props) ) {
+    // copy properties which are READ/WRITEable - but not USERARCHIVEd or PRESERVEd
+    int checked  = SGPropertyNode::READ+SGPropertyNode::WRITE+
+                   SGPropertyNode::USERARCHIVE+SGPropertyNode::PRESERVE;
+    int expected = SGPropertyNode::READ+SGPropertyNode::WRITE;
+    if ( copyProperties(initial_state, props, expected, checked)) {
         SG_LOG( SG_GENERAL, SG_INFO, "Initial state restored successfully" );
     } else {
         SG_LOG( SG_GENERAL, SG_INFO,