X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fmain.cxx;h=d6ab4c5635d2e93f0f976c4285c64042a5a28a0b;hb=9002696195c50219d7df06e098b57c79a289a0e0;hp=84f03a6fd3458f1c39fc643230b1ff1c3b1cdc8c;hpb=0cda3cbfb2754aa77aa2699720fd0c57cfb9b9d4;p=flightgear.git

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 84f03a6fd..d6ab4c563 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -33,10 +33,19 @@
 #include <osg/GraphicsContext>
 #include <osgDB/Registry>
 
+#if defined(HAVE_CRASHRPT)
+	#include <CrashRpt.h>
+
+// defined in bootstrap.cxx
+extern bool global_crashRptEnabled;
+
+#endif
+
 // Class references
 #include <simgear/canvas/VGInitOperation.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/scene/material/matlib.hxx>
+#include <simgear/scene/material/Effect.hxx>
 #include <simgear/props/AtomicChangeListener.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
@@ -44,6 +53,8 @@
 #include <simgear/scene/tsync/terrasync.hxx>
 #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>
@@ -51,10 +62,12 @@
 #include <Sound/soundmanager.hxx>
 #include <Time/TimeManager.hxx>
 #include <GUI/gui.h>
+#include <GUI/MessageBox.hxx>
 #include <Viewer/splash.hxx>
 #include <Viewer/renderer.hxx>
 #include <Viewer/WindowSystemAdapter.hxx>
 #include <Navaids/NavDataCache.hxx>
+#include <Include/version.h>
 
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
@@ -64,9 +77,14 @@
 #include "fg_os.hxx"
 #include "fg_props.hxx"
 #include "positioninit.hxx"
+#include "screensaver_control.hxx"
 #include "subsystemFactory.hxx"
 #include "options.hxx"
 
+#if defined(HAVE_QT)
+#include <GUI/QtLauncher.hxx>
+#endif
+
 using namespace flightgear;
 
 using std::cerr;
@@ -98,6 +116,11 @@ static void fgMainLoop( void )
 
 static void initTerrasync()
 {
+    // add the terrasync root as a data path so data can be retrieved from it
+    // (even if we are in read-only mode)
+    std::string terraSyncDir(fgGetString("/sim/terrasync/scenery-dir"));
+    globals->append_data_path(terraSyncDir);
+    
     if (fgGetBool("/sim/fghome-readonly", false)) {
         return;
     }
@@ -124,10 +147,37 @@ static void initTerrasync()
     
     terra_sync->bind();
     terra_sync->init();
+}
+
+static void checkOpenGLVersion()
+{
+#if defined(SG_MAC)
+    // Mac users can't upgrade their drivers, so complaining about
+    // versions doesn't help them much
+    return;
+#endif
     
-    // add the terrasync root as a data path so data can be retrieved from it
-    std::string terraSyncDir(fgGetString("/sim/terrasync/scenery-dir"));
-    globals->append_data_path(terraSyncDir);
+    // format of these strings is not standardised, so be careful about
+    // parsing them.
+    std::string versionString(fgGetString("/sim/rendering/gl-version"));
+    string_list parts = simgear::strutils::split(versionString);
+    if (parts.size() == 3) {
+        if (parts[1].find("NVIDIA") != std::string::npos) {
+            // driver version number, dot-seperared
+            string_list driverVersion = simgear::strutils::split(parts[2], ".");
+            if (!driverVersion.empty()) {
+                int majorDriverVersion = simgear::strutils::to_int(driverVersion[0]);
+                if (majorDriverVersion < 300) {
+                    std::ostringstream ss;
+                    ss << "Please upgrade to at least version 300 of the nVidia drivers (installed version is " << parts[2] << ")";
+
+                    flightgear::modalMessageBox("Outdated graphics drivers",
+                                                "FlightGear has detected outdated drivers for your graphics card.",
+                                                ss.str());
+                }
+            }
+        } // of NVIDIA-style version string
+    } // of three parts
 }
 
 static void registerMainLoop()
@@ -145,21 +195,22 @@ static void registerMainLoop()
 // per pass) and once everything has been initialized fgMainLoop from
 // then on.
 
