X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Fenvironment_mgr.cxx;h=3182f1159d24f95fe7579eb5077e5ff9e12cda20;hb=dc76290d6e7d2f24d6c352d8f9da4b0f9f1e5f40;hp=61cfb69ee6ccc4bb905501a8222b7bfc6c0c6c74;hpb=b091433cf609866f23d835de12c8f344d7de58df;p=flightgear.git

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 61cfb69ee..3182f1159 100644
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -16,150 +16,193 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// $Id$
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <cstring>
 
+#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/sky/sky.hxx>
+#include <simgear/scene/sky/sky.hxx>
+#include <simgear/environment/visual_enviro.hxx>
+#include <simgear/scene/model/particles.hxx>
 
+#include <Main/main.hxx>
 #include <Main/fg_props.hxx>
-#include <Aircraft/aircraft.hxx>
+#include <FDM/flight.hxx>
 
 #include "environment.hxx"
-#include "environment_ctrl.hxx"
 #include "environment_mgr.hxx"
+#include "environment_ctrl.hxx"
+#include "realwx_ctrl.hxx"
+#include "fgclouds.hxx"
+#include "precipitation_mgr.hxx"
+#include "ridge_lift.hxx"
+#include "terrainsampler.hxx"
 
-extern SGSky *thesky;		// FIXME: from main.cxx
-
-#define MAX_CLOUD_LAYERS 5
-
+class SGSky;
+extern SGSky *thesky;
 
-FGEnvironmentMgr::FGEnvironmentMgr ()
-  : _environment(new FGEnvironment),
-    _controller(new FGUserDefEnvironmentCtrl)
+FGEnvironmentMgr::FGEnvironmentMgr () :
+  _environment(new FGEnvironment()),
+  fgClouds(new FGClouds()),
+  _altitudeNode(fgGetNode("/position/altitude-ft", true)),
+  _cloudLayersDirty(true)
 {
+  set_subsystem("controller", Environment::LayerInterpolateController::createInstance( fgGetNode("/environment/config", true ) ));
+  set_subsystem("realwx", Environment::RealWxController::createInstance( fgGetNode("/environment/realwx", true ) ), 1.0 );
+
+  set_subsystem("precipitation", new FGPrecipitationMgr);
+  set_subsystem("terrainsampler", Environment::TerrainSampler::createInstance( fgGetNode("/environment/terrain", true ) ));
+  set_subsystem("ridgelift", new FGRidgeLift);
 }
 
 FGEnvironmentMgr::~FGEnvironmentMgr ()
 {
+  SGSubsystem * subsys;
+
+  subsys = get_subsystem( "ridgelift" );
+  remove_subsystem( "ridgelift" );
+  delete subsys;
+
+  subsys = get_subsystem( "terrainsampler" );
+  remove_subsystem( "terrainsampler" );
+  delete subsys;
+
+  subsys = get_subsystem( "precipitation" );
+  remove_subsystem("precipitation");
+  delete subsys;
+
+  subsys = get_subsystem("realwx");
+  remove_subsystem("realwx");
+  delete subsys;
+
+  subsys = get_subsystem("controller");
+  remove_subsystem("controller");
+  delete subsys;
+
+  delete fgClouds;
   delete _environment;
-  delete _controller;
 }
 
 void
 FGEnvironmentMgr::init ()
 {
   SG_LOG( SG_GENERAL, SG_INFO, "Initializing environment subsystem");
-  _controller->setEnvironment(_environment);
-  _controller->init();
-  _update_fdm();
+  SGSubsystemGroup::init();
+}
 
