- open window as soon as possible

- move most of the initialization in chunks into the idle loop
- remove unused first fgSplashUpdate() parameter

src/Main/fg_init.cxx

@@ -133,6 +133,7 @@
 #include "options.hxx"
 #include "globals.hxx"
 #include "logger.hxx"
+#include "splash.hxx"
 #include "viewmgr.hxx"
 
 #if defined(FX) && defined(XMESA)
@@ -1059,6 +1060,8 @@ fgInitNav ()
 
     fgAirportDBLoad( airports, runways, aptdb.str(), p_metar.str() );
 
+    fgSplashUpdate( 1.0 );
+
     FGNavList *navlist = new FGNavList;
     FGNavList *loclist = new FGNavList;
     FGNavList *gslist = new FGNavList;
@@ -1076,6 +1079,8 @@ fgInitNav ()
                 "Problems loading one or more navigational database" );
     }
 
+    fgSplashUpdate( 1.0 );
+
     if ( fgGetBool("/sim/navdb/localizers/auto-align", true) ) {
         // align all the localizers with their corresponding runways
         // since data sources are good for cockpit navigation
@@ -1616,6 +1621,7 @@ bool fgInitSubsystems() {
     // update the current timezone each 30 minutes
     globals->get_event_mgr()->addTask( "fgUpdateLocalTime()",
                                        &fgUpdateLocalTime, 30*60 );
+    fgInitTimeOffset();		// the environment subsystem needs this
 
 
     ////////////////////////////////////////////////////////////////////

src/Main/main.cxx

@@ -651,13 +651,201 @@ static void fgIdleFunction ( void ) {
     // printf("idle state == %d\n", idle_state);
 
     if ( idle_state == 0 ) {
-        // Initialize the splash screen right away
+        idle_state++;
-        if ( fgGetBool("/sim/startup/splash-screen") ) {
+
-            fgSplashInit(fgGetString("/sim/startup/splash-texture"));
+        // 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 out window. :-(
+        general.set_glVendor( (char *)glGetString ( GL_VENDOR ) );
+        general.set_glRenderer( (char *)glGetString ( GL_RENDERER ) );
+        general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
+        SG_LOG( SG_GENERAL, SG_INFO, general.get_glRenderer() );
+
+        GLint tmp;
+        glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
+        general.set_glMaxTexSize( tmp );
+        SG_LOG ( SG_GENERAL, SG_INFO, "Max texture size = " << tmp );
+
+        glGetIntegerv( GL_DEPTH_BITS, &tmp );
+        general.set_glDepthBits( tmp );
+        SG_LOG ( SG_GENERAL, SG_INFO, "Depth buffer bits = " << tmp );
+
+        // Initialize ssg (from plib).  Needs to come before we do any
+        // other ssg stuff, but after opengl has been initialized.
+        ssgInit();
+
+        // Initialize the user interface (we need to do this before
+        // passing off control to the OS main loop and before
+         // fgInitGeneral to get our fonts !!!
+        guiInit();
+
+
+    } else if ( idle_state == 1 ) {
+        idle_state++;
+        // Read the list of available aircrafts
+        fgReadAircraft();
+
+#ifdef GL_EXT_texture_lod_bias
+        glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, -0.5 ) ;
+#endif
+
+        // get the address of our OpenGL extensions
+        if ( fgGetBool("/sim/rendering/distance-attenuation") ) {
+            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;
         }
 
+
+    } else if ( idle_state == 2 ) {
+        idle_state++;
+        fgInitNav();
+
+
+    } else if ( idle_state == 3 ) {
+        idle_state++;
+        // based on the requested presets, calculate the true starting
+        // lon, lat
+        fgInitPosition();
+
+        SGTime *t = fgInitTime();
+        globals->set_time_params( t );
+
+        // Do some quick general initializations
+        if( !fgInitGeneral()) {
+            SG_LOG( SG_GENERAL, SG_ALERT, 
+                "General initializations failed ..." );
+            exit(-1);
+        }
+
+        ////////////////////////////////////////////////////////////////////
+        // Initialize the property-based built-in commands
+        ////////////////////////////////////////////////////////////////////
+        fgInitCommands();
+
+
+        ////////////////////////////////////////////////////////////////////
+        // Initialize the material manager
+        ////////////////////////////////////////////////////////////////////
+        globals->set_matlib( new SGMaterialLib );
+        globals->set_model_lib(new SGModelLib);
+
+
+        ////////////////////////////////////////////////////////////////////
+        // Initialize the TG scenery subsystem.
+        ////////////////////////////////////////////////////////////////////
+        globals->set_scenery( new FGScenery );
+        globals->get_scenery()->init();
+        globals->get_scenery()->bind();
+        globals->set_tile_mgr( new FGTileMgr );
+
+
+        ////////////////////////////////////////////////////////////////////
+        // Initialize the general model subsystem.
+        ////////////////////////////////////////////////////////////////////
+        globals->set_model_mgr(new FGModelMgr);
+        globals->get_model_mgr()->init();
+        globals->get_model_mgr()->bind();
+
+
+    } else if ( idle_state == 4 ) {
+        idle_state++;
+        ////////////////////////////////////////////////////////////////////
+        // Initialize the 3D aircraft model subsystem (has a dependency on
+        // the scenery subsystem.)
+        ////////////////////////////////////////////////////////////////////
+        globals->set_aircraft_model(new FGAircraftModel);
+        globals->get_aircraft_model()->init();
+        globals->get_aircraft_model()->bind();
+
+        ////////////////////////////////////////////////////////////////////
+        // Initialize the view manager subsystem.
+        ////////////////////////////////////////////////////////////////////
+        FGViewMgr *viewmgr = new FGViewMgr;
+        globals->set_viewmgr( viewmgr );
+        viewmgr->init();
+        viewmgr->bind();
+
+
+    } else if ( idle_state == 5 ) {
+        idle_state++;
+        // Initialize the sky
+        SGPath ephem_data_path( globals->get_fg_root() );
+        ephem_data_path.append( "Astro" );
+        SGEphemeris *ephem = new SGEphemeris( ephem_data_path.c_str() );
+        ephem->update( globals->get_time_params()->getMjd(),
+                       globals->get_time_params()->getLst(),
+                       0.0 );
+        globals->set_ephem( ephem );
+
+        // TODO: move to environment mgr
+        thesky = new SGSky;
+        SGPath texture_path(globals->get_fg_root());
+        texture_path.append("Textures");
+        texture_path.append("Sky");
+        for (int i = 0; i < FGEnvironmentMgr::MAX_CLOUD_LAYERS; i++) {
+            SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
+            thesky->add_cloud_layer(layer);
+        }
+
+        SGPath sky_tex_path( globals->get_fg_root() );
+        sky_tex_path.append( "Textures" );
+        sky_tex_path.append( "Sky" );
+        thesky->texture_path( sky_tex_path.str() );
+
+        // The sun and moon diameters are scaled down numbers of the
+        // actual diameters. This was needed to fit bot the sun and the
+        // moon within the distance to the far clip plane.
+        // Moon diameter:    3,476 kilometers
+        // 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() );
+
+        // Initialize MagVar model
+        SGMagVar *magvar = new SGMagVar();
+        globals->set_mag( magvar );
+
+
+                                    // kludge to initialize mag compass
+                                    // (should only be done for in-flight
+                                    // startup)
+        // update magvar model
+        globals->get_mag()->update( fgGetDouble("/position/longitude-deg")
+                                    * SGD_DEGREES_TO_RADIANS,
+                                    fgGetDouble("/position/latitude-deg")
+                                    * SGD_DEGREES_TO_RADIANS,
+                                    fgGetDouble("/position/altitude-ft")
+                                    * SG_FEET_TO_METER,
+                                    globals->get_time_params()->getJD() );
+        double var = globals->get_mag()->get_magvar() * SGD_RADIANS_TO_DEGREES;
+        fgSetDouble("/instrumentation/heading-indicator/offset-deg", -var);
+
+        // airport = new ssgBranch;
+        // airport->setName( "Airport Lighting" );
+        // lighting->addKid( airport );
+
+        // build our custom render states
+        globals->get_renderer()->build_states();
+
+
+    } else if ( idle_state == 6 ) {
         idle_state++;
-    } else if ( idle_state == 1 ) {
         // Initialize audio support
 #ifdef ENABLE_AUDIO_SUPPORT
 
@@ -681,8 +869,6 @@ static void fgIdleFunction ( void ) {
         }
 #endif
 
-        idle_state++;
-    } else if ( idle_state == 2 ) {
         // These are a few miscellaneous things that aren't really
         // "subsystems" but still need to be initialized.
 
@@ -692,8 +878,6 @@ static void fgIdleFunction ( void ) {
         }
 #endif
 
-        idle_state++;
-    } else if ( idle_state == 3 ) {
         // 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
@@ -704,8 +888,9 @@ static void fgIdleFunction ( void ) {
             exit(-1);
         }
 
+
+    } else if ( idle_state == 7 ) {
         idle_state++;
-    } else if ( idle_state == 4 ) {
         // Initialize the time offset (warp) after fgInitSubsystem
         // (which initializes the lighting interpolation tables.)
         fgInitTimeOffset();
@@ -716,31 +901,25 @@ static void fgIdleFunction ( void ) {
         // Read the list of available aircrafts
         fgReadAircraft();
 
-        idle_state++;
-    } else if ( idle_state == 5 ) {
-
-        idle_state++;
-    } else if ( idle_state == 6 ) {
-        // sleep(1);
 
+    } else if ( idle_state == 8 ) {
         idle_state = 1000;
 
         SG_LOG( SG_GENERAL, SG_INFO, "Panel visible = " << fgPanelVisible() );
         globals->get_renderer()->resize( fgGetInt("/sim/startup/xsize"),
                                          fgGetInt("/sim/startup/ysize") );
 
+
     }
 
-    if ( idle_state == 1000 ) {
+    if ( idle_state < 1000 ) {
+        fgSplashUpdate( 1.0 );
+
+    } else {
         // We've finished all our initialization steps, from now on we
         // run the main loop.
         fgSetBool("sim/sceneryloaded",false);
-
         fgRegisterIdleHandler( fgMainLoop );
-    } else {
-        if ( fgGetBool("/sim/startup/splash-screen") ) {
-            fgSplashUpdate(0.0, 1.0);
-        }
     }
 }
 
@@ -835,6 +1014,9 @@ bool fgMainInit( int argc, char **argv ) {
     bool get_stencil_buffer = false;
 #endif
 
+    // Initialize plib net interface
+    netInit( &argc, argv );
+
     // Clouds3D requires an alpha channel
     // clouds may require stencil buffer
     fgOSOpenWindow( fgGetInt("/sim/startup/xsize"),
@@ -844,182 +1026,8 @@ bool fgMainInit( int argc, char **argv ) {
                     get_stencil_buffer,
                     fgGetBool("/sim/startup/fullscreen") );
 
-    // This seems to be the absolute earliest in the init sequence
+    // Initialize the splash screen right away
-    // that these calls will return valid info.  Too bad it's after
+    fgSplashInit(fgGetString("/sim/startup/splash-texture"));
-    // we've already created and sized out window. :-(
-    general.set_glVendor( (char *)glGetString ( GL_VENDOR ) );
-    general.set_glRenderer( (char *)glGetString ( GL_RENDERER ) );
-    general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
-    SG_LOG( SG_GENERAL, SG_INFO, general.get_glRenderer() );
-
-    GLint tmp;
-    glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
-    general.set_glMaxTexSize( tmp );
-    SG_LOG ( SG_GENERAL, SG_INFO, "Max texture size = " << tmp );
-
-    glGetIntegerv( GL_DEPTH_BITS, &tmp );
-    general.set_glDepthBits( tmp );
-    SG_LOG ( SG_GENERAL, SG_INFO, "Depth buffer bits = " << tmp );
-
-    // Initialize plib net interface
-    netInit( &argc, argv );
-
-    // Initialize ssg (from plib).  Needs to come before we do any
-    // other ssg stuff, but after opengl has been initialized.
-    ssgInit();
-
-    // Initialize the user interface (we need to do this before
-    // passing off control to the OS main loop and before
-    // fgInitGeneral to get our fonts !!!
-    guiInit();
-
-    // Read the list of available aircrafts
-    fgReadAircraft();
-
-#ifdef GL_EXT_texture_lod_bias
-    glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, -0.5 ) ;
-#endif
-
-            // get the address of our OpenGL extensions
-    if ( fgGetBool("/sim/rendering/distance-attenuation") )
-    {
-        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;
-   }
-
-    // based on the requested presets, calculate the true starting
-    // lon, lat
-    fgInitNav();
-    fgInitPosition();
-
-    SGTime *t = fgInitTime();
-    globals->set_time_params( t );
-
-    // Do some quick general initializations
-    if( !fgInitGeneral()) {
-        SG_LOG( SG_GENERAL, SG_ALERT, 
-            "General initializations failed ..." );
-        exit(-1);
-    }
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the property-based built-in commands
-    ////////////////////////////////////////////////////////////////////
-    fgInitCommands();
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the material manager
-    ////////////////////////////////////////////////////////////////////
-    globals->set_matlib( new SGMaterialLib );
-
-    globals->set_model_lib(new SGModelLib);
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the TG scenery subsystem.
-    ////////////////////////////////////////////////////////////////////
-    globals->set_scenery( new FGScenery );
-    globals->get_scenery()->init();
-    globals->get_scenery()->bind();
-    globals->set_tile_mgr( new FGTileMgr );
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the general model subsystem.
-    ////////////////////////////////////////////////////////////////////
-    globals->set_model_mgr(new FGModelMgr);
-    globals->get_model_mgr()->init();
-    globals->get_model_mgr()->bind();
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the 3D aircraft model subsystem (has a dependency on
-    // the scenery subsystem.)
-    ////////////////////////////////////////////////////////////////////
-    globals->set_aircraft_model(new FGAircraftModel);
-    globals->get_aircraft_model()->init();
-    globals->get_aircraft_model()->bind();
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the view manager subsystem.
-    ////////////////////////////////////////////////////////////////////
-    FGViewMgr *viewmgr = new FGViewMgr;
-    globals->set_viewmgr( viewmgr );
-    viewmgr->init();
-    viewmgr->bind();
-
-
-    // Initialize the sky
-    SGPath ephem_data_path( globals->get_fg_root() );
-    ephem_data_path.append( "Astro" );
-    SGEphemeris *ephem = new SGEphemeris( ephem_data_path.c_str() );
-    ephem->update( globals->get_time_params()->getMjd(),
-                   globals->get_time_params()->getLst(),
-                   0.0 );
-    globals->set_ephem( ephem );
-
-    // TODO: move to environment mgr
-    thesky = new SGSky;
-    SGPath texture_path(globals->get_fg_root());
-    texture_path.append("Textures");
-    texture_path.append("Sky");
-    for (int i = 0; i < FGEnvironmentMgr::MAX_CLOUD_LAYERS; i++) {
-        SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
-        thesky->add_cloud_layer(layer);
-    }
-
-    SGPath sky_tex_path( globals->get_fg_root() );
-    sky_tex_path.append( "Textures" );
-    sky_tex_path.append( "Sky" );
-    thesky->texture_path( sky_tex_path.str() );
-
-    // The sun and moon diameters are scaled down numbers of the
-    // actual diameters. This was needed to fit bot the sun and the
-    // moon within the distance to the far clip plane.
-    // Moon diameter:    3,476 kilometers
-    // 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() );
-
-    // Initialize MagVar model
-    SGMagVar *magvar = new SGMagVar();
-    globals->set_mag( magvar );
-
-
-                                // kludge to initialize mag compass
-                                // (should only be done for in-flight
-                                // startup)
-    // update magvar model
-    globals->get_mag()->update( fgGetDouble("/position/longitude-deg")
-                                * SGD_DEGREES_TO_RADIANS,
-                                fgGetDouble("/position/latitude-deg")
-                                * SGD_DEGREES_TO_RADIANS,
-                                fgGetDouble("/position/altitude-ft")
-                                * SG_FEET_TO_METER,
-                                globals->get_time_params()->getJD() );
-    double var = globals->get_mag()->get_magvar() * SGD_RADIANS_TO_DEGREES;
-    fgSetDouble("/instrumentation/heading-indicator/offset-deg", -var);
-
-    // airport = new ssgBranch;
-    // airport->setName( "Airport Lighting" );
-    // lighting->addKid( airport );
-
-    // build our custom render states
-    globals->get_renderer()->build_states();
 
     // pass control off to the master event handler
     fgOSMainLoop();
@@ -1030,4 +1038,3 @@ bool fgMainInit( int argc, char **argv ) {
 }
 
 
-// end of main.cxx

src/Main/renderer.cxx

@@ -233,6 +233,18 @@ FGRenderer::init( void ) {
 void
 FGRenderer::update( bool refresh_camera_settings ) {
     bool scenery_loaded = fgGetBool("sim/sceneryloaded") || fgGetBool("sim/sceneryloaded-override");
+
+    if ( idle_state < 1000 || !scenery_loaded ) {
+        // still initializing, draw the splash screen
+        fgSplashUpdate(1.0);
+
+        // Keep resetting sim time while the sim is initializing
+        globals->set_sim_time_sec( 0.0 );
+        SGAnimation::set_sim_time_sec( 0.0 );
+        return;
+    }
+
+
     bool draw_otw = fgGetBool("/sim/rendering/draw-otw");
     bool skyblend = fgGetBool("/sim/rendering/skyblend");
     bool enhanced_lighting = fgGetBool("/sim/rendering/enhanced-lighting");
@@ -290,15 +302,6 @@ FGRenderer::update( bool refresh_camera_settings ) {
     // GLfloat mat_shininess[] = { 10.0 };
     GLbitfield clear_mask;
 
-    if ( idle_state != 1000 || !scenery_loaded ) {
-        // still initializing, draw the splash screen
-        if ( fgGetBool("/sim/startup/splash-screen") ) {
-            fgSplashUpdate(0.0, 1.0);
-        }
-        // Keep resetting sim time while the sim is initializing
-        globals->set_sim_time_sec( 0.0 );
-        SGAnimation::set_sim_time_sec( 0.0 );
-    } else {
     // idle_state is now 1000 meaning we've finished all our
     // initializations and are running the main loop, so this will
     // now work without seg faulting the system.
@@ -496,7 +499,7 @@ FGRenderer::update( bool refresh_camera_settings ) {
         current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER
         - globals->get_scenery()->get_cur_elev();
 
-        if ( agl > 10.0 ) {
+    if ( agl > 50.0 ) {
         scene_nearplane = 10.0f;
         scene_farplane = 120000.0f;
     } else {
@@ -759,12 +762,8 @@ FGRenderer::update( bool refresh_camera_settings ) {
 
     // Fade out the splash screen over the first three seconds.
     double t = globals->get_sim_time_sec();
-        if ( t <= 1.0 ) {
+    if (t <= 2.5)
-            fgSplashUpdate(0.0, 1.0);
+        fgSplashUpdate((2.5 - t) / 2.5);
-        } else if ( t <= 3.0) {
-            fgSplashUpdate(0.0, (3.0 - t) / 2.0);
-        }
-    }
 }
 
 

src/Main/splash.cxx

@@ -57,6 +57,9 @@ static SGTexture splash;
 
 // Initialize the splash screen
 void fgSplashInit ( const char *splash_texture ) {
+    if (!fgGetBool("/sim/startup/splash-screen"))
+        return;
+
     SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" );
 
     splash.bind();
@@ -94,8 +97,8 @@ void fgSplashInit ( const char *splash_texture ) {
 }
 
 
-// Update the splash screen with progress specified from 0.0 to 1.0
+// Update the splash screen with alpha specified from 0.0 to 1.0
-void fgSplashUpdate ( double progress, float alpha ) {
+void fgSplashUpdate ( float alpha ) {
     int xmin, ymin, xmax, ymax;
     int xsize = 512;
     int ysize = 512;
@@ -133,6 +136,7 @@ void fgSplashUpdate ( double progress, float alpha ) {
     glEnd();
 
     // now draw the logo
+    if (fgGetBool("/sim/startup/splash-screen") && splash.usable()) {
         glEnable(GL_TEXTURE_2D);
         splash.bind();
         glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -144,6 +148,7 @@ void fgSplashUpdate ( double progress, float alpha ) {
         glTexCoord2f(1.0, 1.0); glVertex2f(xmax, ymax);
         glTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax); 
         glEnd();
+    }
 
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);

src/Main/splash.hxx

@@ -34,8 +34,8 @@
 // Initialize the splash screen
 void fgSplashInit ( const char *splash_texture );
 
-// Update the splash screen with progress specified from 0.0 to 1.0
+// Update the splash screen with alpha specified from 0.0 to 1.0
-void fgSplashUpdate ( double progress, float alpha );
+void fgSplashUpdate ( float alpha );
 
 
 #endif // _SPLASH_HXX