]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/fg_init.cxx
Fixed a problem with autodetecting if we need to draw our own mouse cursor
[flightgear.git] / src / Main / fg_init.cxx
index 2d2fa302f3ed4ef3faf0c9453d893f4d226940a0..0c506726ffdb49e812378c8c4a30e6d03bf56aa9 100644 (file)
@@ -92,6 +92,7 @@
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
+#include "options.hxx"
 #include "globals.hxx"
 #include "bfi.hxx"
 
@@ -106,23 +107,45 @@ 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);
+
+    // Next check home directory for .fgfsrc file
+    if ( root == "" ) {
+       envp = ::getenv( "HOME" );
+       if ( envp != NULL ) {
+           FGPath 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;
+       }
+    }
 
-    // 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() );
+    // Otherwise, default to a random compiled-in location if we can't
+    // find fg-root any other way.
+    if ( root == "" ) {
+#if defined( WIN32 )
+       root = "\\FlightGear";
+#elif defined( macintosh )
+       root = "";
+#else
+       root = PKGLIBDIR;
+#endif
     }
 
-    // Parse remaining command line options
-    // These will override anything specified in a config file
-    globals->get_options()->scan_command_line_for_root(argc, argv);
+    FG_LOG(FG_INPUT, FG_INFO, "fg_root = " << root );
+    globals->set_fg_root(root);
 
     return true;
 }
@@ -130,31 +153,38 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 
 // Read in configuration (file and command line)
 bool fgInitConfig ( int argc, char **argv ) {
+
+                               // First, set some sane default values
+    fgSetDefaults();
+
+    // Read global preferences from $FG_ROOT/preferences.xml
+    FGPath props_path(globals->get_fg_root());
+    props_path.append("preferences.xml");
+    FG_LOG(FG_INPUT, FG_INFO, "Reading global preferences");
+    if (!readProperties(props_path.str(), globals->get_props())) {
+      FG_LOG(FG_INPUT, FG_ALERT, "Failed to read global preferences from "
+            << props_path.str());
+    } else {
+      FG_LOG(FG_INPUT, FG_INFO, "Finished Reading global preferences");
+    }
+
     // Attempt to locate and parse a config file
     // First check fg_root
-    FGPath config( globals->get_options()->get_fg_root() );
+    FGPath config( globals->get_fg_root() );
     config.append( "system.fgfsrc" );
-    globals->get_options()->parse_config_file( config.str() );
+    fgParseOptions(config.str());
 
     // Next check home directory
     char* envp = ::getenv( "HOME" );
     if ( envp != NULL ) {
        config.set( envp );
        config.append( ".fgfsrc" );
-       globals->get_options()->parse_config_file( config.str() );
+       fgParseOptions(config.str());
     }
 
     // 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,7 +193,7 @@ 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() );
+       FGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "simple.mk4" );
        FGAirports airports( path.c_str() );