-  SGPath texture_path(globals->get_fg_root());
-  texture_path.append("Textures");
-  texture_path.append("Sky");
-  for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
-    SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
-    thesky->add_cloud_layer(layer);
-  }
+void
+FGEnvironmentMgr::reinit ()
+{
+  SG_LOG( SG_GENERAL, SG_INFO, "Reinitializing environment subsystem");
+  SGSubsystemGroup::reinit();
 }
 
 void
 FGEnvironmentMgr::bind ()
 {
-  fgTie("/environment/visibility-m", _environment,
-	&FGEnvironment::get_visibility_m, &FGEnvironment::set_visibility_m);
-  fgSetArchivable("/environment/visibility-m");
-  fgTie("/environment/temperature-sea-level-degc", _environment,
-	&FGEnvironment::get_temperature_sea_level_degc,
-	&FGEnvironment::set_temperature_sea_level_degc);
-  fgSetArchivable("/environment/temperature-sea-level-degc");
-  fgTie("/environment/temperature-degc", _environment,
-	&FGEnvironment::get_temperature_degc,
-	&FGEnvironment::set_temperature_degc);
-  fgSetArchivable("/environment/temperature-degc");
-  fgTie("/environment/pressure-sea-level-inhg", _environment,
-	&FGEnvironment::get_pressure_sea_level_inhg,
-	&FGEnvironment::set_pressure_sea_level_inhg);
-  fgSetArchivable("/environment/pressure-sea-level-inhg");
-  fgTie("/environment/pressure-inhg", _environment,
-	&FGEnvironment::get_pressure_inhg,
-	&FGEnvironment::set_pressure_inhg);
-  fgSetArchivable("/environment/pressure-inhg");
-  fgTie("/environment/density-sea-level-slugft3", _environment,
-	&FGEnvironment::get_density_sea_level_slugft3,
-	&FGEnvironment::set_density_sea_level_slugft3);
-  fgSetArchivable("/environment/density-sea-level-slugft3");
-  fgTie("/environment/density-slugft3", _environment,
-	&FGEnvironment::get_density_slugft3,
-	&FGEnvironment::set_density_slugft3);
-  fgSetArchivable("/environment/density-inhg");
-  fgTie("/environment/wind-from-heading-deg", _environment,
-	&FGEnvironment::get_wind_from_heading_deg,
-	&FGEnvironment::set_wind_from_heading_deg);
-  fgTie("/environment/wind-speed-kt", _environment,
-	&FGEnvironment::get_wind_speed_kt, &FGEnvironment::set_wind_speed_kt);
-  fgTie("/environment/wind-from-north-fps", _environment,
-	&FGEnvironment::get_wind_from_north_fps,
-	&FGEnvironment::set_wind_from_north_fps);
-  fgSetArchivable("/environment/wind-from-north-fps");
-  fgTie("/environment/wind-from-east-fps", _environment,
-	&FGEnvironment::get_wind_from_east_fps,
-	&FGEnvironment::set_wind_from_east_fps);
-  fgSetArchivable("/environment/wind-from-east-fps");
-  fgTie("/environment/wind-from-down-fps", _environment,
-	&FGEnvironment::get_wind_from_down_fps,
-	&FGEnvironment::set_wind_from_down_fps);
-  fgSetArchivable("/environment/wind-from-down-fps");
+  SGSubsystemGroup::bind();
+  _environment->Tie( fgGetNode("/environment", true ) );
+  
+  _tiedProperties.setRoot( fgGetNode( "/environment", true ) );
+
+  _tiedProperties.Tie( "effective-visibility-m", thesky,
+       &SGSky::get_visibility );
+
+  _tiedProperties.Tie("rebuild-layers", fgClouds,
+      &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);
 
   for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
-    char buf[128];
-    sprintf(buf, "/environment/clouds/layer[%d]/span-m", i);
-    fgTie(buf, this, i,
+    SGPropertyNode_ptr layerNode = fgGetNode("/environment/clouds",true)->getChild("layer", i, true );
+
+    _tiedProperties.Tie( layerNode->getNode("span-m",true), this, i, 
 	  &FGEnvironmentMgr::get_cloud_layer_span_m,
 	  &FGEnvironmentMgr::set_cloud_layer_span_m);
-    sprintf(buf, "/environment/clouds/layer[%d]/elevation-ft", i);
-    fgTie(buf, this, i,
+
+    _tiedProperties.Tie( layerNode->getNode("elevation-ft",true), this, i, 
 	  &FGEnvironmentMgr::get_cloud_layer_elevation_ft,
 	  &FGEnvironmentMgr::set_cloud_layer_elevation_ft);
-    sprintf(buf, "/environment/clouds/layer[%d]/thickness-ft", i);
-    fgTie(buf, this, i,
+
+    _tiedProperties.Tie( layerNode->getNode("thickness-ft",true), this, i, 
 	  &FGEnvironmentMgr::get_cloud_layer_thickness_ft,
 	  &FGEnvironmentMgr::set_cloud_layer_thickness_ft);
-    sprintf(buf, "/environment/clouds/layer[%d]/transition-ft", i);
-    fgTie(buf, this, i,
+
+    _tiedProperties.Tie( layerNode->getNode("transition-ft",true), this, i, 
 	  &FGEnvironmentMgr::get_cloud_layer_transition_ft,
 	  &FGEnvironmentMgr::set_cloud_layer_transition_ft);
-    sprintf(buf, "/environment/clouds/layer[%d]/type", i);
-    fgTie(buf, this, i,
-	  &FGEnvironmentMgr::get_cloud_layer_type,
-	  &FGEnvironmentMgr::set_cloud_layer_type);
+
+    _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, 
+	  &FGEnvironmentMgr::get_cloud_layer_coverage_type,
+	  &FGEnvironmentMgr::set_cloud_layer_coverage_type);
+
+    _tiedProperties.Tie( layerNode->getNode( "visibility-m",true), this, i,
+        &FGEnvironmentMgr::get_cloud_layer_visibility_m,
+        &FGEnvironmentMgr::set_cloud_layer_visibility_m);
+
+    _tiedProperties.Tie( layerNode->getNode( "alpha",true), this, i,
+        &FGEnvironmentMgr::get_cloud_layer_maxalpha,
+        &FGEnvironmentMgr::set_cloud_layer_maxalpha);
   }
+
+  _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);
+
+  _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);
+
+  sgEnviro.config(fgGetNode("/sim/rendering/precipitation"));
 }
 
 void
 FGEnvironmentMgr::unbind ()
 {
-  fgUntie("/environment/visibility-m");
-  fgUntie("/environment/wind-from-heading-deg");
-  fgUntie("/environment/wind-speed-kt");
-  fgUntie("/environment/wind-from-north-fps");
-  fgUntie("/environment/wind-from-east-fps");
-  fgUntie("/environment/wind-from-down-fps");
+  _tiedProperties.Untie();
+  _environment->Untie();
+  SGSubsystemGroup::unbind();
 }
 
 void
 FGEnvironmentMgr::update (double dt)
 {
-  _controller->update(dt);
-				// FIXME: the FDMs should update themselves
-  current_aircraft.fdm_state
-    ->set_Velocities_Local_Airmass(_environment->get_wind_from_north_fps(),
-				   _environment->get_wind_from_east_fps(),
-				   _environment->get_wind_from_down_fps());
-  _environment->set_elevation_ft(fgGetDouble("/position/altitude-ft"));
-
-  _update_fdm();
+  SGSubsystemGroup::update(dt);
+  
+  _environment->set_elevation_ft( _altitudeNode->getDoubleValue() );
+
+  simgear::Particles::setWindFrom( _environment->get_wind_from_heading_deg(),
+				   _environment->get_wind_speed_kt() );
+  if( _cloudLayersDirty ) {
+    _cloudLayersDirty = false;
+    fgClouds->set_update_event( fgClouds->get_update_event()+1 );
+  }
 }
 
 FGEnvironment
