fly/flightgear
1
0
Fork 0
Code Activity

A couple fixes to the air/ground trim (initial position) setup code.

Browse source
This commit is contained in:
curt 2003-11-10 22:00:22 +00:00
parent 76107017cb
commit ea16fdbee7
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Main/fg_init.cxx
View file

@ -856,6 +856,7 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
static void fgSetDistOrAltFromGlideSlope() { static void fgSetDistOrAltFromGlideSlope() {
cout << "fgSetDistOrAltFromGlideSlope()" << endl;
string apt_id = fgGetString("/sim/presets/airport-id"); string apt_id = fgGetString("/sim/presets/airport-id");
double gs = fgGetDouble("/sim/presets/glideslope-deg") double gs = fgGetDouble("/sim/presets/glideslope-deg")
* SG_DEGREES_TO_RADIANS ; * SG_DEGREES_TO_RADIANS ;
@ -1043,12 +1044,18 @@ fgInitNav ()
// Set the initial position based on presets (or defaults) // Set the initial position based on presets (or defaults)
bool fgInitPosition() { bool fgInitPosition() {
cout << "fgInitPosition()" << endl;
double gs = fgGetDouble("/sim/presets/glideslope-deg")
* SG_DEGREES_TO_RADIANS ;
double od = fgGetDouble("/sim/presets/offset-distance");
double alt = fgGetDouble("/sim/presets/altitude-ft");
bool set_pos = false; bool set_pos = false;
// If glideslope is specified, then calculate offset-distance or // If glideslope is specified, then calculate offset-distance or
// altitude relative to glide slope if either of those was not // altitude relative to glide slope if either of those was not
// specified. // specified.
if ( fgGetDouble("/sim/presets/glideslope-deg") > 0.1 ) { if ( fabs( gs ) > 0.01 ) {
fgSetDistOrAltFromGlideSlope(); fgSetDistOrAltFromGlideSlope();
} }
@ -1131,6 +1138,13 @@ bool fgInitPosition() {
fgSetDouble( "/orientation/heading-deg", fgSetDouble( "/orientation/heading-deg",
fgGetDouble("/sim/presets/heading-deg") ); fgGetDouble("/sim/presets/heading-deg") );
// determine if this should be an on-ground or in-air start
if ( fabs(gs) > 0.01 || fabs(od) > 0.1 || alt > 0.1 ) {
fgSetBool("/sim/presets/onground", false);
} else {
fgSetBool("/sim/presets/onground", true);
}
return true; return true;
} }