@@ -191,19 +221,14 @@ bool fgFindAirportID( const string& id, FGAirport *a ) {
 // Set current_options lon/lat given an airport id
 bool fgSetPosFromAirportID( const string& id ) {
     FGAirport a;
-    double lon, lat;
+    // double lon, lat;
 
     FG_LOG( FG_GENERAL, FG_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);
-
+       fgSetDouble("/position/longitude",  a.longitude );
+       fgSetDouble("/position/latitude",  a.latitude );
        FG_LOG( FG_GENERAL, FG_INFO,
                "Position for " << id << " is ("
                << a.longitude << ", "
@@ -221,12 +246,12 @@ bool fgSetPosFromAirportID( const string& id ) {
 bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     FGRunway r;
     FGRunway found_r;
-    double found_dir;
+    double found_dir = 0.0;
 
     if ( id.length() ) {
        // set initial position from runway and heading
 
-       FGPath path( globals->get_options()->get_fg_root() );
+       FGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "runways.mk4" );
        FGRunways runways( path.c_str() );
@@ -235,12 +260,12 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
                "Attempting to set starting position from runway code "
                << id << " heading " << tgt_hdg );
 
-       // FGPath inpath( globals->get_options()->get_fg_root() );
+       // FGPath 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() );
+       // FGPath outpath( globals->get_fg_root() );
        // outpath.append( "Airports" );
        // outpath.append( "simple.gdbm" );
        // airports.dump_gdbm( outpath.c_str() );
@@ -308,12 +333,9 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     geo_direct_wgs_84 ( 0, found_r.lat, found_r.lon, 
                        azimuth, found_r.length * 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);
+    fgSetDouble("/position/longitude",  lon2 );
+    fgSetDouble("/position/latitude",  lat2 );
+    fgSetDouble("/orientation/heading", heading );
 
     FG_LOG( FG_GENERAL, FG_INFO,
            "Position for " << id << " is ("
@@ -328,32 +350,32 @@ 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();
+    string id = fgGetString("/sim/startup/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 );
+    f->set_Longitude( fgGetDouble("/position/longitude") * DEG_TO_RAD );
+    f->set_Latitude( fgGetDouble("/position/latitude") * DEG_TO_RAD );
+
+    FG_LOG( FG_GENERAL, FG_INFO,
+           "scenery.cur_elev = " << scenery.cur_elev );
+    FG_LOG( FG_GENERAL, FG_INFO,
+           "/position/altitude = " << fgGetDouble("/position/altitude") );
+
+    // if we requested on ground startups
+    if ( fgGetBool( "/sim/startup/onground" ) ) {
+       fgSetDouble("/position/altitude", scenery.cur_elev + 1 );
+    }
 
-    if ( scenery.cur_elev > globals->get_options()->get_altitude() - 1) {
-       globals->get_options()->set_altitude( scenery.cur_elev + 1 );
+    // if requested altitude is below ground level
+    if ( scenery.cur_elev > fgGetDouble("/position/altitude") - 1) {
+       fgSetDouble("/position/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
+           "starting altitude is = " <<
+           fgGetDouble("/position/altitude") );
 
+    f->set_Altitude( fgGetDouble("/position/altitude") );
     FG_LOG( FG_GENERAL, FG_INFO,
            "Initial position is: ("
            << (f->get_Longitude() * RAD_TO_DEG) << ", "
@@ -375,7 +397,7 @@ bool fgInitGeneral( void ) {
     FG_LOG( FG_GENERAL, FG_INFO, "General Initialization" );
     FG_LOG( FG_GENERAL, FG_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,
@@ -404,6 +426,40 @@ bool fgInitGeneral( void ) {
 }
 
 
+// set initial aircraft speed
+void
+fgVelocityInit( void ) 
+{
+  if (!fgHasValue("/sim/startup/speed-set")) {
+    current_aircraft.fdm_state->set_V_calibrated_kts(0.0);
+    return;
+  }
+
+  const string speedset = fgGetString("/sim/startup/speed-set");
+  if (speedset == "knots" || speedset == "KNOTS") {
+    current_aircraft.fdm_state
+      ->set_V_calibrated_kts(fgGetDouble("/velocities/airspeed"));
+  } else if (speedset == "mach" || speedset == "MACH") {
+    current_aircraft.fdm_state
+      ->set_Mach_number(fgGetDouble("/velocities/mach"));
+  } else if (speedset == "UVW" || speedset == "uvw") {
+    current_aircraft.fdm_state
+      ->set_Velocities_Wind_Body(fgGetDouble("/velocities/uBody"),
+                                fgGetDouble("/velocities/vBody"),
+                                fgGetDouble("/velocities/wBody"));
+  } else if (speedset == "NED" || speedset == "ned") {
+    current_aircraft.fdm_state
+      ->set_Velocities_Local(fgGetDouble("/velocities/speed-north"),
+                            fgGetDouble("/velocities/speed-east"),
+                            fgGetDouble("/velocities/speed-down"));
+  } else {
+    FG_LOG(FG_GENERAL, FG_ALERT,
+          "Unrecognized value for /sim/startup/speed-set: " << speedset);
+    current_aircraft.fdm_state->set_V_calibrated_kts(0.0);
+  }
+}             
+
+        
 // 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.
@@ -415,7 +471,7 @@ bool fgInitSubsystems( void ) {
     FG_LOG( FG_GENERAL, FG_INFO, "========== ==========");
 
     // Initialize the material property lib
-    FGPath mpath( globals->get_options()->get_fg_root() );
+    FGPath mpath( globals->get_fg_root() );
     mpath.append( "materials" );
     if ( material_lib.load( mpath.str() ) ) {
     } else {
@@ -433,8 +489,8 @@ bool fgInitSubsystems( void ) {
 
     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"),
+                               fgGetDouble("/position/latitude") );
     } else {
        FG_LOG( FG_GENERAL, FG_ALERT, "Error in Tile Manager initialization!" );
        exit(-1);
@@ -444,31 +500,38 @@ bool fgInitSubsystems( void ) {
            "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;
+    double dt = 1.0 / fgGetInt("/sim/model-hz");
+    // cout << "dt = " << dt << endl;
+
+    const string &model = fgGetString("/sim/flight-model");
+    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 {
-       FG_LOG( FG_GENERAL, FG_ALERT,
-               "No flight model, can't init aircraft" );
+       FG_LOG(FG_GENERAL, FG_ALERT,
+              "Unrecognized flight model '" << model
+              << ", can't init aircraft");
        exit(-1);
     }
+    cur_fdm_state->stamp();
+    cur_fdm_state->set_remainder( 0 );
 
     // 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( fgGetString("/sim/flight-model"),
+                            scenery.cur_elev );
+    
     // set the initial position
     fgInitPosition();
 
@@ -482,29 +545,16 @@ bool fgInitSubsystems( void ) {
 
     // now handled inside of the fgTileMgrUpdate()
 
-    /*
-    geod_pos = Point3D( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(), 0.0);
-    tmp_abs_view_pos = sgGeodToCart(geod_pos);
-
-    FG_LOG( FG_GENERAL, FG_DEBUG,
-           "Initial abs_view_pos = " << tmp_abs_view_pos );
-    scenery.cur_elev =
-       fgTileMgrCurElev( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(),
-                         tmp_abs_view_pos );
-    FG_LOG( FG_GENERAL, FG_DEBUG,
-           "Altitude after update " << scenery.cur_elev );
-    */
-
-    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 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 );
+    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,
@@ -513,50 +563,27 @@ bool fgInitSubsystems( void ) {
            << (cur_fdm_state->get_Longitude() * RAD_TO_DEG) << ", "
            << (cur_fdm_state->get_Altitude() * FEET_TO_METER) << ")" );
 
-    // We need to calculate a few more values here that would normally
-    // be calculated by the FDM so that the current_view.UpdateViewMath()
-    // routine doesn't get hosed.
-
+    // 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;
-    // Set the FG variables first
-    sgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(),
+    sgGeodToGeoc( cur_fdm_state->get_Latitude(),
+                 cur_fdm_state->get_Altitude(),
                  &sea_level_radius_meters, &lat_geoc);
-    cur_fdm_state->set_Geocentric_Position( lat_geoc, cur_fdm_state->get_Longitude(),
-                               cur_fdm_state->get_Altitude() +
-                               (sea_level_radius_meters * METER_TO_FEET) );
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters * METER_TO_FEET );
-
-    cur_fdm_state->set_sin_cos_longitude(cur_fdm_state->get_Longitude());
-    cur_fdm_state->set_sin_cos_latitude(cur_fdm_state->get_Latitude());
-       
-    cur_fdm_state->set_sin_lat_geocentric(sin(lat_geoc));
-    cur_fdm_state->set_cos_lat_geocentric(cos(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
-    cur_fdm_state->set_Velocities_Local( globals->get_options()->get_uBody(),
-                             globals->get_options()->get_vBody(),
-                             globals->get_options()->get_wBody());
+    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 );
-
-    // Initial Angular Body rates
-    cur_fdm_state->set_Omega_Body( 7.206685E-05, 0.0, 9.492658E-05 );
-
-    cur_fdm_state->set_Earth_position_angle( 0.0 );
-
-    // Mass properties and geometry values
-    cur_fdm_state->set_Inertias( 8.547270E+01,
-                    1.048000E+03, 3.000000E+03, 3.530000E+03, 0.000000E+00 );
-
-    // CG position w.r.t. ref. point
-    cur_fdm_state->set_CG_Position( 0.0, 0.0, 0.0 );
+//     cur_fdm_state->
+//     set_Euler_Angles( fgGetDouble("/orientation/roll") * DEG_TO_RAD,
+//                       fgGetDouble("/orientation/pitch") * DEG_TO_RAD,
+//                       fgGetDouble("/orientation/heading") * DEG_TO_RAD );
 
     // Initialize the event manager
     global_events.Init();
@@ -567,28 +594,32 @@ bool fgInitSubsystems( void ) {
                                                   &fgEVENT_MGR::PrintStats),
                            fgEVENT::FG_EVENT_READY, 60000 );
 
-    // Initialize view parameters
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Before current_view.init()");
-    globals->get_current_view()->Init();
-    globals->get_pilot_view()->Init();
-    FG_LOG( FG_GENERAL, FG_DEBUG, "After current_view.init()");
-    globals->get_current_view()->UpdateViewMath(*cur_fdm_state);
-    globals->get_pilot_view()->UpdateViewMath(*cur_fdm_state);
-    FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
-           << globals->get_current_view()->get_abs_view_pos());
-    // current_view.UpdateWorldToEye(f);
+    // Initialize win_ratio parameters
+    for ( int i = 0; i < globals->get_viewmgr()->size(); ++i ) {
+       globals->get_viewmgr()->get_view(i)->
+           set_win_ratio( fgGetInt("/sim/startup/xsize") /
+                          fgGetInt("/sim/startup/ysize") );
+    }
+
+    // Initialize pilot view
+    FGViewerRPH *pilot_view =
+       (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
 
-    // Initialize the planetary subsystem
-    // global_events.Register( "fgPlanetsInit()", fgPlanetsInit,
-    //                     fgEVENT::FG_EVENT_READY, 600000);
+    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 );
+    pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
+                                     FEET_TO_METER ); 
+    pilot_view->set_rph( cur_fdm_state->get_Phi(),
+                        cur_fdm_state->get_Theta(),
+                        cur_fdm_state->get_Psi() );
 
-    // Initialize the sun's position
-    // global_events.Register( "fgSunInit()", fgSunInit,
-    //                     fgEVENT::FG_EVENT_READY, 30000 );
+    // set current view to 0 (first) which is our main pilot view
+    globals->set_current_view( pilot_view );
 
-    // Intialize the moon's position
-    // global_events.Register( "fgMoonInit()", fgMoonInit,
-    //                     fgEVENT::FG_EVENT_READY, 600000 );
+    FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
+           << globals->get_current_view()->get_abs_view_pos());
 
     // fgUpdateSunPos() needs a few position and view parameters set
     // so it can calculate local relative sun angle and a few other
@@ -621,13 +652,19 @@ bool fgInitSubsystems( void ) {
               current_aircraft.fdm_state->get_Longitude(),
               current_aircraft.fdm_state->get_Altitude() * 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");
+    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);
@@ -640,59 +677,26 @@ bool fgInitSubsystems( void ) {
 
     FG_LOG(FG_GENERAL, FG_INFO, "  VOR/NDB");
     current_navlist = new FGNavList;
-    FGPath p_nav( globals->get_options()->get_fg_root() );
+    FGPath p_nav( globals->get_fg_root() );
     p_nav.append( "Navaids/default.nav" );
     current_navlist->init( p_nav );
 
     FG_LOG(FG_GENERAL, FG_INFO, "  ILS");
     current_ilslist = new FGILSList;
-    FGPath p_ils( globals->get_options()->get_fg_root() );
+    FGPath p_ils( globals->get_fg_root() );
     p_ils.append( "Navaids/default.ils" );
     current_ilslist->init( p_ils );
 
     FG_LOG(FG_GENERAL, FG_INFO, "  Fixes");
     current_fixlist = new FGFixList;
-    FGPath p_fix( globals->get_options()->get_fg_root() );
+    FGPath p_fix( globals->get_fg_root() );
     p_fix.append( "Navaids/default.fix" );
     current_fixlist->init( p_fix );
 
-    // Initialize the underlying radio stack model
+    // Radio stack subsystem.
     current_radiostack = new FGRadioStack;
-
-//     current_radiostack->set_nav1_freq( 117.30 );
-//     current_radiostack->set_nav1_alt_freq( 110.30 );
-//     current_radiostack->set_nav1_sel_radial( 119.0 );
-
-//     current_radiostack->set_nav2_freq( 111.80 );
-//     current_radiostack->set_nav2_alt_freq( 115.70 );
-//     current_radiostack->set_nav2_sel_radial( 029.0 );
-
-//     current_radiostack->set_adf_freq( 266.0 );
-
-#if 0
-    // This block of settings are Alex's defaults for San Diego
-    current_radiostack->set_nav1_freq( 111.70 );
-    current_radiostack->set_nav1_alt_freq( 115.30 );
-    current_radiostack->set_nav1_sel_radial( 280.0 );
-    current_radiostack->set_nav2_freq( 117.80 );
-    current_radiostack->set_nav2_alt_freq( 114.00 );
-    current_radiostack->set_nav2_sel_radial( 68.0 );
-    current_radiostack->set_adf_freq( 210.0 );
-    // End of Alex's custom settings
-#endif
-
-    current_radiostack->search( cur_fdm_state->get_Longitude(),
-                               cur_fdm_state->get_Latitude(),
-                               cur_fdm_state->get_Altitude() * FEET_TO_METER );
-
-    current_radiostack->update( cur_fdm_state->get_Longitude(),
-                               cur_fdm_state->get_Latitude(),
-                               cur_fdm_state->get_Altitude() * FEET_TO_METER );
-
-    // Search radio database once per second
-    global_events.Register( "fgRadioSearch()", fgRadioSearch,
-                           fgEVENT::FG_EVENT_READY, 1000);
-
+    current_radiostack->init();
+    current_radiostack->bind();
 
     // Initialize the Cockpit subsystem
     if( fgCockpitInit( &current_aircraft )) {
@@ -705,21 +709,24 @@ bool fgInitSubsystems( void ) {
     // Initialize the flight model subsystem data structures base on
     // above values
 
-    // fgFDMInit( globals->get_options()->get_flight_model(), cur_fdm_state,
-    //            1.0 / globals->get_options()->get_model_hz() );
-    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);
-    }
-
-    // I'm just sticking this here for now, it should probably move
-    // eventually
+    cur_fdm_state->init();
+    cur_fdm_state->bind();
+//     if ( cur_fdm_state->init( 1.0 / fgGetInt("/sim/model-hz") ) ) {
+//     // fdm init successful
+//     } else {
+//     FG_LOG( FG_GENERAL, FG_ALERT, "FDM init() failed!  Cannot continue." );
+//     exit(-1);
+//     }
+
+    // *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 ( 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 );
+    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,
@@ -727,12 +734,11 @@ bool fgInitSubsystems( void ) {
            << (cur_fdm_state->get_Latitude() * RAD_TO_DEG) << ", "
            << (cur_fdm_state->get_Longitude() * RAD_TO_DEG) << ", "
            << (cur_fdm_state->get_Altitude() * FEET_TO_METER) << ")" );
-    // end of thing that I just stuck in that I should probably move
+    // *ABCD* end of thing that I just stuck in that I should probably
+    // move
 
     // Joystick support
-    if ( fgJoystickInit() ) {
-       // Joystick initialized ok.
-    } else {
+    if ( ! fgJoystickInit() ) {
        FG_LOG( FG_GENERAL, FG_ALERT, "Error in Joystick initialization!" );
     }
 
@@ -752,35 +758,53 @@ bool fgInitSubsystems( void ) {
 #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,
-              "Error reading new panel from " << panel_path);
+       FG_LOG( FG_INPUT, FG_ALERT, 
+               "Error reading new panel from " << panel_path );
+    } else {
+       FG_LOG( FG_INPUT, FG_INFO, "Loaded new panel from " << panel_path );
+       current_panel->init();
+       current_panel->bind();
     }
-    FG_LOG(FG_INPUT, FG_INFO, "Loaded new panel from " << panel_path);
 
     // Initialize the BFI
     FGBFI::init();
 
+    controls.init();
+    controls.bind();
+
     FG_LOG( FG_GENERAL, FG_INFO, endl);
 
+                               // Save the initial state for future
+                               // reference.
+    globals->saveInitialState();
+
     return true;
 }
 
 
 void fgReInitSubsystems( void )
 {
+    FG_LOG( FG_GENERAL, FG_INFO,
+           "/position/altitude = " << fgGetDouble("/position/altitude") );
+
     bool freeze = globals->get_freeze();
     if( !freeze )
         globals->set_freeze( true );
     
+    // Initialize the Scenery Management subsystem
+    if ( ! fgSceneryInit() ) {
+       FG_LOG( FG_GENERAL, FG_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"),
+                               fgGetDouble("/position/latitude") );
     } else {
        FG_LOG( FG_GENERAL, FG_ALERT, "Error in Tile Manager initialization!" );
                exit(-1);
@@ -788,79 +812,75 @@ void fgReInitSubsystems( void )
 
     // cout << "current scenery elev = " << scenery.cur_elev << endl;
 
-    fgInitPosition();
-    fgFDMSetGroundElevation( globals->get_options()->get_flight_model(), 
+    fgFDMSetGroundElevation( fgGetString("/sim/flight-model"), 
                             scenery.cur_elev );
+    fgInitPosition();
 
     // 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() );
+    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 );
+    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;
-    // Set the FG variables first
     sgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(), 
                  &sea_level_radius_meters, &lat_geoc);
-    cur_fdm_state->set_Geocentric_Position( lat_geoc, cur_fdm_state->get_Longitude(), 
-                               cur_fdm_state->get_Altitude() + 
-                               (sea_level_radius_meters * METER_TO_FEET) );
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters * METER_TO_FEET );
+    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters *
+                                        METER_TO_FEET );
        
-    cur_fdm_state->set_sin_cos_longitude(cur_fdm_state->get_Longitude());
-    cur_fdm_state->set_sin_cos_latitude(cur_fdm_state->get_Latitude());
-       
-    cur_fdm_state->set_sin_lat_geocentric(sin(lat_geoc));
-    cur_fdm_state->set_cos_lat_geocentric(cos(lat_geoc));
-
     // The following section sets up the flight model EOM parameters
     // and should really be read in from one or more files.
 
     // Initial Velocity
-    cur_fdm_state->set_Velocities_Local( globals->get_options()->get_uBody(),
-                             globals->get_options()->get_vBody(),
-                             globals->get_options()->get_wBody());
+    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 );
+//     cur_fdm_state->
+//     set_Euler_Angles( fgGetDouble("/orientation/roll") * DEG_TO_RAD,
+//                       fgGetDouble("/orientation/pitch") * DEG_TO_RAD,
+//                       fgGetDouble("/orientation/heading") * DEG_TO_RAD );
 
-    // Initial Angular Body rates
-    cur_fdm_state->set_Omega_Body( 7.206685E-05, 0.0, 9.492658E-05 );
+    // Initialize view parameters
+    FGViewerRPH *pilot_view =
+       (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
 
-    cur_fdm_state->set_Earth_position_angle( 0.0 );
+    pilot_view->set_view_offset( 0.0 );
+    pilot_view->set_goal_view_offset( 0.0 );
 
-    // Mass properties and geometry values
-    cur_fdm_state->set_Inertias( 8.547270E+01, 
-                    1.048000E+03, 3.000000E+03, 3.530000E+03, 0.000000E+00 );
+    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 );
+    pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
+                                     FEET_TO_METER ); 
+    pilot_view->set_rph( cur_fdm_state->get_Phi(),
+                        cur_fdm_state->get_Theta(),
+                        cur_fdm_state->get_Psi() );
 
-    // CG position w.r.t. ref. point
-    cur_fdm_state->set_CG_Position( 0.0, 0.0, 0.0 );
+    // set current view to 0 (first) which is our main pilot view
+    globals->set_current_view( pilot_view );
 
-    // Initialize view parameters
-    globals->get_current_view()->set_view_offset( 0.0 );
-    globals->get_current_view()->set_goal_view_offset( 0.0 );
-    globals->get_pilot_view()->set_view_offset( 0.0 );
-    globals->get_pilot_view()->set_goal_view_offset( 0.0 );
-
-    FG_LOG( FG_GENERAL, FG_DEBUG, "After current_view.init()");
-    globals->get_current_view()->UpdateViewMath(*cur_fdm_state);
-    globals->get_pilot_view()->UpdateViewMath(*cur_fdm_state);
     FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
            << globals->get_current_view()->get_abs_view_pos());
 
-    // fgFDMInit( globals->get_options()->get_flight_model(), cur_fdm_state, 
-    //            1.0 / globals->get_options()->get_model_hz() );
-    cur_fdm_state->init( 1.0 / globals->get_options()->get_model_hz() );
+    cur_fdm_state->init();
+//     cur_fdm_state->bind();
+//     cur_fdm_state->init( 1.0 / fgGetInt("/sim/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 );
+    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 );
     }
 
     controls.reset_all();