//
// 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.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#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>
#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 "fgclouds.hxx"
+#include "precipitation_mgr.hxx"
class SGSky;
extern SGSky *thesky;
: _environment(new FGEnvironment)
{
- if (fgGetBool("/environment/params/real-world-weather-fetch") == true)
- _controller = new FGMetarEnvironmentCtrl;
- else
- _controller = new FGInterpolateEnvironmentCtrl;
-
+ _controller = new FGInterpolateEnvironmentCtrl;
_controller->setEnvironment(_environment);
- set_subsystem("controller", _controller, 0.5);
- fgClouds = new FGClouds;
+ set_subsystem("controller", _controller, 0.1 );
+
+ fgClouds = new FGClouds();
+
+ _metarcontroller = new FGMetarCtrl(_controller );
+ set_subsystem("metarcontroller", _metarcontroller, 0.1 );
+
+ _metarfetcher = new FGMetarFetcher();
+ set_subsystem("metarfetcher", _metarfetcher, 1.0 );
+
+ _precipitationManager = new FGPrecipitationMgr;
+ set_subsystem("precipitation", _precipitationManager);
}
FGEnvironmentMgr::~FGEnvironmentMgr ()
{
- delete _environment;
- delete _controller;
+ remove_subsystem("precipitation");
+ delete _precipitationManager;
+
+ remove_subsystem("metarcontroller");
+ delete _metarfetcher;
+
+ remove_subsystem("metarfetcher");
+ delete _metarcontroller;
+
delete fgClouds;
+
+ remove_subsystem("controller");
+ delete _controller;
+
+ delete _environment;
}
void
void
FGEnvironmentMgr::bind ()
{
+ SGSubsystemGroup::bind();
fgTie("/environment/visibility-m", _environment,
&FGEnvironment::get_visibility_m, &FGEnvironment::set_visibility_m);
fgSetArchivable("/environment/visibility-m");
+ fgTie("/environment/effective-visibility-m", thesky,
+ &SGSky::get_visibility );
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); // FIXME: read-only for now
+ fgTie("/environment/temperature-degf", _environment,
+ &FGEnvironment::get_temperature_degf); // FIXME: read-only for now
fgTie("/environment/dewpoint-sea-level-degc", _environment,
&FGEnvironment::get_dewpoint_sea_level_degc,
&FGEnvironment::set_dewpoint_sea_level_degc);
&FGEnvironment::get_pressure_inhg); // FIXME: read-only for now
fgTie("/environment/density-slugft3", _environment,
&FGEnvironment::get_density_slugft3); // read-only
+ fgTie("/environment/relative-humidity", _environment,
+ &FGEnvironment::get_relative_humidity); //ro
+ fgTie("/environment/atmosphere/density-tropo-avg", _environment,
+ &FGEnvironment::get_density_tropo_avg_kgm3); //ro
+ fgTie("/environment/atmosphere/altitude-half-to-sun", _environment,
+ &FGEnvironment::get_altitude_half_to_sun_m,
+ &FGEnvironment::set_altitude_half_to_sun_m);
+ fgTie("/environment/atmosphere/altitude-troposphere-top", _environment,
+ &FGEnvironment::get_altitude_tropo_top_m,
+ &FGEnvironment::set_altitude_tropo_top_m);
fgTie("/environment/wind-from-heading-deg", _environment,
&FGEnvironment::get_wind_from_heading_deg,
&FGEnvironment::set_wind_from_heading_deg);
&FGEnvironment::get_wind_from_down_fps,
&FGEnvironment::set_wind_from_down_fps);
fgSetArchivable("/environment/wind-from-down-fps");
+
+ fgTie("/environment/thermal-lift-fps", _environment,
+ &FGEnvironment::get_thermal_lift_fps,
+ &FGEnvironment::set_thermal_lift_fps);
+ fgSetArchivable("/environment/thermal-lift-fps");
+ fgTie("/environment/ridge-lift-fps", _environment,
+ &FGEnvironment::get_ridge_lift_fps,
+ &FGEnvironment::set_ridge_lift_fps);
+ fgSetArchivable("/environment/ridge-lift-fps");
+
fgTie("/environment/turbulence/magnitude-norm", _environment,
&FGEnvironment::get_turbulence_magnitude_norm,
&FGEnvironment::set_turbulence_magnitude_norm);
&FGEnvironmentMgr::set_cloud_layer_coverage);
fgSetArchivable(buf);
}
- fgTie("/sim/rendering/clouds3d-enable", &sgEnviro,
- &SGEnviro::get_clouds_enable_state,
- &SGEnviro::set_clouds_enable_state);
- fgTie("/sim/rendering/clouds3d-vis-range", &sgEnviro,
- &SGEnviro::get_clouds_visibility,
- &SGEnviro::set_clouds_visibility);
- fgTie("/sim/rendering/clouds3d-density", &sgEnviro,
- &SGEnviro::get_clouds_density,
- &SGEnviro::set_clouds_density);
- fgTie("/sim/rendering/clouds3d-cache-size", &sgEnviro,
- &SGEnviro::get_clouds_CacheSize,
- &SGEnviro::set_clouds_CacheSize);
- fgTie("/sim/rendering/clouds3d-cache-resolution", &sgEnviro,
- &SGEnviro::get_CacheResolution,
- &SGEnviro::set_CacheResolution);
+
+ fgTie("/environment/metar/data", _metarcontroller,
+ &FGMetarCtrl::get_metar, &FGMetarCtrl::set_metar );
+
+ fgTie("/sim/rendering/clouds3d-enable", fgClouds,
+ &FGClouds::get_3dClouds,
+ &FGClouds::set_3dClouds);
+ fgTie("/sim/rendering/clouds3d-density", thesky,
+ &SGSky::get_3dCloudDensity,
+ &SGSky::set_3dCloudDensity);
+ fgTie("/sim/rendering/clouds3d-vis-range", thesky,
+ &SGSky::get_3dCloudVisRange,
+ &SGSky::set_3dCloudVisRange);
+
fgTie("/sim/rendering/precipitation-enable", &sgEnviro,
- &SGEnviro::get_precipitation_enable_state,
+ &SGEnviro::get_precipitation_enable_state,
&SGEnviro::set_precipitation_enable_state);
- fgTie("/environment/rebuild_layers", fgClouds,
+ fgTie("/environment/rebuild-layers", fgClouds,
&FGClouds::get_update_event,
&FGClouds::set_update_event);
fgTie("/sim/rendering/lightning-enable", &sgEnviro,
fgTie("/environment/turbulence/use-cloud-turbulence", &sgEnviro,
&SGEnviro::get_turbulence_enable_state,
&SGEnviro::set_turbulence_enable_state);
+ sgEnviro.config(fgGetNode("/sim/rendering/precipitation"));
}
void
FGEnvironmentMgr::unbind ()
{
fgUntie("/environment/visibility-m");
+ fgUntie("/environment/effective-visibility-m");
fgUntie("/environment/temperature-sea-level-degc");
fgUntie("/environment/temperature-degc");
fgUntie("/environment/dewpoint-sea-level-degc");
fgUntie("/environment/pressure-sea-level-inhg");
fgUntie("/environment/pressure-inhg");
fgUntie("/environment/density-inhg");
+ fgUntie("/environment/relative-humidity");
+ fgUntie("/environment/atmosphere/density-tropo-avg");
fgUntie("/environment/wind-from-north-fps");
fgUntie("/environment/wind-from-east-fps");
fgUntie("/environment/wind-from-down-fps");
+
+ fgUntie("/environment/thermal-lift-fps");
+ fgUntie("/environment/ridge-lift-fps");
+
+ fgUntie("/environment/atmosphere/altitude-half-to-sun");
+ fgUntie("/environment/atmosphere/altitude-troposphere-top");
for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
char buf[128];
sprintf(buf, "/environment/clouds/layer[%d]/span-m", i);
fgUntie("/sim/rendering/clouds3d-enable");
fgUntie("/sim/rendering/clouds3d-vis-range");
fgUntie("/sim/rendering/clouds3d-density");
- fgUntie("/sim/rendering/clouds3d-cache-size");
- fgUntie("/sim/rendering/clouds3d-cache-resolution");
fgUntie("/sim/rendering/precipitation-enable");
- fgUntie("/environment/rebuild_layers");
+ fgUntie("/environment/rebuild-layers");
+ fgUntie("/environment/weather-scenario");
fgUntie("/sim/rendering/lightning-enable");
fgUntie("/environment/turbulence/use-cloud-turbulence");
+ SGSubsystemGroup::unbind();
}
void
_environment->get_wind_from_east_fps(),
_environment->get_wind_from_down_fps());
_environment->set_elevation_ft(fgGetDouble("/position/altitude-ft"));
+ osg::Vec3 windVec(-_environment->get_wind_from_north_fps(),
+ -_environment->get_wind_from_east_fps(),
+ _environment->get_wind_from_down_fps());
+ simgear::Particles::setWindVector(windVec * SG_FEET_TO_METER);
_update_fdm();
}
return env;
}
+FGEnvironment
+FGEnvironmentMgr::getEnvironment(const SGGeod& aPos) const
+{
+ // Always returns the same environment
+ // for now; we'll make it interesting
+ // later.
+ FGEnvironment env = *_environment;
+ env.set_elevation_ft(aPos.getElevationFt());
+ return env;
+
+}
+
void
FGEnvironmentMgr::_update_fdm () const
{
projects / flightgear.git / blobdiff