Merge branch 'next' into durk-atc

[flightgear.git] / src / Environment / environment_mgr.cxx

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 40ca18f2052af7e3a713a1450535cd584548b5f6..0f1b201df3f63c1f49a0781f6afffeab7e6497d0 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -27,7 +27,6 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/scene/sky/sky.hxx>
-#include <simgear/environment/visual_enviro.hxx>
 #include <simgear/scene/model/particles.hxx>
 
 #include <Main/main.hxx>
@@ -43,18 +42,56 @@
 #include "ridge_lift.hxx"
 #include "terrainsampler.hxx"
 #include "Airports/simple.hxx"
+#include "gravity.hxx"
 
 class SGSky;
 extern SGSky *thesky;
 
+class FG3DCloudsListener : public SGPropertyChangeListener {
+public:
+  FG3DCloudsListener( FGClouds * fgClouds );
+  virtual ~FG3DCloudsListener();
+
+  virtual void valueChanged (SGPropertyNode * node);
+
+private:
+  FGClouds * _fgClouds;
+  SGPropertyNode_ptr _shaderNode;
+  SGPropertyNode_ptr _enableNode;
+};
+
+FG3DCloudsListener::FG3DCloudsListener( FGClouds * fgClouds ) :
+    _fgClouds( fgClouds ) 
+{
+  _shaderNode = fgGetNode( "/sim/rendering/shader-effects", true );
+  _shaderNode->addChangeListener( this );
+
+  _enableNode = fgGetNode( "/sim/rendering/clouds3d-enable", true );
+  _enableNode->addChangeListener( this );
+
+  valueChanged( _enableNode );
+}
+
+FG3DCloudsListener::~FG3DCloudsListener()
+{
+  _enableNode->removeChangeListener( this );
+  _shaderNode->removeChangeListener( this );
+}
+
+void FG3DCloudsListener::valueChanged( SGPropertyNode * node )
+{
+  _fgClouds->set_3dClouds( _enableNode->getBoolValue() && _shaderNode->getBoolValue() );
+}
+
 FGEnvironmentMgr::FGEnvironmentMgr () :
   _environment(new FGEnvironment()),
   fgClouds(new FGClouds()),
   _cloudLayersDirty(true),
-  _altitudeNode(fgGetNode("/position/altitude-ft", true)),
+  _altitude_n(fgGetNode("/position/altitude-ft", true)),
   _longitude_n(fgGetNode( "/position/longitude-deg", true )),
   _latitude_n( fgGetNode( "/position/latitude-deg", true )),
-  _positionTimeToLive(0.0)
+  _positionTimeToLive(0.0),
+  _3dCloudsEnableListener(new FG3DCloudsListener(fgClouds) )
 {
   set_subsystem("controller", Environment::LayerInterpolateController::createInstance( fgGetNode("/environment/config", true ) ));
   set_subsystem("realwx", Environment::RealWxController::createInstance( fgGetNode("/environment/realwx", true ) ), 1.0 );
@@ -90,6 +127,8 @@ FGEnvironmentMgr::~FGEnvironmentMgr ()
 
   delete fgClouds;
   delete _environment;
+
+  delete _3dCloudsEnableListener;
 }
 
 void
@@ -97,6 +136,15 @@ FGEnvironmentMgr::init ()
 {
   SG_LOG( SG_GENERAL, SG_INFO, "Initializing environment subsystem");
   SGSubsystemGroup::init();
+  fgClouds->Init();
+
+  // FIXME: is this really part of the environment_mgr?
+  // Initialize the longitude, latitude and altitude to the initial position
+  // of the aircraft so that the atmospheric properties (pressure, temperature
+  // and density) can be initialized accordingly.
+  _altitude_n->setDoubleValue(fgGetDouble("/sim/presets/altitude-ft"));
+  _longitude_n->setDoubleValue(fgGetDouble("/sim/presets/longitude-deg"));
+  _latitude_n->setDoubleValue(fgGetDouble("/sim/presets/latitude-deg"));
 }
 
 void
