X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fmain.cxx;h=66bf3c6d848badb4553ccf5c8036143df4a5a789;hb=c56c520ab5baa9e5cb1c651bc0ac887aab1637f0;hp=18e5e025c765324149dc12fc6ba0599bffcbf7a9;hpb=6dd5f0f6d5130961c2a95938b2190dca9483a066;p=flightgear.git

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 18e5e025c..66bf3c6d8 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -32,20 +32,13 @@
 #  include <signal.h>
 #endif
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#endif
+#include <iostream>
 
 #include <plib/netSocket.h>
 
-#include <simgear/props/props.hxx>
-#include <simgear/timing/sg_time.hxx>
-#include <simgear/math/sg_random.h>
+#include <osg/Camera>
+#include <osg/GraphicsContext>
+#include <osgDB/Registry>
 
 // Class references
 #include <simgear/ephemeris/ephemeris.hxx>
@@ -53,6 +46,11 @@
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/model/animation.hxx>
 #include <simgear/scene/sky/sky.hxx>
+#include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/math/sg_random.h>
+
 #include <Time/light.hxx>
 #include <Include/general.hxx>
 #include <Aircraft/replay.hxx>
@@ -63,33 +61,36 @@
 #include <Model/acmodel.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
+#include <Sound/fg_fx.hxx>
 #include <Sound/beacon.hxx>
 #include <Sound/morse.hxx>
+#include <Sound/fg_fx.hxx>
 #include <FDM/flight.hxx>
-#include <ATC/ATCmgr.hxx>
-#include <ATC/AIMgr.hxx>
+#include <ATCDCL/ATCmgr.hxx>
+#include <ATCDCL/AIMgr.hxx>
 #include <Time/tmp.hxx>
-#include <Time/fg_timer.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <GUI/new_gui.hxx>
 #include <MultiPlayer/multiplaymgr.hxx>
 
+#include "CameraGroup.hxx"
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
 #include "renderer.hxx"
 #include "splash.hxx"
 #include "main.hxx"
-
-
+#include "util.hxx"
+#include "fg_init.hxx"
+#include "fg_os.hxx"
+#include "WindowSystemAdapter.hxx"
+#include <Main/viewer.hxx>
 
 static double real_delta_time_sec = 0.0;
 double delta_time_sec = 0.0;
-extern float init_volume;
 
+using namespace flightgear;
 
-#ifdef macintosh
-#  include <console.h>		// -dw- for command line dialog
-#endif
+using std::cerr;
 
 // This is a record containing a bit of global housekeeping information
 FGGeneral general;
