Merge branch 'next' of D:\Git_New\flightgear into next

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

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 07e834772b165770283cca25e73bff601ce2124f..c23c61a47c5cd22e81311295988f7e5f8f00dde1 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -293,7 +293,7 @@ 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(),
-                                       -_environment->get_wind_from_east_fps(),
+                    -_environment->get_wind_from_east_fps(),
                     0);
          // SG_LOG(SG_GENERAL, SG_ALERT, "-_environment->get_wind_from_north_mps() " <<
                   //_environment->get_wind_from_north_fps() * SG_FEET_TO_METER
@@ -301,7 +301,9 @@ FGEnvironmentMgr::update (double dt)
                   //<< -_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() );