@@ -111,7 +159,7 @@ FGEnvironmentMgr::bind ()
 {
   SGSubsystemGroup::bind();
   _environment->Tie( fgGetNode("/environment", true ) );
-  
+
   _tiedProperties.setRoot( fgGetNode( "/environment", true ) );
 
   _tiedProperties.Tie( "effective-visibility-m", thesky,
@@ -121,34 +169,34 @@ FGEnvironmentMgr::bind ()
           &FGClouds::get_update_event,
           &FGClouds::set_update_event);
 
-  _tiedProperties.Tie("turbulence/use-cloud-turbulence", &sgEnviro,
-          &SGEnviro::get_turbulence_enable_state,
-          &SGEnviro::set_turbulence_enable_state);
+//  _tiedProperties.Tie("turbulence/use-cloud-turbulence", &sgEnviro,
+//          &SGEnviro::get_turbulence_enable_state,
+//          &SGEnviro::set_turbulence_enable_state);
 
   for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
       SGPropertyNode_ptr layerNode = fgGetNode("/environment/clouds",true)->getChild("layer", i, true );
 
-      _tiedProperties.Tie( layerNode->getNode("span-m",true), this, i, 
+      _tiedProperties.Tie( layerNode->getNode("span-m",true), this, i,
               &FGEnvironmentMgr::get_cloud_layer_span_m,
               &FGEnvironmentMgr::set_cloud_layer_span_m);
 
-      _tiedProperties.Tie( layerNode->getNode("elevation-ft",true), this, i, 
+      _tiedProperties.Tie( layerNode->getNode("elevation-ft",true), this, i,
               &FGEnvironmentMgr::get_cloud_layer_elevation_ft,
               &FGEnvironmentMgr::set_cloud_layer_elevation_ft);
 
-      _tiedProperties.Tie( layerNode->getNode("thickness-ft",true), this, i, 
+      _tiedProperties.Tie( layerNode->getNode("thickness-ft",true), this, i,
               &FGEnvironmentMgr::get_cloud_layer_thickness_ft,
               &FGEnvironmentMgr::set_cloud_layer_thickness_ft);
 
-      _tiedProperties.Tie( layerNode->getNode("transition-ft",true), this, i, 
+      _tiedProperties.Tie( layerNode->getNode("transition-ft",true), this, i,
               &FGEnvironmentMgr::get_cloud_layer_transition_ft,
               &FGEnvironmentMgr::set_cloud_layer_transition_ft);
 
-      _tiedProperties.Tie( layerNode->getNode("coverage",true), this, i, 
+      _tiedProperties.Tie( layerNode->getNode("coverage",true), this, i,
               &FGEnvironmentMgr::get_cloud_layer_coverage,
               &FGEnvironmentMgr::set_cloud_layer_coverage);
 
-      _tiedProperties.Tie( layerNode->getNode("coverage-type",true), this, i, 
+      _tiedProperties.Tie( layerNode->getNode("coverage-type",true), this, i,
               &FGEnvironmentMgr::get_cloud_layer_coverage_type,
               &FGEnvironmentMgr::set_cloud_layer_coverage_type);
 
@@ -163,10 +211,6 @@ FGEnvironmentMgr::bind ()
 
   _tiedProperties.setRoot( fgGetNode("/sim/rendering", true ) );
 
-  _tiedProperties.Tie( "clouds3d-enable", fgClouds,
-          &FGClouds::get_3dClouds,
-          &FGClouds::set_3dClouds);
-
   _tiedProperties.Tie( "clouds3d-density", thesky,
           &SGSky::get_3dCloudDensity,
           &SGSky::set_3dCloudDensity);
@@ -174,16 +218,11 @@ FGEnvironmentMgr::bind ()
   _tiedProperties.Tie("clouds3d-vis-range", thesky,
           &SGSky::get_3dCloudVisRange,
           &SGSky::set_3dCloudVisRange);
-  
-  _tiedProperties.Tie("precipitation-enable", &sgEnviro,
-          &SGEnviro::get_precipitation_enable_state, 
-          &SGEnviro::set_precipitation_enable_state);
 
-  _tiedProperties.Tie("lightning-enable", &sgEnviro,
-          &SGEnviro::get_lightning_enable_state,
-          &SGEnviro::set_lightning_enable_state);
+//  _tiedProperties.Tie("lightning-enable", &sgEnviro,
+//          &SGEnviro::get_lightning_enable_state,
+//          &SGEnviro::set_lightning_enable_state);
 
-  sgEnviro.config(fgGetNode("/sim/rendering/precipitation"));
 }
 
 void
@@ -198,8 +237,8 @@ void
 FGEnvironmentMgr::update (double dt)
 {
   SGSubsystemGroup::update(dt);
-  
-  _environment->set_elevation_ft( _altitudeNode->getDoubleValue() );
+
+  _environment->set_elevation_ft( _altitude_n->getDoubleValue() );
 
   simgear::Particles::setWindFrom( _environment->get_wind_from_heading_deg(),
                                    _environment->get_wind_speed_kt() );
@@ -208,6 +247,14 @@ FGEnvironmentMgr::update (double dt)
     fgClouds->set_update_event( fgClouds->get_update_event()+1 );
   }
 
+
+  fgSetDouble( "/environment/gravitational-acceleration-mps2", 
+    Environment::Gravity::instance()->getGravity(SGGeod::fromDegFt(
+      _longitude_n->getDoubleValue(),
+      _latitude_n->getDoubleValue(),
+      _altitude_n->getDoubleValue()
+  )));
+
   _positionTimeToLive -= dt;
   if( _positionTimeToLive <= 0.0 )
   {
@@ -226,7 +273,7 @@ FGEnvironmentMgr::update (double dt)
       }
       else
       {
-          const string currentId = fgGetString("/sim/airport/closest-airport-id", ""); 
+          const string currentId = fgGetString("/sim/airport/closest-airport-id", "");
           if (currentId != nearestAirport->ident())
           {
               fgSetString("/sim/airport/closest-airport-id",
@@ -349,31 +396,31 @@ FGEnvironmentMgr::get_cloud_layer_coverage_type (int index) const
   return thesky->get_cloud_layer(index)->getCoverage();
 }
 
-double 
+double
 FGEnvironmentMgr::get_cloud_layer_visibility_m (int index) const
 {
     return thesky->get_cloud_layer(index)->getVisibility_m();
 }
 
-void 
+void
 FGEnvironmentMgr::set_cloud_layer_visibility_m (int index, double visibility_m)
 {
     thesky->get_cloud_layer(index)->setVisibility_m(visibility_m);
 }
 
-double 
+double
 FGEnvironmentMgr::get_cloud_layer_maxalpha (int index ) const
 {
     return thesky->get_cloud_layer(index)->getMaxAlpha();
 }
 
-void 
+void
 FGEnvironmentMgr::set_cloud_layer_maxalpha (int index, double maxalpha)
 {
     thesky->get_cloud_layer(index)->setMaxAlpha(maxalpha);
 }
 
-void 
+void
 FGEnvironmentMgr::set_cloud_layer_coverage_type (int index, int type )
 {
   if( type < 0 || type >= SGCloudLayer::SG_MAX_CLOUD_COVERAGES ) {