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 15268f93e02d02e84c2c7d84848242dc34117d56..c23c61a47c5cd22e81311295988f7e5f8f00dde1 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -292,10 +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_down_fps());
-  simgear::Particles::setWindVector(windVec * SG_FEET_TO_METER);
+                    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::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