fly/flightgear
1
0
Fork 0
Code Activity

Apply Ron Jensen's fix for Csaba's atan2() fix. Also remove some dead code,

Browse source 
and use SG_NORMALIZE_RANGE.
This commit is contained in:
jmt 2009-01-14 11:18:06 +00:00 • committed by Tim Moore
parent ad6a8df3ab
commit 473bf5f731
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/AIModel/AICarrier.cxx
View file

@ -27,6 +27,7 @@
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
#include <simgear/sg_inlines.h>
#include <simgear/math/SGMath.hxx> #include <simgear/math/SGMath.hxx>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/scene/util/SGNodeMasks.hxx> #include <simgear/scene/util/SGNodeMasks.hxx>
@ -482,17 +483,6 @@ bool FGAICarrier::getParkPosition(const string& id, SGGeod& geodPos,
// find relative wind // find relative wind
void FGAICarrier::UpdateWind( double dt) { void FGAICarrier::UpdateWind( double dt) {
double recip;
//calculate the reciprocal hdg
if (hdg >= 180)
recip = hdg - 180;
else
recip = hdg + 180;
//cout <<" heading: " << hdg << "recip: " << recip << endl;
//get the surface wind speed and direction //get the surface wind speed and direction
wind_from_deg = _surface_wind_from_deg_node->getDoubleValue(); wind_from_deg = _surface_wind_from_deg_node->getDoubleValue();
wind_speed_kts = _surface_wind_speed_node->getDoubleValue(); wind_speed_kts = _surface_wind_speed_node->getDoubleValue();
@ -517,18 +507,9 @@ void FGAICarrier::UpdateWind( double dt) {
rel_wind_from_deg = atan2(rel_wind_speed_from_east_kts, rel_wind_speed_from_north_kts) rel_wind_from_deg = atan2(rel_wind_speed_from_east_kts, rel_wind_speed_from_north_kts)
* SG_RADIANS_TO_DEGREES; * SG_RADIANS_TO_DEGREES;
// rationalise the output
if (rel_wind_speed_from_north_kts <= 0) {
rel_wind_from_deg = 180 + rel_wind_from_deg;
} else {
if(rel_wind_speed_from_east_kts <= 0)
rel_wind_from_deg = 360 + rel_wind_from_deg;
}
//calculate rel wind //calculate rel wind
rel_wind = rel_wind_from_deg - hdg; rel_wind = rel_wind_from_deg - hdg;
if (rel_wind > 180) SG_NORMALIZE_RANGE(rel_wind, -180.0, 180.0);
rel_wind -= 360;
//switch the wave-off lights //switch the wave-off lights
if (InToWind()) if (InToWind())