]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/fg_init.cxx
Tweaks to base version check code.
[flightgear.git] / src / Main / fg_init.cxx
index dd571f349144eae1b8e6958b4b1d5542d2e205ac..699765c32d3dabf6a282d014514260b63121dfa1 100644 (file)
 #endif
 
 // For BC 5.01 this must be included before OpenGL includes.
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
+
+#if defined( unix ) || defined( __CYGWIN__ )
+#  include <unistd.h>          // for gethostname()
+#endif
+
 // work around a stdc++ lib bug in some versions of linux, but doesn't
 // seem to hurt to have this here for all versions of Linux.
 #ifdef linux
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/timing/sg_time.hxx>
 
 #include <Aircraft/aircraft.hxx>
+#include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
 #include <Include/general.hxx>
-#include <Joystick/joystick.hxx>
+#include <Input/input.hxx>
+// #include <Joystick/joystick.hxx>
 #include <Objects/matlib.hxx>
 #include <Navaids/fixlist.hxx>
 #include <Navaids/ilslist.hxx>
+#include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
+#include "fg_commands.hxx"
+#include "fg_props.hxx"
+#include "options.hxx"
 #include "globals.hxx"
-#include "bfi.hxx"
 
 #if defined(FX) && defined(XMESA)
 #include <GL/xmesa.h>
 #endif
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 extern const char *default_root;
 
 
 // Read in configuration (file and command line) and just set fg_root
 bool fgInitFGRoot ( int argc, char **argv ) {
-    // Attempt to locate and parse a config file
-    // First check fg_root
-    FGPath config( globals->get_options()->get_fg_root() );
-    config.append( "system.fgfsrc" );
-    globals->get_options()->scan_config_file_for_root( config.str() );
+    string root;
+    char* envp;
+
+    // First parse command line options looking for fg-root, this will
+    // override anything specified in a config file
+    root = fgScanForRoot(argc, argv);
+
+#if defined( unix ) || defined( __CYGWIN__ )
+    // Next check home directory for .fgfsrc.hostname file
+    if ( root == "" ) {
+       envp = ::getenv( "HOME" );
+       if ( envp != NULL ) {
+           SGPath config( envp );
+           config.append( ".fgfsrc" );
+           char name[256];
+           gethostname( name, 256 );
+           config.concat( "." );
+           config.concat( name );
+           root = fgScanForRoot(config.str());
+       }
+    }
+#endif
 
-    // Next check home directory
-    char* envp = ::getenv( "HOME" );
-    if ( envp != NULL ) {
-       config.set( envp );
-       config.append( ".fgfsrc" );
-       globals->get_options()->scan_config_file_for_root( config.str() );
+    // Next check home directory for .fgfsrc file
+    if ( root == "" ) {
+       envp = ::getenv( "HOME" );
+       if ( envp != NULL ) {
+           SGPath config( envp );
+           config.append( ".fgfsrc" );
+           root = fgScanForRoot(config.str());
+       }
+    }
+    
+    // Next check if fg-root is set as an env variable
+    if ( root == "" ) {
+       envp = ::getenv( "FG_ROOT" );
+       if ( envp != NULL ) {
+           root = envp;
+       }
     }
 
-    // Parse remaining command line options
-    // These will override anything specified in a config file
-    globals->get_options()->scan_command_line_for_root(argc, argv);
+    // Otherwise, default to a random compiled-in location if we can't
+    // find fg-root any other way.
+    if ( root == "" ) {
+#if defined( __CYGWIN__ )
+        root = "/FlightGear";
+#elif defined( WIN32 )
+       root = "\\FlightGear";
+#elif defined( macintosh )
+       root = "";
+#else
+       root = PKGLIBDIR;
+#endif
+    }
+
+    SG_LOG(SG_INPUT, SG_INFO, "fg_root = " << root );
+    globals->set_fg_root(root);
 
     return true;
 }
 
 
+// Return the current base package version
+string fgBasePackageVersion() {
+    SGPath base_path( globals->get_fg_root() );
+    base_path.append("version");
+
+    sg_gzifstream in( base_path.str() );
+    if ( !in.is_open() ) {
+       SGPath old_path( globals->get_fg_root() );
+       old_path.append( "Thanks" );
+       sg_gzifstream old( old_path.str() );
+       if ( !old.is_open() ) {
+           return "[none]";
+       } else {
+           return "[old version]";
+       }
+    }
+
+    string version;
+    in >> version;
+
+    return version;
+}
+
+
 // Read in configuration (file and command line)
 bool fgInitConfig ( int argc, char **argv ) {
-    // Attempt to locate and parse a config file
-    // First check fg_root
-    FGPath config( globals->get_options()->get_fg_root() );
+
+                               // First, set some sane default values
+    fgSetDefaults();
+
+    // Read global preferences from $FG_ROOT/preferences.xml
+    SGPath props_path(globals->get_fg_root());
+    props_path.append("preferences.xml");
+    SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
+    if (!readProperties(props_path.str(), globals->get_props())) {
+      SG_LOG(SG_INPUT, SG_ALERT, "Failed to read global preferences from "
+            << props_path.str());
+    } else {
+      SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
+    }
+
+    // Attempt to locate and parse the various config files in order
+    // from least precidence to greatest precidence
+
+    // Check for $fg_root/system.fgfsrc
+    SGPath config( globals->get_fg_root() );
     config.append( "system.fgfsrc" );
-    globals->get_options()->parse_config_file( config.str() );
+    fgParseOptions(config.str());
+
+    char name[256];
+#if defined( unix ) || defined( __CYGWIN__ )
+    // Check for $fg_root/system.fgfsrc.hostname
+    gethostname( name, 256 );
+    config.concat( "." );
+    config.concat( name );
+    fgParseOptions(config.str());
+#endif
 
-    // Next check home directory
+    // Check for ~/.fgfsrc
     char* envp = ::getenv( "HOME" );
     if ( envp != NULL ) {
        config.set( envp );
        config.append( ".fgfsrc" );
-       globals->get_options()->parse_config_file( config.str() );
+       fgParseOptions(config.str());
     }
 
+#if defined( unix ) || defined( __CYGWIN__ )
+    // Check for ~/.fgfsrc.hostname
+    gethostname( name, 256 );
+    config.concat( "." );
+    config.concat( name );
+    fgParseOptions(config.str());
+#endif
+
     // Parse remaining command line options
     // These will override anything specified in a config file
-    if ( globals->get_options()->parse_command_line(argc, argv) !=
-        FGOptions::FG_OPTIONS_OK )
-    {
-       // Something must have gone horribly wrong with the command
-       // line parsing or maybe the user just requested help ... :-)
-       globals->get_options()->usage();
-       FG_LOG( FG_GENERAL, FG_ALERT, "\nExiting ...");
-       return false;
-    }
+    fgParseOptions(argc, argv);
 
     return true;
 }
@@ -163,15 +266,15 @@ bool fgInitConfig ( int argc, char **argv ) {
 // find basic airport location info from airport database
 bool fgFindAirportID( const string& id, FGAirport *a ) {
     if ( id.length() ) {
-       FGPath path( globals->get_options()->get_fg_root() );
+       SGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "simple.mk4" );
        FGAirports airports( path.c_str() );
 
-       FG_LOG( FG_GENERAL, FG_INFO, "Searching for airport code = " << id );
+       SG_LOG( SG_GENERAL, SG_INFO, "Searching for airport code = " << id );
 
        if ( ! airports.search( id, a ) ) {
-           FG_LOG( FG_GENERAL, FG_ALERT,
+           SG_LOG( SG_GENERAL, SG_ALERT,
                    "Failed to find " << id << " in " << path.str() );
            return false;
        }
@@ -179,7 +282,7 @@ bool fgFindAirportID( const string& id, FGAirport *a ) {
        return false;
     }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
            "Position for " << id << " is ("
            << a->longitude << ", "
            << a->latitude << ")" );
@@ -193,18 +296,13 @@ bool fgSetPosFromAirportID( const string& id ) {
     FGAirport a;
     // double lon, lat;
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
            "Attempting to set starting position from airport code " << id );
 
     if ( fgFindAirportID( id, &a ) ) {
-       globals->get_options()->set_lon( a.longitude );
-       globals->get_options()->set_lat( a.latitude );
-       current_properties.setDoubleValue("/position/longitude",
-                                         a.longitude);
-       current_properties.setDoubleValue("/position/latitude",
-                                         a.latitude);
-
-       FG_LOG( FG_GENERAL, FG_INFO,
+       fgSetDouble("/position/longitude-deg",  a.longitude );
+       fgSetDouble("/position/latitude-deg",  a.latitude );
+       SG_LOG( SG_GENERAL, SG_INFO,
                "Position for " << id << " is ("
                << a.longitude << ", "
                << a.latitude << ")" );
@@ -226,27 +324,27 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     if ( id.length() ) {
        // set initial position from runway and heading
 
-       FGPath path( globals->get_options()->get_fg_root() );
+       SGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "runways.mk4" );
        FGRunways runways( path.c_str() );
 
-       FG_LOG( FG_GENERAL, FG_INFO,
+       SG_LOG( SG_GENERAL, SG_INFO,
                "Attempting to set starting position from runway code "
                << id << " heading " << tgt_hdg );
 
-       // FGPath inpath( globals->get_options()->get_fg_root() );
+       // SGPath inpath( globals->get_fg_root() );
        // inpath.append( "Airports" );
        // inpath.append( "apt_simple" );
        // airports.load( inpath.c_str() );
 
-       // FGPath outpath( globals->get_options()->get_fg_root() );
+       // SGPath outpath( globals->get_fg_root() );
        // outpath.append( "Airports" );
        // outpath.append( "simple.gdbm" );
        // airports.dump_gdbm( outpath.c_str() );
 
        if ( ! runways.search( id, &r ) ) {
-           FG_LOG( FG_GENERAL, FG_ALERT,
+           SG_LOG( SG_GENERAL, SG_ALERT,
                    "Failed to find " << id << " in database." );
            return false;
        }
@@ -260,7 +358,7 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
            while ( diff < -180.0 ) { diff += 360.0; }
            while ( diff >  180.0 ) { diff -= 360.0; }
            diff = fabs(diff);
-           FG_LOG( FG_GENERAL, FG_INFO,
+           SG_LOG( SG_GENERAL, SG_INFO,
                    "Runway " << r.rwy_no << " heading = " << r.heading <<
                    " diff = " << diff );
            if ( diff < min_diff ) {
@@ -274,7 +372,7 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
            while ( diff < -180.0 ) { diff += 360.0; }
            while ( diff >  180.0 ) { diff -= 360.0; }
            diff = fabs(diff);
-           FG_LOG( FG_GENERAL, FG_INFO,
+           SG_LOG( SG_GENERAL, SG_INFO,
                    "Runway -" << r.rwy_no << " heading = " <<
                    r.heading + 180.0 <<
                    " diff = " << diff );
@@ -287,7 +385,7 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
            runways.next( &r );
        }
 
-       FG_LOG( FG_GENERAL, FG_INFO, "closest runway = " << found_r.rwy_no
+       SG_LOG( SG_GENERAL, SG_INFO, "closest runway = " << found_r.rwy_no
                << " + " << found_dir );
 
     } else {
@@ -301,21 +399,33 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     double azimuth = found_r.heading + found_dir + 180.0;
     while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
            "runway =  " << found_r.lon << ", " << found_r.lat
-           << " length = " << found_r.length * FEET_TO_METER * 0.5 
+           << " length = " << found_r.length * SG_FEET_TO_METER * 0.5 
            << " heading = " << azimuth );
+    
     geo_direct_wgs_84 ( 0, found_r.lat, found_r.lon, 
-                       azimuth, found_r.length * FEET_TO_METER * 0.5 - 5.0,
+                       azimuth, found_r.length * SG_FEET_TO_METER * 0.5 - 5.0,
                        &lat2, &lon2, &az2 );
-    globals->get_options()->set_lon( lon2 );
-    globals->get_options()->set_lat( lat2 );
-    globals->get_options()->set_heading( heading );
-    current_properties.setDoubleValue("/position/longitude", lon2);
-    current_properties.setDoubleValue("/position/latitude", lat2);
-    current_properties.setDoubleValue("/orientation/heading", heading);
-
-    FG_LOG( FG_GENERAL, FG_INFO,
+
+    if ( fabs( fgGetDouble("/sim/startup/offset-distance") ) > SG_EPSILON ) {
+       double olat, olon;
+       double odist = fgGetDouble("/sim/startup/offset-distance");
+       odist *= SG_NM_TO_METER;
+       double oaz = azimuth;
+       if ( fabs(fgGetDouble("/sim/startup/offset-azimuth")) > SG_EPSILON ) {
+           oaz = fgGetDouble("/sim/startup/offset-azimuth") + 180;
+       }
+       while ( oaz >= 360.0 ) { oaz -= 360.0; }
+       geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
+       lat2=olat;
+       lon2=olon;
+    }
+    fgSetDouble("/position/longitude-deg",  lon2 );
+    fgSetDouble("/position/latitude-deg",  lat2 );
+    fgSetDouble("/orientation/heading-deg", heading );
+
+    SG_LOG( SG_GENERAL, SG_INFO,
            "Position for " << id << " is ("
            << lon2 << ", "
            << lat2 << ") new heading is "
@@ -325,45 +435,6 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
 }
 
 
-// Set initial position and orientation
-bool fgInitPosition( void ) {
-    FGInterface *f = current_aircraft.fdm_state;
-    string id = globals->get_options()->get_airport_id();
-
-    // set initial position from default or command line coordinates
-    f->set_Longitude( globals->get_options()->get_lon() * DEG_TO_RAD );
-    f->set_Latitude( globals->get_options()->get_lat() * DEG_TO_RAD );
-
-    if ( scenery.cur_elev > globals->get_options()->get_altitude() - 1) {
-       globals->get_options()->set_altitude( scenery.cur_elev + 1 );
-    }
-
-    FG_LOG( FG_GENERAL, FG_INFO,
-           "starting altitude is = " << globals->get_options()->get_altitude() );
-
-    f->set_Altitude( globals->get_options()->get_altitude() * METER_TO_FEET );
-    // fgFDMSetGroundElevation( globals->get_options()->get_flight_model(),
-    //                         f->get_Altitude() * FEET_TO_METER );
-
-#if 0
-    current_properties.setDoubleValue("/position/longitude",
-                                     f->get_Longitude() * RAD_TO_DEG);
-    current_properties.setDoubleValue("/position/latitude",
-                                     f->get_Latitude() * RAD_TO_DEG);
-    current_properties.setDoubleValue("/position/altitude",
-                                     f->get_Altitude() * RAD_TO_DEG);
-#endif
-
-    FG_LOG( FG_GENERAL, FG_INFO,
-           "Initial position is: ("
-           << (f->get_Longitude() * RAD_TO_DEG) << ", "
-           << (f->get_Latitude() * RAD_TO_DEG) << ", "
-           << (f->get_Altitude() * FEET_TO_METER) << ")" );
-
-    return true;
-}
-
-
 // General house keeping initializations
 bool fgInitGeneral( void ) {
     string root;
@@ -372,18 +443,18 @@ bool fgInitGeneral( void ) {
     char *mesa_win_state;
 #endif
 
-    FG_LOG( FG_GENERAL, FG_INFO, "General Initialization" );
-    FG_LOG( FG_GENERAL, FG_INFO, "======= ==============" );
+    SG_LOG( SG_GENERAL, SG_INFO, "General Initialization" );
+    SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
 
-    root = globals->get_options()->get_fg_root();
+    root = globals->get_fg_root();
     if ( ! root.length() ) {
        // No root path set? Then bail ...
-       FG_LOG( FG_GENERAL, FG_ALERT,
+       SG_LOG( SG_GENERAL, SG_ALERT,
                "Cannot continue without environment variable FG_ROOT"
                << "being defined." );
        exit(-1);
     }
-    FG_LOG( FG_GENERAL, FG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
+    SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
 
 #if defined(FX) && defined(XMESA)
     // initialize full screen flag
@@ -404,36 +475,6 @@ bool fgInitGeneral( void ) {
 }
 
 
-// set initial aircraft speed
-bool fgVelocityInit( void ) {
-  switch(globals->get_options()->get_speedset()) {
-    case FGOptions::FG_VC:
-      current_aircraft.fdm_state->set_V_calibrated_kts( 
-                                    globals->get_options()->get_vc() );
-      break;
-    case FGOptions::FG_MACH:
-      current_aircraft.fdm_state->set_Mach_number(
-                                    globals->get_options()->get_mach() );
-      break;
-    case FGOptions::FG_VTUVW:
-      current_aircraft.fdm_state->set_Velocities_Wind_Body(
-                                    globals->get_options()->get_uBody(),
-                                    globals->get_options()->get_vBody(),
-                                    globals->get_options()->get_wBody() );
-      break;
-    case FGOptions::FG_VTNED:
-      current_aircraft.fdm_state->set_Velocities_Local(
-                                    globals->get_options()->get_vNorth(),
-                                    globals->get_options()->get_vEast(),
-                                    globals->get_options()->get_vDown() );
-      break;
-    default:
-      current_aircraft.fdm_state->set_V_calibrated_kts( 0.0 );
-    }
-    return true;  
-}             
-
-        
 // This is the top level init routine which calls all the other
 // initialization routines.  If you are adding a subsystem to flight
 // gear, its initialization call should located in this routine.
@@ -441,121 +482,93 @@ bool fgVelocityInit( void ) {
 bool fgInitSubsystems( void ) {
     fgLIGHT *l = &cur_light_params;
 
-    FG_LOG( FG_GENERAL, FG_INFO, "Initialize Subsystems");
-    FG_LOG( FG_GENERAL, FG_INFO, "========== ==========");
+    SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
+    SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
+
 
-    // Initialize the material property lib
-    FGPath mpath( globals->get_options()->get_fg_root() );
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the material property subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    SGPath mpath( globals->get_fg_root() );
     mpath.append( "materials" );
     if ( material_lib.load( mpath.str() ) ) {
     } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Error loading material lib!" );
+       SG_LOG( SG_GENERAL, SG_ALERT, "Error loading material lib!" );
        exit(-1);
     }
 
-    // Initialize the Scenery Management subsystem
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the scenery management subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     if ( fgSceneryInit() ) {
        // Material lib initialized ok.
     } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Error in Scenery initialization!" );
+       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Scenery initialization!" );
        exit(-1);
     }
 
     if ( global_tile_mgr.init() ) {
        // Load the local scenery data
-       global_tile_mgr.update( globals->get_options()->get_lon(),
-                               globals->get_options()->get_lat() );
+       global_tile_mgr.update( fgGetDouble("/position/longitude-deg"),
+                               fgGetDouble("/position/latitude-deg") );
     } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Error in Tile Manager initialization!" );
+       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
        exit(-1);
     }
 
-    FG_LOG( FG_GENERAL, FG_DEBUG,
+    SG_LOG( SG_GENERAL, SG_DEBUG,
            "Current terrain elevation after tile mgr init " <<
            scenery.cur_elev );
 
-    if ( globals->get_options()->get_flight_model() == FGInterface::FG_LARCSIM ) {
-       cur_fdm_state = new FGLaRCsim;
-    } else if ( globals->get_options()->get_flight_model() == FGInterface::FG_JSBSIM ) {
-       cur_fdm_state = new FGJSBsim;
-    } else if ( globals->get_options()->get_flight_model() == FGInterface::FG_ADA ) {
-       cur_fdm_state = new FGADA;
-    } else if ( globals->get_options()->get_flight_model() == 
-               FGInterface::FG_BALLOONSIM ) {
-       cur_fdm_state = new FGBalloonSim;
-    } else if ( globals->get_options()->get_flight_model() == 
-               FGInterface::FG_MAGICCARPET ) {
-       cur_fdm_state = new FGMagicCarpet;
-    } else if ( globals->get_options()->get_flight_model() == 
-               FGInterface::FG_EXTERNAL ) {
-       cur_fdm_state = new FGExternal;
-    } else {
-       FG_LOG( FG_GENERAL, FG_ALERT,
-               "No flight model, can't init aircraft" );
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the flight model subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    double dt = 1.0 / fgGetInt("/sim/model-hz");
+    // cout << "dt = " << dt << endl;
+
+    aircraft_dir = fgGetString("/sim/aircraft-dir");
+    const string &model = fgGetString("/sim/flight-model");
+    try {
+       if (model == "larcsim") {
+           cur_fdm_state = new FGLaRCsim( dt );
+       } else if (model == "jsb") {
+           cur_fdm_state = new FGJSBsim( dt );
+       } else if (model == "ada") {
+           cur_fdm_state = new FGADA( dt );
+       } else if (model == "balloon") {
+           cur_fdm_state = new FGBalloonSim( dt );
+       } else if (model == "magic") {
+           cur_fdm_state = new FGMagicCarpet( dt );
+       } else if (model == "external") {
+           cur_fdm_state = new FGExternal( dt );
+       } else {
+           SG_LOG(SG_GENERAL, SG_ALERT,
+                  "Unrecognized flight model '" << model
+                  << ", can't init aircraft");
+           exit(-1);
+       }
+    } catch ( ... ) {
+       SG_LOG(SG_GENERAL, SG_ALERT, "FlightGear aborting\n\n");
        exit(-1);
     }
 
+    cur_fdm_state->init();
+    cur_fdm_state->bind();
+    
     // allocates structures so must happen before any of the flight
     // model or control parameters are set
     fgAircraftInit();   // In the future this might not be the case.
 
-    fgFDMSetGroundElevation( globals->get_options()->get_flight_model(),
-                            scenery.cur_elev );
-    
-    // set the initial position
-    fgInitPosition();
-
-    // Calculate ground elevation at starting point (we didn't have
-    // tmp_abs_view_pos calculated when fgTileMgrUpdate() was called above
-    //
-    // calculalate a cartesian point somewhere along the line between
-    // the center of the earth and our view position.  Doesn't have to
-    // be the exact elevation (this is good because we don't know it
-    // yet :-)
-
-    // now handled inside of the fgTileMgrUpdate()
-
-    // Reset our altitude if we are below ground
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current altitude = "
-           << cur_fdm_state->get_Altitude() );
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current runway altitude = " <<
-           cur_fdm_state->get_Runway_altitude() );
-
-    if ( cur_fdm_state->get_Altitude() < cur_fdm_state->get_Runway_altitude() +
-        3.758099) {
-       cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-                                    3.758099 );
-    }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
-           "Updated position (after elevation adj): ("
-           << (cur_fdm_state->get_Latitude() * RAD_TO_DEG) << ", "
-           << (cur_fdm_state->get_Longitude() * RAD_TO_DEG) << ", "
-           << (cur_fdm_state->get_Altitude() * FEET_TO_METER) << ")" );
-
-    // We need to calculate a few sea_level_radius here so we can pass
-    // the correct value to the view class
-    double sea_level_radius_meters;
-    double lat_geoc;
-    sgGeodToGeoc( cur_fdm_state->get_Latitude(),
-                 cur_fdm_state->get_Altitude(),
-                 &sea_level_radius_meters, &lat_geoc);
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters *
-                                        METER_TO_FEET );
-
-    // The following section sets up the flight model EOM parameters
-    // and should really be read in from one or more files.
-
-    // Initial Velocity
-    fgVelocityInit();
-
-    // Initial Orientation
-    cur_fdm_state->
-       set_Euler_Angles( globals->get_options()->get_roll() * DEG_TO_RAD,
-                         globals->get_options()->get_pitch() * DEG_TO_RAD,
-                         globals->get_options()->get_heading() * DEG_TO_RAD );
-
-    // Initialize the event manager
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the event manager subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     global_events.Init();
 
     // Output event stats every 60 seconds
@@ -564,11 +577,16 @@ bool fgInitSubsystems( void ) {
                                                   &fgEVENT_MGR::PrintStats),
                            fgEVENT::FG_EVENT_READY, 60000 );
 
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the view manager subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     // Initialize win_ratio parameters
     for ( int i = 0; i < globals->get_viewmgr()->size(); ++i ) {
        globals->get_viewmgr()->get_view(i)->
-           set_win_ratio( globals->get_options()->get_xsize() /
-                          globals->get_options()->get_ysize() );
+           set_win_ratio( fgGetInt("/sim/startup/xsize") /
+                          fgGetInt("/sim/startup/ysize") );
     }
 
     // Initialize pilot view
@@ -578,9 +596,9 @@ bool fgInitSubsystems( void ) {
     pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
                                   cur_fdm_state->get_Lat_geocentric(), 
                                   cur_fdm_state->get_Altitude() *
-                                  FEET_TO_METER );
+                                  SG_FEET_TO_METER );
     pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
-                                     FEET_TO_METER ); 
+                                     SG_FEET_TO_METER ); 
     pilot_view->set_rph( cur_fdm_state->get_Phi(),
                         cur_fdm_state->get_Theta(),
                         cur_fdm_state->get_Psi() );
@@ -588,9 +606,14 @@ bool fgInitSubsystems( void ) {
     // set current view to 0 (first) which is our main pilot view
     globals->set_current_view( pilot_view );
 
-    FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
+    SG_LOG( SG_GENERAL, SG_DEBUG, "  abs_view_pos = "
            << globals->get_current_view()->get_abs_view_pos());
 
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the lighting subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     // fgUpdateSunPos() needs a few position and view parameters set
     // so it can calculate local relative sun angle and a few other
     // things for correctly orienting the sky.
@@ -609,26 +632,43 @@ bool fgInitSubsystems( void ) {
                            fgMethodCallback<fgLIGHT>( &cur_light_params,
                                                       &fgLIGHT::Update),
                            fgEVENT::FG_EVENT_READY, 30000 );
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the local time subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     // update the current timezone each 30 minutes
     global_events.Register( "fgUpdateLocalTime()", fgUpdateLocalTime,
                            fgEVENT::FG_EVENT_READY, 1800000);
 
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the weather subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     // Initialize the weather modeling subsystem
 #ifndef FG_OLD_WEATHER
     // Initialize the WeatherDatabase
-    FG_LOG(FG_GENERAL, FG_INFO, "Creating LocalWeatherDatabase");
+    SG_LOG(SG_GENERAL, SG_INFO, "Creating LocalWeatherDatabase");
     sgVec3 position;
     sgSetVec3( position, current_aircraft.fdm_state->get_Latitude(),
               current_aircraft.fdm_state->get_Longitude(),
-              current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER );
+              current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER );
     FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 
-       new FGLocalWeatherDatabase( position, globals->get_options()->get_fg_root() );
+       new FGLocalWeatherDatabase( position,
+                                   globals->get_fg_root() );
     // cout << theFGLocalWeatherDatabase << endl;
     // cout << "visibility = " 
     //      << theFGLocalWeatherDatabase->getWeatherVisibility() << endl;
 
     WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
-     
+    
+    double init_vis = fgGetDouble("/environment/visibility-m");
+    if ( init_vis > 0 ) {
+       WeatherDatabase->setWeatherVisibility( init_vis );
+    }
+
     // register the periodic update of the weather
     global_events.Register( "weather update", fgUpdateWeatherDatabase,
                             fgEVENT::FG_EVENT_READY, 30000);
@@ -636,86 +676,75 @@ bool fgInitSubsystems( void ) {
     current_weather.Init();
 #endif
 
+    ////////////////////////////////////////////////////////////////////
     // Initialize vor/ndb/ils/fix list management and query systems
-    FG_LOG(FG_GENERAL, FG_INFO, "Loading Navaids");
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  VOR/NDB");
+    SG_LOG(SG_GENERAL, SG_INFO, "  VOR/NDB");
     current_navlist = new FGNavList;
-    FGPath p_nav( globals->get_options()->get_fg_root() );
+    SGPath p_nav( globals->get_fg_root() );
     p_nav.append( "Navaids/default.nav" );
     current_navlist->init( p_nav );
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  ILS");
+    SG_LOG(SG_GENERAL, SG_INFO, "  ILS and Marker Beacons");
+    current_beacons = new FGMarkerBeacons;
+    current_beacons->init();
     current_ilslist = new FGILSList;
-    FGPath p_ils( globals->get_options()->get_fg_root() );
+    SGPath p_ils( globals->get_fg_root() );
     p_ils.append( "Navaids/default.ils" );
     current_ilslist->init( p_ils );
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  Fixes");
+    SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
     current_fixlist = new FGFixList;
-    FGPath p_fix( globals->get_options()->get_fg_root() );
+    SGPath p_fix( globals->get_fg_root() );
     p_fix.append( "Navaids/default.fix" );
     current_fixlist->init( p_fix );
 
-    // Initialize the underlying radio stack model
-    current_radiostack = new FGRadioStack;
 
-    current_radiostack->search( cur_fdm_state->get_Longitude(),
-                               cur_fdm_state->get_Latitude(),
-                               cur_fdm_state->get_Altitude() * FEET_TO_METER );
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the built-in commands.
+    ////////////////////////////////////////////////////////////////////
+    fgInitCommands();
+
 
-    current_radiostack->update( cur_fdm_state->get_Longitude(),
-                               cur_fdm_state->get_Latitude(),
-                               cur_fdm_state->get_Altitude() * FEET_TO_METER );
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the radio stack subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+                               // A textbook example of how FGSubsystem
+                               // should work...
+    current_radiostack = new FGRadioStack;
+    current_radiostack->init();
+    current_radiostack->bind();
 
-    // Search radio database once per second
-    global_events.Register( "fgRadioSearch()", fgRadioSearch,
-                           fgEVENT::FG_EVENT_READY, 1000);
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the cockpit subsystem
+    ////////////////////////////////////////////////////////////////////
 
-    // Initialize the Cockpit subsystem
     if( fgCockpitInit( &current_aircraft )) {
        // Cockpit initialized ok.
     } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Error in Cockpit initialization!" );
+       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Cockpit initialization!" );
        exit(-1);
     }
 
-    // Initialize the flight model subsystem data structures base on
-    // above values
 
-    if ( cur_fdm_state->init( 1.0 / globals->get_options()->get_model_hz() ) ) {
-       // fdm init successful
-    } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "FDM init() failed!  Cannot continue." );
-       exit(-1);
-    }
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the joystick subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    // *ABCD* I'm just sticking this here for now, it should probably
-    // move eventually
-    scenery.cur_elev = cur_fdm_state->get_Runway_altitude() * FEET_TO_METER;
+    // if ( ! fgJoystickInit() ) {
+    //   SG_LOG( SG_GENERAL, SG_ALERT, "Error in Joystick initialization!" );
+    // }
 
-    if ( cur_fdm_state->get_Altitude() <
-        cur_fdm_state->get_Runway_altitude() + 3.758099)
-    {
-       cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-                                    3.758099 );
-    }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
-           "Updated position (after elevation adj): ("
-           << (cur_fdm_state->get_Latitude() * RAD_TO_DEG) << ", "
-           << (cur_fdm_state->get_Longitude() * RAD_TO_DEG) << ", "
-           << (cur_fdm_state->get_Altitude() * FEET_TO_METER) << ")" );
-    // *ABCD* end of thing that I just stuck in that I should probably
-    // move
-
-    // Joystick support
-    if ( ! fgJoystickInit() ) {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Error in Joystick initialization!" );
-    }
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the autopilot subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    // Autopilot init
     current_autopilot = new FGAutopilot;
     current_autopilot->init();
 
@@ -725,27 +754,61 @@ bool fgInitSubsystems( void ) {
     NewHeadingInit();
     NewAltitudeInit();
 
-    // Initialize I/O channels
+    
+    ////////////////////////////////////////////////////////////////////
+    // Initialize I/O subsystem.
+    ////////////////////////////////////////////////////////////////////
+
 #if ! defined( macintosh )
     fgIOInit();
 #endif
 
     // Initialize the 2D panel.
-    string panel_path =
-       current_properties.getStringValue("/sim/panel/path",
-                                         "Panels/Default/default.xml");
+    string panel_path = fgGetString("/sim/panel/path",
+                                   "Panels/Default/default.xml");
     current_panel = fgReadPanel(panel_path);
     if (current_panel == 0) {
-       FG_LOG( FG_INPUT, FG_ALERT, 
+       SG_LOG( SG_INPUT, SG_ALERT, 
                "Error reading new panel from " << panel_path );
     } else {
-       FG_LOG( FG_INPUT, FG_INFO, "Loaded new panel from " << panel_path );
+       SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
+       current_panel->init();
+       current_panel->bind();
     }
 
-    // Initialize the BFI
-    FGBFI::init();
+    
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the default (kludged) properties.
+    ////////////////////////////////////////////////////////////////////
+
+    fgInitProps();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the controls subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    FG_LOG( FG_GENERAL, FG_INFO, endl);
+    controls.init();
+    controls.bind();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the input subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    current_input.init();
+    current_input.bind();
+
+
+    ////////////////////////////////////////////////////////////////////////
+    // End of subsystem initialization.
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG( SG_GENERAL, SG_INFO, endl);
+
+                               // Save the initial state for future
+                               // reference.
+    globals->saveInitialState();
 
     return true;
 }
@@ -753,56 +816,28 @@ bool fgInitSubsystems( void ) {
 
 void fgReInitSubsystems( void )
 {
+    SG_LOG( SG_GENERAL, SG_INFO,
+           "/position/altitude = " << fgGetDouble("/position/altitude-ft") );
+
     bool freeze = globals->get_freeze();
     if( !freeze )
         globals->set_freeze( true );
     
+    // Initialize the Scenery Management subsystem
+    if ( ! fgSceneryInit() ) {
+       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Scenery initialization!" );
+       exit(-1);
+    }
+
     if( global_tile_mgr.init() ) {
        // Load the local scenery data
-       global_tile_mgr.update( globals->get_options()->get_lon(),
-                               globals->get_options()->get_lat() );
+       global_tile_mgr.update( fgGetDouble("/position/longitude-deg"),
+                               fgGetDouble("/position/latitude-deg") );
     } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Error in Tile Manager initialization!" );
+       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
                exit(-1);
     }
 
-    // cout << "current scenery elev = " << scenery.cur_elev << endl;
-
-    fgInitPosition();
-    fgFDMSetGroundElevation( globals->get_options()->get_flight_model(), 
-                            scenery.cur_elev );
-
-    // Reset our altitude if we are below ground
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current altitude = "
-           << cur_fdm_state->get_Altitude() );
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current runway altitude = "
-           << cur_fdm_state->get_Runway_altitude() );
-
-    if ( cur_fdm_state->get_Altitude() <
-        cur_fdm_state->get_Runway_altitude() + 3.758099)
-    {
-       cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-                                    3.758099 );
-    }
-    double sea_level_radius_meters;
-    double lat_geoc;
-    sgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(), 
-                 &sea_level_radius_meters, &lat_geoc);
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters *
-                                        METER_TO_FEET );
-       
-    // The following section sets up the flight model EOM parameters
-    // and should really be read in from one or more files.
-
-    // Initial Velocity
-    fgVelocityInit();
-
-    // Initial Orientation
-    cur_fdm_state->
-       set_Euler_Angles( globals->get_options()->get_roll() * DEG_TO_RAD,
-                         globals->get_options()->get_pitch() * DEG_TO_RAD,
-                         globals->get_options()->get_heading() * DEG_TO_RAD );
-
     // Initialize view parameters
     FGViewerRPH *pilot_view =
        (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
@@ -813,9 +848,9 @@ void fgReInitSubsystems( void )
     pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
                                   cur_fdm_state->get_Lat_geocentric(), 
                                   cur_fdm_state->get_Altitude() *
-                                  FEET_TO_METER );
+                                  SG_FEET_TO_METER );
     pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
