fly/flightgear
1
0
Fork 0
Code Activity

Merged commit from Vivian Meazza: Rationalize methods (ea85e50c2093942164bbc02f371a0c05b259f9f4)

Browse source
This commit is contained in:
Csaba Halasz 2010-09-30 01:05:04 +02:00
parent 141186a358
commit 5000d212ec
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/AIModel/AIEscort.cxx
View file

@ -230,7 +230,6 @@ bool FGAIEscort::getGroundElev(SGGeod inpos) {
}
void FGAIEscort::setParent()
{
double lat = _selected_ac->getDoubleValue("position/latitude-deg");
@ -269,6 +268,22 @@ void FGAIEscort::setParent()
}
void FGAIEscort::calcRangeBearing(double lat, double lon, double lat2, double lon2,
double &range, double &bearing) const
{
// calculate the bearing and range of the second pos from the first
double az2, distance;
geo_inverse_wgs_84(lat, lon, lat2, lon2, &bearing, &az2, &distance);
range = distance * SG_METER_TO_NM;
}
double FGAIEscort::calcTrueBearingDeg(double bearing, double heading)
{
double angle = bearing + heading;
SG_NORMALIZE_RANGE(angle, 0.0, 360.0);
return angle;
}
SGVec3d FGAIEscort::getCartHitchPosAt(const SGVec3d& _off) const {
double hdg = _selected_ac->getDoubleValue("orientation/true-heading-deg");
double pitch = _selected_ac->getDoubleValue("orientation/pitch-deg");

8
src/AIModel/AIEscort.hxx
View file

@ -70,11 +70,9 @@ private:
SGVec3d getCartHitchPosAt(const SGVec3d& off) const;
// void calcRangeBearing(double lat, double lon, double lat2, double lon2,
// double &range, double &bearing) const;
//double calcRelBearingDeg(double bearing, double heading);
//double calcTrueBearingDeg(double bearing, double heading);
//double calcRecipBearingDeg(double bearing);
void calcRangeBearing(double lat, double lon, double lat2, double lon2,
double &range, double &bearing) const;
double calcTrueBearingDeg(double bearing, double heading);
SGGeod _selectedpos;
SGGeod _tgtpos;