#include <osg/GraphicsContext>
#include <osgDB/Registry>
+#if defined(HAVE_CRASHRPT)
+ #include <CrashRpt.h>
+#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>
#include "fg_os.hxx"
#include "fg_props.hxx"
#include "positioninit.hxx"
+#include "screensaver_control.hxx"
#include "subsystemFactory.hxx"
#include "options.hxx"
+
using namespace flightgear;
using std::cerr;
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;
}
terra_sync->bind();
terra_sync->init();
-
- // 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);
}
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())
{
}
} else if ( idle_state == 2 ) {
-
initTerrasync();
idle_state++;
fgSplashProgress("loading-nav-dat");
}
} 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()) {
// 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");
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;
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
logPath.append("fgfs.log");
}
sglog().logToFile(logPath, SG_ALL, SG_INFO);
+
+#if defined(HAVE_CRASHRPT)
+ crAddFile2(logPath.c_str(), NULL, "FlightGear Log File", CR_AF_MAKE_FILE_COPY);
+#endif
}
// Main top level initialization
// 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;
+ }
+
+ 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) {
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;
projects / flightgear.git / blobdiff