#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>
#include "options.hxx"
#if defined(HAVE_QT)
-#include <QApplication>
#include <GUI/QtLauncher.hxx>
#endif
// 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
if (done) {
++idle_state;
fgSplashProgress("init-scenery");
- } else {
- fgSplashProgress("loading-nav-dat");
}
-
} else if ( idle_state == 4 ) {
idle_state++;
// 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)) {
// Main top level initialization
int fgMainInit( int argc, char **argv )
{
-#if defined(HAVE_QT)
- QApplication app(argc, argv);
- app.setOrganizationName("FlightGear");
- app.setApplicationName("FlightGear");
- app.setOrganizationDomain("flightgear.org");
-#endif
-
// set default log levels
sglog().setLogLevels( SG_ALL, SG_ALERT );
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);
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");
showLauncher |= (::getenv("FG_LAUNCHER") != 0);
if (showLauncher) {
- if (!QtLauncher::runLauncherDialog()) {
+ flightgear::initApp(argc, argv);
+ if (!flightgear::runLauncherDialog()) {
return EXIT_SUCCESS;
}
}
// 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;
}