-                                     FEET_TO_METER ); 
+                                     SG_FEET_TO_METER ); 
     pilot_view->set_rph( cur_fdm_state->get_Phi(),
                         cur_fdm_state->get_Theta(),
                         cur_fdm_state->get_Psi() );
@@ -823,23 +858,19 @@ void fgReInitSubsystems( void )
     // set current view to 0 (first) which is our main pilot view
     globals->set_current_view( pilot_view );
 
-    FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
+    SG_LOG( SG_GENERAL, SG_DEBUG, "  abs_view_pos = "
            << globals->get_current_view()->get_abs_view_pos());
 
-    cur_fdm_state->init( 1.0 / globals->get_options()->get_model_hz() );
-
-    scenery.cur_elev = cur_fdm_state->get_Runway_altitude() * FEET_TO_METER;
-
-    if ( cur_fdm_state->get_Altitude() <
-        cur_fdm_state->get_Runway_altitude() + 3.758099)
-    {
-       cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-                                    3.758099 );
-    }
+    cur_fdm_state->init();
 
     controls.reset_all();
     current_autopilot->reset();
 
+    fgUpdateSunPos();
+    fgUpdateMoonPos();
+    cur_light_params.Update();
+    fgUpdateLocalTime();
+
     if( !freeze )
         globals->set_freeze( false );
 }