+static int idle_state = 0;
+
 static void fgIdleFunction ( void ) {
     // Specify our current idle function state.  This is used to run all
     // our initializations out of the idle callback so that we can get a
     // splash screen up and running right away.
-    static int idle_state = 0;
-  
+    
     if ( idle_state == 0 ) {
         if (guiInit())
         {
+            checkOpenGLVersion();
             idle_state+=2;
             fgSplashProgress("loading-aircraft-list");
         }
 
     } else if ( idle_state == 2 ) {
-
         initTerrasync();
         idle_state++;
         fgSplashProgress("loading-nav-dat");
@@ -175,15 +226,10 @@ static void fgIdleFunction ( void ) {
         }
       
     } else if ( idle_state == 4 ) {
-        idle_state+=2;
-        // based on the requested presets, calculate the true starting
-        // lon, lat
-        flightgear::initPosition();
-        flightgear::initTowerLocationListener();
+        idle_state++;
 
         TimeManager* t = new TimeManager;
         globals->add_subsystem("time", t, SGSubsystemMgr::INIT);
-        t->init(); // need to init now, not during initSubsystems
         
         // Do some quick general initializations
         if( !fgInitGeneral()) {
@@ -201,29 +247,34 @@ static void fgIdleFunction ( void ) {
         // Initialize the material manager
         ////////////////////////////////////////////////////////////////////
         globals->set_matlib( new SGMaterialLib );
-        simgear::SGModelLib::init(globals->get_fg_root(), globals->get_props());
         simgear::SGModelLib::setPanelFunc(FGPanelNode::load);
-
+ 
+    } else if (( idle_state == 5 ) || (idle_state == 2005)) {
+        idle_state+=2;
+        flightgear::initPosition();
+        flightgear::initTowerLocationListener();
+        
+        simgear::SGModelLib::init(globals->get_fg_root(), globals->get_props());
+        
+        TimeManager* timeManager = (TimeManager*) globals->get_subsystem("time");
+        timeManager->init();
+        
         ////////////////////////////////////////////////////////////////////
         // Initialize the TG scenery subsystem.
         ////////////////////////////////////////////////////////////////////
-
+        
         globals->set_scenery( new FGScenery );
         globals->get_scenery()->init();
         globals->get_scenery()->bind();
         globals->set_tile_mgr( new FGTileMgr );
-
-        fgSplashProgress("loading-aircraft");
-
-    } else if ( idle_state == 6 ) {
-        idle_state++;
+        
         fgSplashProgress("creating-subsystems");
-
-    } else if ( idle_state == 7 ) {
-        idle_state++;
+    } else if (( idle_state == 7 ) || (idle_state == 2007)) {
+        bool isReset = (idle_state == 2007);
+        idle_state = 8; // from the next state on, reset & startup are identical
         SGTimeStamp st;
         st.stamp();
-        fgCreateSubsystems();
+        fgCreateSubsystems(isReset);
         SG_LOG(SG_GENERAL, SG_INFO, "Creating subsystems took:" << st.elapsedMSec());
         fgSplashProgress("binding-subsystems");
       
@@ -271,8 +322,20 @@ static void fgIdleFunction ( void ) {
         fgSetBool("sim/sceneryloaded", false);
         registerMainLoop();
     }
+    
+    if ( idle_state == 2000 ) {
+        fgStartNewReset();
+        idle_state = 2005;
+    }
 }
 
+void fgResetIdleState()
+{
+    idle_state = 2000;
+    fgRegisterIdleHandler( &fgIdleFunction );
+}
+
+
 static void upper_case_property(const char *name)
 {
     using namespace simgear;
@@ -287,7 +350,9 @@ static void upper_case_property(const char *name)
         else
             assert(t == props::STRING);
     }
-    p->addChangeListener(new FGMakeUpperCase);
+    SGPropertyChangeListener* muc = new FGMakeUpperCase;
+    globals->addListenerToCleanup(muc);
+    p->addChangeListener(muc);
 }
 
 // see http://code.google.com/p/flightgear-bugs/issues/detail?id=385
@@ -321,11 +386,20 @@ static void logToFile()
         logPath.append("fgfs.log");
     }
     sglog().logToFile(logPath, SG_ALL, SG_INFO);
+
+#if defined(HAVE_CRASHRPT)
+	if (global_crashRptEnabled) {
+		crAddFile2(logPath.c_str(), NULL, "FlightGear Log File", CR_AF_MAKE_FILE_COPY);
+		SG_LOG( SG_GENERAL, SG_INFO, "CrashRpt enabled");
+	} else {
+		SG_LOG(SG_GENERAL, SG_WARN, "CrashRpt enabled at compile time but failed to install");
+	}
+#endif
 }
 
 // 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 );
 
@@ -347,13 +421,10 @@ int fgMainInit( int argc, char **argv ) {
 #endif
     SG_LOG( SG_GENERAL, SG_INFO, "FlightGear:  Version "
             << version );
-    SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR << std::endl );
-
-    // Allocate global data structures.  This needs to happen before
-    // we parse command line options
+    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);
 
-    
-    
     // seed the random number generator
     sg_srandom_time();
 
@@ -369,7 +440,38 @@ int fgMainInit( int argc, char **argv ) {
     // Load the configuration parameters.  (Command line options
     // override config file options.  Config file options override
     // defaults.)
-    int configResult = fgInitConfig(argc, argv);
+    int configResult = fgInitConfig(argc, argv, false);
+    if (configResult == flightgear::FG_OPTIONS_ERROR) {
+        return EXIT_FAILURE;
+    } 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) {
+        QtLauncher::initApp(argc, argv);
+        if (!QtLauncher::runLauncherDialog()) {
+            return EXIT_SUCCESS;
+        }
+    }
+#endif
+
+    configResult = fgInitAircraft(false);
+    if (configResult == flightgear::FG_OPTIONS_ERROR) {
+        return EXIT_FAILURE;
+    } else if (configResult == flightgear::FG_OPTIONS_EXIT) {
+        return EXIT_SUCCESS;
+    }
+    
+    configResult = flightgear::Options::sharedInstance()->processOptions();
     if (configResult == flightgear::FG_OPTIONS_ERROR) {
         return EXIT_FAILURE;
     } else if (configResult == flightgear::FG_OPTIONS_EXIT) {
@@ -387,7 +489,8 @@ int fgMainInit( int argc, char **argv ) {
 
     // Clouds3D requires an alpha channel
     fgOSOpenWindow(true /* request stencil buffer */);
-
+    fgOSResetProperties();
+    
     // Initialize the splash screen right away
     fntInit();
     fgSplashInit();
@@ -399,11 +502,16 @@ int fgMainInit( int argc, char **argv ) {
     
     fgOutputSettings();
     
+    //try to disable the screensaver
+    fgOSDisableScreensaver();
+    
     // pass control off to the master event handler
     int result = fgOSMainLoop();
     frame_signal.clear();
     fgOSCloseWindow();
     
+    simgear::clearEffectCache();
+    
     // clean up here; ensure we null globals to avoid
     // confusing the atexit() handler
     delete globals;
@@ -412,6 +520,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;
 }