@@ -171,33 +214,24 @@ FGEnvironmentMgr::getEnvironment () const
 FGEnvironment
 FGEnvironmentMgr::getEnvironment (double lat, double lon, double alt) const
 {
-				// Always returns the same environment
-				// for now; we'll make it interesting
-				// later.
+  // Always returns the same environment
+  // for now; we'll make it interesting
+  // later.
   FGEnvironment env = *_environment;
   env.set_elevation_ft(alt);
   return env;
 }
 
-void
-FGEnvironmentMgr::_update_fdm () const
+FGEnvironment
+FGEnvironmentMgr::getEnvironment(const SGGeod& aPos) const
 {
-  //
-  // Pass atmosphere on to FDM
-  // FIXME: have FDMs read properties directly.
-  //
-  if (fgGetBool("/environment/params/control-fdm-atmosphere")) {
-				// convert from Rankine to Celsius
-    cur_fdm_state
-      ->set_Static_temperature((9.0/5.0)
-			       * _environment->get_temperature_degc() + 492.0);
-				// convert from inHG to PSF
-    cur_fdm_state
-      ->set_Static_pressure(_environment->get_pressure_inhg() * 70.726566);
-				// keep in slugs/ft^3
-    cur_fdm_state
-      ->set_Density(_environment->get_density_slugft3());
-  }
+  // Always returns the same environment
+  // for now; we'll make it interesting
+  // later.
+  FGEnvironment env = *_environment;
+  env.set_elevation_ft(aPos.getElevationFt());
+  return env;
+
 }
 
 double
@@ -221,8 +255,17 @@ FGEnvironmentMgr::get_cloud_layer_elevation_ft (int index) const
 void
 FGEnvironmentMgr::set_cloud_layer_elevation_ft (int index, double elevation_ft)
 {
+  FGEnvironment env = *_environment;
+  env.set_elevation_ft(elevation_ft);
+
   thesky->get_cloud_layer(index)
     ->setElevation_m(elevation_ft * SG_FEET_TO_METER);
+
+  thesky->get_cloud_layer(index)
+    ->setSpeed(env.get_wind_speed_kt() * 0.5151);	// 1 kt = 0.5151 m/s
+
+  thesky->get_cloud_layer(index)
+    ->setDirection(env.get_wind_from_heading_deg());
 }
 
 double
