From: Vivian Meazza Date: Wed, 28 Jul 2010 21:39:07 +0000 (+0100) Subject: Merge branch 'work4' into next X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a61f34667fdb43198f707e719f56f5bbaf2fb7b5;p=flightgear.git Merge branch 'work4' into next Conflicts: src/Environment/environment_mgr.cxx Signed-off-by: Vivian Meazza --- a61f34667fdb43198f707e719f56f5bbaf2fb7b5 diff --cc src/Environment/environment_mgr.cxx index 944948f7d,07e834772..c23c61a47 --- a/src/Environment/environment_mgr.cxx +++ b/src/Environment/environment_mgr.cxx @@@ -294,12 -292,20 +292,22 @@@ FGEnvironmentMgr::update (double dt _environment->set_elevation_ft(fgGetDouble("/position/altitude-ft")); _environment->set_local_weather_lift_fps(fgGetDouble("/local-weather/current/thermal-lift")); - osg::Vec3 windVec(-_environment->get_wind_from_north_fps(), + osg::Vec3 windVec(_environment->get_wind_from_north_fps(), - -_environment->get_wind_from_east_fps(), + -_environment->get_wind_from_east_fps(), - _environment->get_wind_from_down_fps()); + 0); + // SG_LOG(SG_GENERAL, SG_ALERT, "-_environment->get_wind_from_north_mps() " << + //_environment->get_wind_from_north_fps() * SG_FEET_TO_METER + //<< " -_environment->get_wind_from_east_mps() " + //<< -_environment->get_wind_from_east_fps() * SG_FEET_TO_METER + //); + - simgear::Particles::setWindVector(windVec * SG_FEET_TO_METER); + // simgear::Particles::setWindVector(windVec * SG_FEET_TO_METER); + simgear::Particles::setWindFrom( _environment->get_wind_from_heading_deg(), + _environment->get_wind_speed_kt() ); + //double wind_true_deg = _environment->get_wind_from_heading_deg(); + //simgear::Particles::setWindFrom( wind_true_deg, + // _environment->get_wind_speed_kt() ); + } FGEnvironment