fly/flightgear
1
0
Fork 0
Code Activity

Add fgInitNav() function so that navaids and fixes can be loaded

Browse source 
earlier, before fgInitSubsystems().

Modify fgInitPos() so that the plane is not automatically aligned with
a runway when an airport is the reference point unless (a) a runway
was explicitly requested, or (b) the plane is on the ground with no
offset distance specified.  To set up the plane lined up on an
approach to a runway, use something like

  fgfs --airport=CYOW --runway=32 --altitude=300 --offset-distance=0.5

This way, it's possible to specify a starting position relative to an
airport without getting snapped onto a runway approach (unless you
want to be).
This commit is contained in:
david 2003-02-21 02:45:47 +00:00
parent 7d7a137d86
commit 22097a5272
1 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/Main/fg_init.cxx
View file

@ -1052,6 +1052,37 @@ static bool fgSetPosFromFix( const string& id ) {
}
/**
* Initialize vor/ndb/ils/fix list management and query systems
*/
bool
fgInitNav ()
{
SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
SG_LOG(SG_GENERAL, SG_INFO, " VOR/NDB");
current_navlist = new FGNavList;
SGPath p_nav( globals->get_fg_root() );
p_nav.append( "Navaids/default.nav" );
current_navlist->init( p_nav );
SG_LOG(SG_GENERAL, SG_INFO, " ILS and Marker Beacons");
current_beacons = new FGMarkerBeacons;
current_beacons->init();
current_ilslist = new FGILSList;
SGPath p_ils( globals->get_fg_root() );
p_ils.append( "Navaids/default.ils" );
current_ilslist->init( p_ils );
SG_LOG(SG_GENERAL, SG_INFO, " Fixes");
current_fixlist = new FGFixList;
SGPath p_fix( globals->get_fg_root() );
p_fix.append( "Navaids/default.fix" );
current_fixlist->init( p_fix );
}
// Set the initial position based on presets (or defaults)
bool fgInitPosition() {
bool set_pos = false;
@ -1095,10 +1126,17 @@ bool fgInitPosition() {
}
if ( !set_pos && !apt.empty() ) {
// An airport is requested (find runway closest to hdg)
if ( fgSetPosFromAirportIDandHdg( apt, hdg ) ) {
// set position (a little off the heading for single
// runway airports)
fgSetTowerPosFromAirportID( apt, hdg );
bool ok = false;
if (fgGetDouble("/sim/presets/altitude-ft") <= 0 &&
fgGetDouble("/sim/presets/offset-distance") == 0)
ok = fgSetPosFromAirportIDandHdg( apt, hdg );
else
ok = fgSetPosFromAirportID( apt );
if (ok) {
// set position (a little off the heading for single
// runway airports)
fgSetTowerPosFromAirportID( apt, hdg );
set_pos = true;
}
@ -1570,32 +1608,6 @@ bool fgInitSubsystems() {
}
#endif
////////////////////////////////////////////////////////////////////
// Initialize vor/ndb/ils/fix list management and query systems
////////////////////////////////////////////////////////////////////
SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
SG_LOG(SG_GENERAL, SG_INFO, " VOR/NDB");
current_navlist = new FGNavList;
SGPath p_nav( globals->get_fg_root() );
p_nav.append( "Navaids/default.nav" );
current_navlist->init( p_nav );
SG_LOG(SG_GENERAL, SG_INFO, " ILS and Marker Beacons");
current_beacons = new FGMarkerBeacons;
current_beacons->init();
current_ilslist = new FGILSList;
SGPath p_ils( globals->get_fg_root() );
p_ils.append( "Navaids/default.ils" );
current_ilslist->init( p_ils );
SG_LOG(SG_GENERAL, SG_INFO, " Fixes");
current_fixlist = new FGFixList;
SGPath p_fix( globals->get_fg_root() );
p_fix.append( "Navaids/default.fix" );
current_fixlist->init( p_fix );
////////////////////////////////////////////////////////////////////
// Initialise ATC display system
////////////////////////////////////////////////////////////////////