Merge branch 'next' of 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 aaf94a6e73476bc20f359cf448211189b212f4a4..f06303e2024b565ec1ce2d87fa100f34c39c1d5a 100644 (file)
--- a/src/FDM/fdm_shell.cxx
+++ b/src/FDM/fdm_shell.cxx
@@ -35,7 +35,7 @@
 #include <Scenery/scenery.hxx>
 
 // all the FDMs, since we are the factory method
-#if ENABLE_SP_FDM
+#ifdef ENABLE_SP_FDM
 #include <FDM/SP/ADA.hxx>
 #include <FDM/SP/ACMS.hxx>
 #include <FDM/SP/MagicCarpet.hxx>
@@ -49,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
@@ -56,6 +57,7 @@
 FGInterface* evil_global_fdm_state = NULL;
 
 FDMShell::FDMShell() :
+  _tankProperties( fgGetNode("/consumables/fuel", true) ),
   _impl(NULL),
   _dataLogging(false)
 {
@@ -70,6 +72,17 @@ void FDMShell::init()
 {
   _props = globals->get_props();
   fgSetBool("/sim/fdm-initialized", false);
+
+  _wind_north       = _props->getNode("environment/wind-from-north-fps",    true);
+  _wind_east        = _props->getNode("environment/wind-from-east-fps",     true);
+  _wind_down        = _props->getNode("environment/wind-from-down-fps",     true);
+  _control_fdm_atmo = _props->getNode("environment/params/control-fdm-atmosphere", true);
+  _temp_degc        = _props->getNode("environment/temperature-degc",       true);
+  _pressure_inhg    = _props->getNode("environment/pressure-inhg",          true);
+  _density_slugft   = _props->getNode("environment/density-slugft3",        true);
+  _data_logging     = _props->getNode("/sim/temp/fdm-data-logging",         true);
+  _replay_master    = _props->getNode("/sim/freeze/replay-state",           true);
+
   createImplementation();
 }
 
@@ -88,11 +101,11 @@ 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();
   }
 }
@@ -100,6 +113,7 @@ void FDMShell::bind()
 void FDMShell::unbind()
 {
   if( _impl ) _impl->unbind();
+  _tankProperties.unbind();
 }
 
 void FDMShell::update(double dt)
@@ -113,7 +127,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");
@@ -135,46 +149,42 @@ 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));
+          _wind_north->getDoubleValue(),
+          _wind_east->getDoubleValue(),
+          _wind_down->getDoubleValue());
 
-  if (_props->getBoolValue("environment/params/control-fdm-atmosphere")) {
+  if (_control_fdm_atmo->getBoolValue()) {
     // convert from Rankine to Celsius
-    double tempDegC = _props->getDoubleValue("environment/temperature-degc");
+    double tempDegC = _temp_degc->getDoubleValue();
     _impl->set_Static_temperature((9.0/5.0) * (tempDegC + 273.15));
     
     // convert from inHG to PSF
-    double pressureInHg = _props->getDoubleValue("environment/pressure-inhg");
+    double pressureInHg = _pressure_inhg->getDoubleValue();
     _impl->set_Static_pressure(pressureInHg * 70.726566);
     // keep in slugs/ft^3
-    _impl->set_Density(_props->getDoubleValue("environment/density-slugft3"));
+    _impl->set_Density(_density_slugft->getDoubleValue());
   }
 
-  bool doLog = _props->getBoolValue("/sim/temp/fdm-data-logging", false);
+  bool doLog = _data_logging->getBoolValue();
   if (doLog != _dataLogging) {
     _dataLogging = doLog;
     _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");
-  }  
+  switch(_replay_master->getIntValue())
+  {
+      case 0:
+          // normal FDM operation
+          _impl->update(dt);
+          break;
+      case 3:
+          // resume FDM operation at current replay position
+          _impl->reinit();
+          break;
+      default:
+          // replay is active
+          break;
+  }
 }
 
 void FDMShell::createImplementation()
@@ -188,7 +198,7 @@ void FDMShell::createImplementation()
         _impl = new FGLaRCsim( dt );
     } else if ( model == "jsb" ) {
         _impl = new FGJSBsim( dt );
-#if ENABLE_SP_FDM
+#ifdef ENABLE_SP_FDM
     } else if ( model == "ada" ) {
         _impl = new FGADA( dt );
     } else if ( model == "acms" ) {
@@ -264,4 +274,3 @@ void FDMShell::createImplementation()
     }
 
 }
-