Interim windows build fix

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 42dcf6ba4b3a22b0fd2cad1372df8b8b6719d2e7..996c05fa9205da94d999dce4a4ba20912af96aa8 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -54,6 +54,7 @@ extern bool global_crashRptEnabled;
 #include <simgear/math/SGMath.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/strutils.hxx>
+#include <simgear/scene/tgdb/GroundLightManager.hxx>
 
 #include <Model/panelnode.hxx>
 #include <Scenery/scenery.hxx>
@@ -80,6 +81,9 @@ extern bool global_crashRptEnabled;
 #include "subsystemFactory.hxx"
 #include "options.hxx"
 
+#if defined(HAVE_QT)
+#include <GUI/QtLauncher.hxx>
+#endif
 
 using namespace flightgear;
 
@@ -123,7 +127,7 @@ static void initTerrasync()
     
     // start TerraSync up now, so it can be synchronizing shared models
     // and airports data in parallel with a nav-cache rebuild.
-    SGPath tsyncCache(globals->get_fg_home());
+    SGPath tsyncCache(terraSyncDir);
     tsyncCache.append("terrasync-cache.xml");
     
     // wipe the cache file if requested
@@ -217,10 +221,7 @@ static void fgIdleFunction ( void ) {
         if (done) {
           ++idle_state;
           fgSplashProgress("init-scenery");
-        } else {
-          fgSplashProgress("loading-nav-dat");
         }
-      
     } else if ( idle_state == 4 ) {
         idle_state++;
 
@@ -259,10 +260,10 @@ static void fgIdleFunction ( void ) {
         // Initialize the TG scenery subsystem.
         ////////////////////////////////////////////////////////////////////
         
-        globals->set_scenery( new FGScenery );
+        globals->add_new_subsystem<FGScenery>(SGSubsystemMgr::DISPLAY);
         globals->get_scenery()->init();
         globals->get_scenery()->bind();
-        globals->set_tile_mgr( new FGTileMgr );
+        globals->add_new_subsystem<FGTileMgr>(SGSubsystemMgr::DISPLAY);
         
         fgSplashProgress("creating-subsystems");
     } else if (( idle_state == 7 ) || (idle_state == 2007)) {
@@ -394,8 +395,8 @@ static void logToFile()
 }
 
 // Main top level initialization
-int fgMainInit( int argc, char **argv ) {
-
+int fgMainInit( int argc, char **argv )
+{
     // set default log levels
     sglog().setLogLevels( SG_ALL, SG_ALERT );
 
@@ -409,30 +410,20 @@ int fgMainInit( int argc, char **argv ) {
         logToFile();
     }
     
-    std::string version;
-#ifdef FLIGHTGEAR_VERSION
-    version = FLIGHTGEAR_VERSION;
-#else
-    version = "unknown version";
-#endif
+    std::string version(FLIGHTGEAR_VERSION);
     SG_LOG( SG_GENERAL, SG_INFO, "FlightGear:  Version "
             << version );
     SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR);
        SG_LOG( SG_GENERAL, SG_INFO, "Jenkins number/ID " << HUDSON_BUILD_NUMBER << ":"
                        << HUDSON_BUILD_ID);
 
-    // Allocate global data structures.  This needs to happen before
-    // we parse command line options
-
-    
-    
     // seed the random number generator
     sg_srandom_time();
 
     string_list *col = new string_list;
     globals->set_channel_options_list( col );
 
-    fgValidatePath("", false);  // initialize static variables
+    fgValidatePath(globals->get_fg_home(), false);  // initialize static variables
     upper_case_property("/sim/presets/airport-id");
     upper_case_property("/sim/presets/runway");
     upper_case_property("/sim/tower/airport-id");
@@ -447,7 +438,24 @@ int fgMainInit( int argc, char **argv ) {
     } else if (configResult == flightgear::FG_OPTIONS_EXIT) {
         return EXIT_SUCCESS;
     }
-    
+
+  // launcher needs to know the aircraft paths in use
+    fgInitAircraftPaths(false);
+
+#if defined(HAVE_QT)
+    bool showLauncher = flightgear::Options::checkForArg(argc, argv, "launcher");
+    // an Info.plist bundle can't define command line arguments, but it can set
+    // environment variables. This avoids needed a wrapper shell-script on OS-X.
+    showLauncher |= (::getenv("FG_LAUNCHER") != 0);
+
+    if (showLauncher) {
+        flightgear::initApp(argc, argv);
+        if (!flightgear::runLauncherDialog()) {
+            return EXIT_SUCCESS;
+        }
+    }
+#endif
+
     configResult = fgInitAircraft(false);
     if (configResult == flightgear::FG_OPTIONS_ERROR) {
         return EXIT_FAILURE;
@@ -504,6 +512,9 @@ int fgMainInit( int argc, char **argv ) {
     // delete the NavCache here. This will cause the destruction of many cached
     // objects (eg, airports, navaids, runways).
     delete flightgear::NavDataCache::instance();
+    simgear::GroundLightManager::instance()->getRunwayLightStateSet()->clear();
+    simgear::GroundLightManager::instance()->getTaxiLightStateSet()->clear();
+    simgear::GroundLightManager::instance()->getGroundLightStateSet()->clear();
   
     return result;
 }