@@ -136,9 +137,10 @@ void fgUpdateTimeDepCalcs() {
         double lat = fgGetDouble("/sim/presets/latitude-deg");
         // We require just to have 50 meter scenery availabe around
         // the aircraft.
-        double range = 50.0;
-        if (globals->get_tile_mgr()->scenery_available(lat, lon, range)) {
-            SG_LOG(SG_FLIGHT,SG_INFO, "Finally initializing fdm");
+        double range = 1000.0;
+        SGGeod geod = SGGeod::fromDeg(lon, lat);
+        if (globals->get_scenery()->scenery_available(geod, range)) {
+            //SG_LOG(SG_FLIGHT, SG_INFO, "Finally initializing fdm");
             cur_fdm_state->init();
             if ( cur_fdm_state->get_bound() ) {
                 cur_fdm_state->unbind();
@@ -152,11 +154,6 @@ void fgUpdateTimeDepCalcs() {
     if ( cur_fdm_state->get_inited() ) {
         // we have been inited, and  we are good to go ...
 
-        if ( !inited ) {
-            inited = true;
-            fgSetBool("/sim/signals/fdm-initialized", true);
-        }
-
         if ( replay_state->getIntValue() == 0 ) {
             // replay off, run fdm
             cur_fdm_state->update( delta_time_sec );
@@ -172,16 +169,18 @@ void fgUpdateTimeDepCalcs() {
                 // paused playback (don't advance replay time)
             }
         }
+
+        if ( !inited ) {
+            inited = true;
+            fgSetBool("/sim/signals/fdm-initialized", true);
+        }
+
     } else {
         // do nothing, fdm isn't inited yet
     }
 
-    globals->get_model_mgr()->update(delta_time_sec);
     globals->get_aircraft_model()->update(delta_time_sec);
 
-    // update the view angle
-    globals->get_viewmgr()->update(delta_time_sec);
-
     // Update solar system
     globals->get_ephem()->update( globals->get_time_params()->getMjd(),
                                   globals->get_time_params()->getLst(),
@@ -190,33 +189,33 @@ void fgUpdateTimeDepCalcs() {
 }
 
 
-void fgInitTimeDepCalcs( void ) {
-    // noop for now
-}
-
-
-static const double alt_adjust_ft = 3.758099;
-static const double alt_adjust_m = alt_adjust_ft * SG_FEET_TO_METER;
-
-
 // What should we do when we have nothing else to do?  Let's get ready
 // for the next move and update the display?
 static void fgMainLoop( void ) {
     int model_hz = fgGetInt("/sim/model-hz");
 
-    static const SGPropertyNode *longitude
+    static SGConstPropertyNode_ptr longitude
         = fgGetNode("/position/longitude-deg");
-    static const SGPropertyNode *latitude
+    static SGConstPropertyNode_ptr latitude
         = fgGetNode("/position/latitude-deg");
-    static const SGPropertyNode *altitude
+    static SGConstPropertyNode_ptr altitude
         = fgGetNode("/position/altitude-ft");
-    static const SGPropertyNode *clock_freeze
+    static SGConstPropertyNode_ptr vn_fps
+        = fgGetNode("/velocities/speed-north-fps");
+    static SGConstPropertyNode_ptr ve_fps
+        = fgGetNode("/velocities/speed-east-fps");
+    static SGConstPropertyNode_ptr vd_fps
+        = fgGetNode("/velocities/speed-down-fps");
+    static SGConstPropertyNode_ptr clock_freeze
         = fgGetNode("/sim/freeze/clock", true);
-    static const SGPropertyNode *cur_time_override
+    static SGConstPropertyNode_ptr cur_time_override
         = fgGetNode("/sim/time/cur-time-override", true);
-    static const SGPropertyNode *max_simtime_per_frame
+    static SGConstPropertyNode_ptr max_simtime_per_frame
         = fgGetNode("/sim/max-simtime-per-frame", true);
+    static SGPropertyNode_ptr frame_signal
+        = fgGetNode("/sim/signals/frame", true);
 
+    frame_signal->fireValueChanged();
     SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
 
     bool scenery_loaded = fgGetBool("sim/sceneryloaded");
@@ -266,7 +265,7 @@ static void fgMainLoop( void ) {
         }
         current_time_stamp.stamp();
         /* Convert to ms */
-        double elapsed_us = current_time_stamp - last_time_stamp;
+        double elapsed_us = (current_time_stamp - last_time_stamp).toUSecs();
         if ( elapsed_us < frame_us ) {
             double requested_us = frame_us - elapsed_us;
             ulMilliSecondSleep ( (int)(requested_us / 1000.0) ) ;
@@ -279,7 +278,9 @@ static void fgMainLoop( void ) {
         // ulMilliSecondSleep() call is omitted this will peg the cpu
         // (which is just fine if FG is the only app you care about.)
         current_time_stamp.stamp();
-        while ( current_time_stamp - last_time_stamp < frame_us ) {
+        SGTimeStamp next_time_stamp = last_time_stamp;
+        next_time_stamp += SGTimeStamp::fromSec(1e-6*frame_us);
+        while ( current_time_stamp < next_time_stamp ) {
             current_time_stamp.stamp();
         }
     } else {
@@ -287,8 +288,7 @@ static void fgMainLoop( void ) {
         current_time_stamp.stamp();
     }
 
-    real_delta_time_sec
-        = double(current_time_stamp - last_time_stamp) / 1000000.0;
+    real_delta_time_sec = (current_time_stamp - last_time_stamp).toSecs();
 
     // Limit the time we need to spend in simulation loops
     // That means, if the /sim/max-simtime-per-frame value is strictly positive
@@ -305,15 +305,12 @@ static void fgMainLoop( void ) {
 
     // round the real time down to a multiple of 1/model-hz.
     // this way all systems are updated the _same_ amount of dt.
-    {
-        static double rem = 0.0;
-        real_delta_time_sec += rem;
-        double hz = model_hz;
-        double nit = floor(real_delta_time_sec*hz);
-        rem = real_delta_time_sec - nit/hz;
-        real_delta_time_sec = nit/hz;
-    }
-
+    static double reminder = 0.0;
+    real_delta_time_sec += reminder;
+    global_multi_loop = long(floor(real_delta_time_sec*model_hz));
+    global_multi_loop = SGMisc<long>::max(0, global_multi_loop);
+    reminder = real_delta_time_sec - double(global_multi_loop)/double(model_hz);
+    real_delta_time_sec = double(global_multi_loop)/double(model_hz);
 
     if (clock_freeze->getBoolValue() || wait_for_scenery) {
         delta_time_sec = 0;
@@ -327,8 +324,6 @@ static void fgMainLoop( void ) {
     fgSetDouble("/sim/time/delta-realtime-sec", real_delta_time_sec);
     fgSetDouble("/sim/time/delta-sec", delta_time_sec);
 
-    static long remainder = 0;
-    long elapsed;
 #ifdef FANCY_FRAME_COUNTER
     int i;
     double accum;
@@ -339,19 +334,9 @@ static void fgMainLoop( void ) {
 
     SGTime *t = globals->get_time_params();
 
-    globals->get_event_mgr()->update(delta_time_sec);
-
     SG_LOG( SG_ALL, SG_DEBUG, "Running Main Loop");
     SG_LOG( SG_ALL, SG_DEBUG, "======= ==== ====");
 
-#if defined( ENABLE_PLIB_JOYSTICK )
-    // Read joystick and update control settings
-    // if ( fgGetString("/sim/control-mode") == "joystick" )
-    // {
-    //    fgJoystickRead();
-    // }
-#endif
-
     // Fix elevation.  I'm just sticking this here for now, it should
     // probably move eventually
 
@@ -411,12 +396,6 @@ static void fgMainLoop( void ) {
                                 altitude->getDoubleValue() * SG_FEET_TO_METER,
                                 globals->get_time_params()->getJD() );
 
-    // Get elapsed time (in usec) for this past frame
-    elapsed = fgGetTimeInterval();
-    SG_LOG( SG_ALL, SG_DEBUG,
-            "Elapsed time interval is = " << elapsed
-            << ", previous remainder is = " << remainder );
-
     // Calculate frame rate average
 #ifdef FANCY_FRAME_COUNTER
     /* old fps calculation */
@@ -463,46 +442,16 @@ static void fgMainLoop( void ) {
         globals->get_AI_mgr()->update(delta_time_sec);
 
     // Run flight model
-
-    // Calculate model iterations needed for next frame
-    elapsed += remainder;
-
-    global_multi_loop = (long)(((double)elapsed * 0.000001) * model_hz );
-    remainder = elapsed - ( (global_multi_loop*1000000) / model_hz );
-    SG_LOG( SG_ALL, SG_DEBUG,
-            "Model iterations needed = " << global_multi_loop
-            << ", new remainder = " << remainder );
-
-    // chop max iterations to something reasonable if the sim was
-    // delayed for an excessive amount of time
-    if ( global_multi_loop > 2.0 * model_hz ) {
-        global_multi_loop = (int)(2.0 * model_hz );
-        remainder = 0;
-    }
-
-    // flight model
-    if ( global_multi_loop > 0) {
+    if (0 < global_multi_loop) {
         // first run the flight model each frame until it is initialized
-        // then continue running each frame only after initial scenery load is complete.
+        // then continue running each frame only after initial scenery
+        // load is complete.
         fgUpdateTimeDepCalcs();
     } else {
         SG_LOG( SG_ALL, SG_DEBUG,
             "Elapsed time is zero ... we're zinging" );
     }
 
-    // Do any I/O channel work that might need to be done
-    globals->get_io()->update( real_delta_time_sec );
-
-    // see if we need to load any deferred-load textures
-    globals->get_matlib()->load_next_deferred();
-
-    // Run audio scheduler
-#ifdef ENABLE_AUDIO_SUPPORT
-    if ( globals->get_soundmgr()->is_working() ) {
-        globals->get_soundmgr()->update( delta_time_sec );
-    }
-#endif
-
     globals->get_subsystem_mgr()->update(delta_time_sec);
 
     //
@@ -511,114 +460,43 @@ static void fgMainLoop( void ) {
     //   we may want to move this to its own class at some point
     //
     double visibility_meters = fgGetDouble("/environment/visibility-m");
-    FGViewer *current_view = globals->get_current_view();
-
     globals->get_tile_mgr()->prep_ssg_nodes( visibility_meters );
+
     // update tile manager for view...
-    SGLocation *view_location = globals->get_current_view()->getSGLocation();
-    globals->get_tile_mgr()->update( view_location, visibility_meters );
-    {
-        double lon = view_location->getLongitude_deg();
-        double lat = view_location->getLatitude_deg();
-        double alt = view_location->getAltitudeASL_ft() * SG_FEET_TO_METER;
-
-        // check if we can reuse the groundcache for that purpose.
-        double ref_time, r;
-        SGVec3d pt;
-        bool valid = cur_fdm_state->is_valid_m(&ref_time, pt.sg(), &r);
-        SGVec3d viewpos(globals->get_current_view()->get_view_pos());
-        if (valid && distSqr(viewpos, pt) < r*r) {
-            // Reuse the cache ...
-            double lev
-                = cur_fdm_state->get_groundlevel_m(lat*SGD_DEGREES_TO_RADIANS,
-                                                   lon*SGD_DEGREES_TO_RADIANS,
-                                                   alt + 2.0);
-            view_location->set_cur_elev_m( lev );
-        } else {
-            // Do full intersection test.
-            double lev;
-            if (globals->get_scenery()->get_elevation_m(lat, lon, alt+2, lev, 0))
-                view_location->set_cur_elev_m( lev );
-            else
-                view_location->set_cur_elev_m( -9999.0 );
-        }
-    }
+    SGVec3d viewPos = globals->get_current_view()->get_view_pos();
+    SGGeod geodViewPos = SGGeod::fromCart(viewPos);
+    globals->get_tile_mgr()->update(geodViewPos, visibility_meters);
+
+    // run Nasal's settimer() loops right before the view manager
+    globals->get_event_mgr()->update(delta_time_sec);
+
+    // pick up model coordidnates that Nasal code may have set relative to the
+    // aircraft's
+    globals->get_model_mgr()->update(delta_time_sec);
+
+    // update the view angle as late as possible, but before sound calculations
+    globals->get_viewmgr()->update(real_delta_time_sec);
 
+    // Update the sound manager last so it can use the CPU while the GPU
+    // is processing the scenery (doubled the frame-rate for me) -EMH-
 #ifdef ENABLE_AUDIO_SUPPORT
-    // Right now we make a simplifying assumption that the primary
-    // aircraft is the source of all sounds and that all sounds are
-    // positioned in the aircraft base
-
-    static sgVec3 last_pos_offset = {0, 0, 0};
-
-    //get the orientation
-    const SGQuatd view_or = current_view->getViewOrientation();
-    SGQuatd surf_or = SGQuatd::fromLonLatDeg(
-        current_view->getLongitude_deg(), current_view->getLatitude_deg());
-    SGQuatd model_or = SGQuatd::fromYawPitchRollDeg(
-        globals->get_aircraft_model()->get3DModel()->getHeadingDeg(),
-        globals->get_aircraft_model()->get3DModel()->getPitchDeg(),
-        globals->get_aircraft_model()->get3DModel()->getRollDeg());
-
-    //get the up and at vector in the aircraft base
-    SGVec3d sgv_up = model_or.rotateBack(
-        surf_or.rotateBack(view_or.rotate(SGVec3d(0, -1, 0))));
-    sgVec3 up;
-    sgSetVec3(up, sgv_up[0], sgv_up[1], sgv_up[2]);
-    SGVec3d sgv_at = model_or.rotateBack(
-        surf_or.rotateBack(view_or.rotate(SGVec3d(0, 0, 1))));
-    sgVec3 at;
-    sgSetVec3(at, sgv_at[0], sgv_at[1], sgv_at[2]);
-
-    // get the location data for the primary FDM (now hardcoded to ac model)...
-    SGLocation *acmodel_loc = NULL;
-    acmodel_loc = (SGLocation *)globals->
-        get_aircraft_model()->get3DModel()->getSGLocation();
-
-    // set positional offset for sources
-    sgdVec3 dsource_pos_offset;
-    sgdSubVec3( dsource_pos_offset,
-                (double*) &current_view->get_view_pos(),
-                acmodel_loc->get_absolute_view_pos() );
-    SGVec3d sgv_dsource_pos_offset = model_or.rotateBack(
-        surf_or.rotateBack(SGVec3d(dsource_pos_offset[0],
-        dsource_pos_offset[1], dsource_pos_offset[2])));
-
-    //sgv_dsource_pos_offset = model_or.rotateBack(sgv_dsource_pos_offset);
-    sgVec3 source_pos_offset;
-    sgSetVec3(source_pos_offset, sgv_dsource_pos_offset[0],
-        sgv_dsource_pos_offset[1], sgv_dsource_pos_offset[2]);
-
-    globals->get_soundmgr()->set_source_pos_all( source_pos_offset );
-
-    float orient[6];
-    for (int i = 0; i < 3; i++) {
-        orient[i] = sgv_at[i];
-        orient[i + 3] = sgv_up[i];
-    }
-    globals->get_soundmgr()->set_listener_orientation( orient );
-
-    // set the velocity
-    sgVec3 source_vel;
-    sgSubVec3( source_vel, source_pos_offset, last_pos_offset );
-    if (delta_time_sec > 0)
-        sgScaleVec3( source_vel, 1 / delta_time_sec );
-    sgCopyVec3( last_pos_offset, source_pos_offset );
-    // cout << "vel = " << source_vel[0] << " " << source_vel[1] << " " << source_vel[2] << endl;
-    globals->get_soundmgr()->set_source_vel_all( source_vel );
-
-    // The listener is always positioned at the origin.
-    sgVec3 listener_pos;
-    sgSetVec3( listener_pos, 0.0, 0.0, 0.0 );
-    globals->get_soundmgr()->set_listener_pos( listener_pos );
+    globals->get_soundmgr()->update(delta_time_sec);
 #endif
 
     // END Tile Manager udpates
 
-    if (!scenery_loaded && globals->get_tile_mgr()->all_queues_empty() && cur_fdm_state->get_inited()) {
+    if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
+        && cur_fdm_state->get_inited()) {
         fgSetBool("sim/sceneryloaded",true);
-        fgSetFloat("/sim/sound/volume", init_volume);
-        globals->get_soundmgr()->set_volume(init_volume);
+#ifdef ENABLE_AUDIO_SUPPORT
+        if (fgGetBool("/sim/sound/enabled") == true)  {
+            float volume = fgGetFloat("/sim/sound/volume");
+            globals->get_soundmgr()->set_volume(volume);
+            globals->get_soundmgr()->activate();
+        }
+        else
+            globals->get_soundmgr()->stop();
+#endif
     }
 
     fgRequestRedraw();
@@ -626,24 +504,18 @@ static void fgMainLoop( void ) {
     SG_LOG( SG_ALL, SG_DEBUG, "" );
 }
 
-
-// This is the top level master main function that is registered as
-// our idle funciton
-
-// The first few passes take care of initialization things (a couple
-// per pass) and once everything has been initialized fgMainLoop from
-// then on.
-
-static void fgIdleFunction ( void ) {
-    // Some intialization requires a valid graphics context, in
-    // particular that of plib. Boo, hiss!
-    fgMakeCurrent();
-    if ( idle_state == 0 ) {
-        idle_state++;
-
-        // This seems to be the absolute earliest in the init sequence
-        // that these calls will return valid info.  Too bad it's after
-        // we've already created and sized our window. :-(
+// Operation for querying OpenGL parameters. This must be done in a
+// valid OpenGL context, potentially in another thread.
+namespace
+{
+struct GeneralInitOperation : public GraphicsContextOperation
+{
+    GeneralInitOperation()
+        : GraphicsContextOperation(std::string("General init"))
+    {
+    }
+    void run(osg::GraphicsContext* gc)
+    {
         general.set_glVendor( (char *)glGetString ( GL_VENDOR ) );
         general.set_glRenderer( (char *)glGetString ( GL_RENDERER ) );
         general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
@@ -657,12 +529,44 @@ static void fgIdleFunction ( void ) {
         glGetIntegerv( GL_DEPTH_BITS, &tmp );
         general.set_glDepthBits( tmp );
         SG_LOG ( SG_GENERAL, SG_INFO, "Depth buffer bits = " << tmp );
+    }
+};
+}
 
-        // Initialize the user interface so that we can use fonts
-        guiInit();
+// This is the top level master main function that is registered as
+// our idle funciton
 
+// The first few passes take care of initialization things (a couple
+// per pass) and once everything has been initialized fgMainLoop from
+// then on.
 
+static void fgIdleFunction ( void ) {
+    static osg::ref_ptr<GeneralInitOperation> genOp;
+    if ( idle_state == 0 ) {
+        idle_state++;
+        // Pick some window on which to do queries.
+        // XXX Perhaps all this graphics initialization code should be
+        // moved to renderer.cxx?
+        genOp = new GeneralInitOperation;
+        osg::Camera* guiCamera = getGUICamera(CameraGroup::getDefault());
+        WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA();
+        osg::GraphicsContext* gc = 0;
+        if (guiCamera)
+            gc = guiCamera->getGraphicsContext();
+        if (gc) {
+            gc->add(genOp.get());
+        } else {
+            wsa->windows[0]->gc->add(genOp.get());
+        }
+        guiStartInit(gc);
     } else if ( idle_state == 1 ) {
+        if (genOp.valid()) {
+            if (!genOp->isFinished())
+                return;
+            genOp = 0;
+        }
+        if (!guiFinishInit())
+            return;
         idle_state++;
         fgSplashProgress("reading aircraft list");
 
@@ -671,23 +575,6 @@ static void fgIdleFunction ( void ) {
         idle_state++;
         // Read the list of available aircraft
         fgReadAircraft();
-
-        // get the address of our OpenGL extensions
-//         if (SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ) {
-//             glPointParameterIsSupported = true;
-//             glPointParameterfPtr = (glPointParameterfProc)
-//                 SGLookupFunction("glPointParameterfEXT");
-//             glPointParameterfvPtr = (glPointParameterfvProc)
-//                 SGLookupFunction("glPointParameterfvEXT");
-//         } else if ( SGIsOpenGLExtensionSupported("GL_ARB_point_parameters") ) {
-//             glPointParameterIsSupported = true;
-//             glPointParameterfPtr = (glPointParameterfProc)
-//                 SGLookupFunction("glPointParameterfARB");
-//             glPointParameterfvPtr = (glPointParameterfvProc)
-//                 SGLookupFunction("glPointParameterfvARB");
-//         } else {
-//             glPointParameterIsSupported = false;
-//         }
         fgSplashProgress("reading airport & navigation data");
 
 
@@ -724,7 +611,7 @@ static void fgIdleFunction ( void ) {
         // Initialize the material manager
         ////////////////////////////////////////////////////////////////////
         globals->set_matlib( new SGMaterialLib );
-        globals->set_model_lib(new SGModelLib);
+        simgear::SGModelLib::init(globals->get_fg_root());
 
 
         ////////////////////////////////////////////////////////////////////
@@ -747,6 +634,7 @@ static void fgIdleFunction ( void ) {
 
     } else if ( idle_state == 5 ) {
         idle_state++;
+
         ////////////////////////////////////////////////////////////////////
         // Initialize the 3D aircraft model subsystem (has a dependency on
         // the scenery subsystem.)
@@ -798,10 +686,7 @@ static void fgIdleFunction ( void ) {
         // Sun diameter: 1,390,000 kilometers
         thesky->build( 80000.0, 80000.0,
                        463.3, 361.8,
-                       globals->get_ephem()->getNumPlanets(),
-                       globals->get_ephem()->getPlanets(),
-                       globals->get_ephem()->getNumStars(),
-                       globals->get_ephem()->getStars(),
+                       *globals->get_ephem(),
                        fgGetNode("/environment", true));
 
         // Initialize MagVar model
@@ -846,27 +731,17 @@ static void fgIdleFunction ( void ) {
             SG_LOG( SG_GENERAL, SG_INFO,
                 "Starting intro music: " << mp3file.str() );
 
-#if defined( __CYGWIN__ )
+# if defined( __CYGWIN__ )
             string command = "start /m `cygpath -w " + mp3file.str() + "`";
-#elif defined( WIN32 )
+# elif defined( WIN32 )
             string command = "start /m " + mp3file.str();
-#else
+# else
             string command = "mpg123 " + mp3file.str() + "> /dev/null 2>&1";
-#endif
+# endif
 
             system ( command.c_str() );
         }
 #endif
-
-        // These are a few miscellaneous things that aren't really
-        // "subsystems" but still need to be initialized.
-
-#ifdef USE_GLIDE
-        if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
-            grTexLodBiasValue ( GR_TMU0, 1.0 ) ;
-        }
-#endif
-
         // This is the top level init routine which calls all the
         // other subsystem initialization routines.  If you are adding
         // a subsystem to flightgear, its initialization call should be
@@ -907,16 +782,17 @@ static void fgIdleFunction ( void ) {
 
 static void upper_case_property(const char *name)
 {
+    using namespace simgear;
     SGPropertyNode *p = fgGetNode(name, false);
     if (!p) {
         p = fgGetNode(name, true);
         p->setStringValue("");
     } else {
-        SGPropertyNode::Type t = p->getType();
-        if (t == SGPropertyNode::NONE || t == SGPropertyNode::UNSPECIFIED)
+        props::Type t = p->getType();
+        if (t == props::NONE || t == props::UNSPECIFIED)
             p->setStringValue("");
         else
-            assert(t == SGPropertyNode::STRING);
+            assert(t == props::STRING);
     }
     p->addChangeListener(new FGMakeUpperCase);
 }
@@ -925,12 +801,6 @@ static void upper_case_property(const char *name)
 // Main top level initialization
 bool fgMainInit( int argc, char **argv ) {
 
-#if defined( macintosh )
-    freopen ("stdout.txt", "w", stdout );
-    freopen ("stderr.txt", "w", stderr );
-    argc = ccommand( &argv );
-#endif
-
     // set default log levels
     sglog().setLogLevels( SG_ALL, SG_ALERT );
 
@@ -958,16 +828,18 @@ bool fgMainInit( int argc, char **argv ) {
     string_list *col = new string_list;
     globals->set_channel_options_list( col );
 
+    fgValidatePath("", false);  // initialize static variables
     upper_case_property("/sim/presets/airport-id");
     upper_case_property("/sim/presets/runway");
     upper_case_property("/sim/tower/airport-id");
+    upper_case_property("/autopilot/route-manager/input");
 
     // Scan the config file(s) and command line options to see if
     // fg_root was specified (ignore all other options for now)
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "0.9.11";
+    static char required_version[] = "1.9.0";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application
@@ -993,13 +865,8 @@ bool fgMainInit( int argc, char **argv ) {
     }
 
     // Initialize the Window/Graphics environment.
-#if !defined(__APPLE__) || defined(OSX_BUNDLE)
-    // Mac OS X command line ("non-bundle") applications call this
-    // from main(), in bootstrap.cxx.  Andy doesn't know why, someone
-    // feel free to add comments...
     fgOSInit(&argc, argv);
     _bootstrap_OSInit++;
-#endif
 
     fgRegisterWindowResizeHandler( &FGRenderer::resize );
     fgRegisterIdleHandler( &fgIdleFunction );
@@ -1016,12 +883,7 @@ bool fgMainInit( int argc, char **argv ) {
 
     // Clouds3D requires an alpha channel
     // clouds may require stencil buffer
-    fgOSOpenWindow( fgGetInt("/sim/startup/xsize"),
-                    fgGetInt("/sim/startup/ysize"),
-                    fgGetInt("/sim/rendering/bits-per-pixel"),
-                    fgGetBool("/sim/rendering/clouds3d-enable"),
-                    get_stencil_buffer,
-                    fgGetBool("/sim/startup/fullscreen") );
+    fgOSOpenWindow(get_stencil_buffer);
 
     // Initialize the splash screen right away
     fntInit();