@@ -253,45 +296,66 @@ FGEnvironmentMgr::set_cloud_layer_transition_ft (int index,
 }
 
 const char *
-FGEnvironmentMgr::get_cloud_layer_type (int index) const
+FGEnvironmentMgr::get_cloud_layer_coverage (int index) const
 {
-  switch (thesky->get_cloud_layer(index)->getType()) {
-  case SGCloudLayer::SG_CLOUD_OVERCAST:
-    return "overcast";
-  case SGCloudLayer::SG_CLOUD_MOSTLY_CLOUDY:
-    return "mostly-cloudy";
-  case SGCloudLayer::SG_CLOUD_MOSTLY_SUNNY:
-    return "mostly-sunny";
-  case SGCloudLayer::SG_CLOUD_CIRRUS:
-    return "cirrus";
-  case SGCloudLayer::SG_CLOUD_CLEAR:
-    return "clear";
-  default:
-    return "unknown";
-  }
+  return thesky->get_cloud_layer(index)->getCoverageString().c_str();
 }
 
 void
-FGEnvironmentMgr::set_cloud_layer_type (int index, const char * type_name)
+FGEnvironmentMgr::set_cloud_layer_coverage (int index,
+                                            const char * coverage_name)
 {
-  SGCloudLayer::Type type;
-  if (!strcmp(type_name, "overcast"))
-    type = SGCloudLayer::SG_CLOUD_OVERCAST;
-  else if (!strcmp(type_name, "mostly-cloudy"))
-    type = SGCloudLayer::SG_CLOUD_MOSTLY_CLOUDY;
-  else if (!strcmp(type_name, "mostly-sunny"))
-    type = SGCloudLayer::SG_CLOUD_MOSTLY_SUNNY;
-  else if (!strcmp(type_name, "cirrus"))
-    type = SGCloudLayer::SG_CLOUD_CIRRUS;
-  else if (!strcmp(type_name, "clear"))
-    type = SGCloudLayer::SG_CLOUD_CLEAR;
-  else {
-    SG_LOG(SG_INPUT, SG_WARN, "Unknown cloud type " << type_name);
-    type = SGCloudLayer::SG_CLOUD_CLEAR;
-  }
-  thesky->get_cloud_layer(index)->setType(type);
+  if( thesky->get_cloud_layer(index)->getCoverageString() == coverage_name )
+    return;
+
+  thesky->get_cloud_layer(index)->setCoverageString(coverage_name);
+  _cloudLayersDirty = true;
+}
+
+int
+FGEnvironmentMgr::get_cloud_layer_coverage_type (int index) const
+{
+  return thesky->get_cloud_layer(index)->getCoverage();
+}
+
+double 
+FGEnvironmentMgr::get_cloud_layer_visibility_m (int index) const
+{
+    return thesky->get_cloud_layer(index)->getVisibility_m();
+}
+
+void 
+FGEnvironmentMgr::set_cloud_layer_visibility_m (int index, double visibility_m)
+{
+    thesky->get_cloud_layer(index)->setVisibility_m(visibility_m);
+}
+
+double 
+FGEnvironmentMgr::get_cloud_layer_maxalpha (int index ) const
+{
+    return thesky->get_cloud_layer(index)->getMaxAlpha();
 }
 
+void 
+FGEnvironmentMgr::set_cloud_layer_maxalpha (int index, double maxalpha)
+{
+    thesky->get_cloud_layer(index)->setMaxAlpha(maxalpha);
+}
+
+void 
+FGEnvironmentMgr::set_cloud_layer_coverage_type (int index, int type )
+{
+  if( type < 0 || type >= SGCloudLayer::SG_MAX_CLOUD_COVERAGES ) {
+    SG_LOG(SG_ALL,SG_WARN,"Unknown cloud layer type " << type << " ignored" );
+    return;
+  }
+
+  if( static_cast<SGCloudLayer::Coverage>(type) == thesky->get_cloud_layer(index)->getCoverage() )
+    return;
+
+  thesky->get_cloud_layer(index)->setCoverage(static_cast<SGCloudLayer::Coverage>(type));
+  _cloudLayersDirty = true;
+}
 
 
 // end of environment-mgr.cxx