Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

[flightgear.git] / src / FDM / fdm_shell.cxx

diff --git a/src/FDM/fdm_shell.cxx b/src/FDM/fdm_shell.cxx
index 0d52e5aa33f81cf4362ecbcab4e57ea03d0a7176..8055bce5a1624a9c524fd646fd2c275f91a2c052 100644 (file)
--- a/src/FDM/fdm_shell.cxx
+++ b/src/FDM/fdm_shell.cxx
@@ -24,6 +24,7 @@
 #  include <config.h>
 #endif
 
+#include <cassert>
 #include <simgear/structure/exception.hxx>
 
 #include <FDM/fdm_shell.hxx>
@@ -48,6 +49,7 @@
 #include <FDM/NullFDM.hxx>
 #include <FDM/YASim/YASim.hxx>
 
+
 /*
  * Evil global variable required by Network/FGNative,
  * see that class for more information
@@ -55,6 +57,7 @@
 FGInterface* evil_global_fdm_state = NULL;
 
 FDMShell::FDMShell() :
+  _tankProperties( fgGetNode("/consumables/fuel", true) ),
   _impl(NULL),
   _dataLogging(false)
 {
@@ -68,13 +71,14 @@ FDMShell::~FDMShell()
 void FDMShell::init()
 {
   _props = globals->get_props();
+  fgSetBool("/sim/fdm-initialized", false);
   createImplementation();
 }
 
 void FDMShell::reinit()
 {
   if (_impl) {
-    fgSetBool("/sim/signals/fdm-initialized", false);
+    fgSetBool("/sim/fdm-initialized", false);
     evil_global_fdm_state = NULL;
     _impl->unbind();
     delete _impl;
@@ -86,18 +90,19 @@ void FDMShell::reinit()
 
 void FDMShell::bind()
 {
+  _tankProperties.bind();
   if (_impl && _impl->get_inited()) {
     if (_impl->get_bound()) {
       throw sg_exception("FDMShell::bind of bound FGInterface impl");
     }
-    
     _impl->bind();
   }
 }
 
 void FDMShell::unbind()
 {
-  _impl->unbind();
+  if( _impl ) _impl->unbind();
+  _tankProperties.unbind();
 }
 
 void FDMShell::update(double dt)
@@ -111,7 +116,7 @@ void FDMShell::update(double dt)
     double lon = fgGetDouble("/sim/presets/longitude-deg");
     double lat = fgGetDouble("/sim/presets/latitude-deg");
         
-    double range = 1000.0; // in metres
+    double range = 1000.0; // in meters
     SGGeod geod = SGGeod::fromDeg(lon, lat);
     if (globals->get_scenery()->scenery_available(geod, range)) {
         SG_LOG(SG_FLIGHT, SG_INFO, "Scenery loaded, will init FDM");
@@ -122,6 +127,7 @@ void FDMShell::update(double dt)
         _impl->bind();
         
         evil_global_fdm_state = _impl;
+        fgSetBool("/sim/fdm-initialized", true);
         fgSetBool("/sim/signals/fdm-initialized", true);
     }
   }
@@ -133,8 +139,8 @@ void FDMShell::update(double dt)
 // pull environmental data in, since the FDMs are lazy
   _impl->set_Velocities_Local_Airmass(
       _props->getDoubleValue("environment/wind-from-north-fps", 0.0),
-                       _props->getDoubleValue("environment/wind-from-east-fps", 0.0),
-                       _props->getDoubleValue("environment/wind-from-down-fps", 0.0));
+      _props->getDoubleValue("environment/wind-from-east-fps", 0.0),
+      _props->getDoubleValue("environment/wind-from-down-fps", 0.0));
 
   if (_props->getBoolValue("environment/params/control-fdm-atmosphere")) {
     // convert from Rankine to Celsius
@@ -154,24 +160,8 @@ void FDMShell::update(double dt)
     _impl->ToggleDataLogging(doLog);
   }
 
-// FIXME - replay manager should handle most of this           
-  int replayState = fgGetInt("/sim/freeze/replay-state", 0);
-  if (replayState == 0) {
-    _impl->update(dt); // normal code path
-  } else if (replayState == 1) {
-    // should be inside FGReplay!
-    SGPropertyNode* replay_time = fgGetNode("/sim/replay/time", true);
-    FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" ));
-    r->replay( replay_time->getDoubleValue() );
-    replay_time->setDoubleValue( replay_time->getDoubleValue()
-                                             + ( dt
-                                                 * fgGetInt("/sim/speed-up") ) );
-  
-  } else if (replayState == 2) {
-    // paused replay, no-op
-  } else {
-    throw sg_range_exception("unknown FGReplay state");
-  }  
+  if (!_impl->is_suspended())
+      _impl->update(dt);
 }
 
 void FDMShell::createImplementation()
@@ -262,3 +252,13 @@ void FDMShell::createImplementation()
 
 }
 
+/*
+ * Return FDM subsystem.
+ */
+
+SGSubsystem* FDMShell::getFDM()
+{
+    /* FIXME we could drop/replace this method, when _impl was a added
+     * to the global subsystem manager - like other proper subsystems... */
+    return _impl;
+}