#include <osgViewer/Viewer>
+#include <simgear/canvas/Canvas.hxx>
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/scene/model/modellib.hxx>
#include <simgear/scene/material/matlib.hxx>
+#include <simgear/scene/material/Effect.hxx>
#include <simgear/scene/model/particles.hxx>
#include <simgear/scene/tsync/terrasync.hxx>
#include <Canvas/canvas_mgr.hxx>
#include <Canvas/gui_mgr.hxx>
+#include <Canvas/FGCanvasSystemAdapter.hxx>
#include <GUI/new_gui.hxx>
#include <GUI/MessageBox.hxx>
#include <Input/input.hxx>
#else
// POSIX, do open+unlink trick to the file is deleted on exit, even if we
// crash or exit(-1)
- size_t len = snprintf(buf, 16, "%d", getpid());
+ ssize_t len = snprintf(buf, 16, "%d", getpid());
int fd = ::open(pidPath.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0644);
if (fd >= 0) {
- ::write(fd, buf, len);
- ::unlink(pidPath.c_str()); // delete file when app quits
- result = true;
+ result = ::write(fd, buf, len) == len;
+ if( ::unlink(pidPath.c_str()) != 0 ) // delete file when app quits
+ result = false;
}
-
- fgSetBool("/sim/fghome-readonly", false);
#endif
+
+ fgSetBool("/sim/fghome-readonly", false);
+
if (!result) {
flightgear::fatalMessageBox("File permissions problem",
"Can't write to user-data storage folder, check file permissions and FG_HOME.",
simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
if (!exportDir.exists()) {
- exportDir.create(0777);
+ exportDir.create(0755);
}
// Set /sim/fg-home and don't allow malign code to override it until
options->init(argc, argv, dataPath);
}
- bool loadDefaults = flightgear::Options::sharedInstance()->shouldLoadDefaultConfig();
+ bool loadDefaults = options->shouldLoadDefaultConfig();
if (loadDefaults) {
// Read global preferences from $FG_ROOT/preferences.xml
SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
} else {
SG_LOG(SG_GENERAL, SG_INFO, "not reading default configuration files");
}// of no-default-config selected
-
- // Scan user config files and command line for a specified aircraft.
- options->initAircraft();
+
+ return flightgear::FG_OPTIONS_OK;
+}
+int fgInitAircraft(bool reinit)
+{
+ // Scan user config files and command line for a specified aircraft.
+ if (!reinit) {
+ flightgear::Options::sharedInstance()->initAircraft();
+ }
+
FindAndCacheAircraft f(globals->get_props());
if (!f.loadAircraft()) {
- return flightgear::FG_OPTIONS_ERROR;
+ return flightgear::FG_OPTIONS_ERROR;
}
-
- // parse options after loading aircraft to ensure any user
- // overrides of defaults are honored.
- return options->processOptions();
+
+ return flightgear::FG_OPTIONS_OK;
}
-
-
/**
* Initialize vor/ndb/ils/fix list management and query systems (as
* well as simple airport db list)
////////////////////////////////////////////////////////////////////
// Initialize the canvas 2d drawing subsystem.
////////////////////////////////////////////////////////////////////
+ simgear::canvas::Canvas::setSystemAdapter(
+ simgear::canvas::SystemAdapterPtr(new canvas::FGCanvasSystemAdapter)
+ );
globals->add_subsystem("Canvas", new CanvasMgr, SGSubsystemMgr::DISPLAY);
globals->add_subsystem("CanvasGUI", new GUIMgr, SGSubsystemMgr::DISPLAY);
void fgStartNewReset()
{
- globals->saveInitialState();
+ SGPropertyNode_ptr preserved(new SGPropertyNode);
+
+ if (!copyPropertiesWithAttribute(globals->get_props(), preserved, SGPropertyNode::PRESERVE))
+ SG_LOG(SG_GENERAL, SG_ALERT, "Error saving preserved state");
fgSetBool("/sim/signals/reinit", true);
fgSetBool("/sim/freeze/master", true);
SGSubsystemMgr* subsystemManger = globals->get_subsystem_mgr();
+ // Nasal is manually inited in fgPostInit, ensure it's already shutdown
+ // before other subsystems, so Nasal listeners don't fire during shutdonw
+ SGSubsystem* nasal = subsystemManger->get_subsystem("nasal");
+ nasal->shutdown();
+ nasal->unbind();
+ subsystemManger->remove("nasal");
+
subsystemManger->shutdown();
subsystemManger->unbind();
- // remove them all (with some exceptions?)
+ // remove most subsystems, with a few exceptions.
for (int g=0; g<SGSubsystemMgr::MAX_GROUPS; ++g) {
SGSubsystemGroup* grp = subsystemManger->get_group(static_cast<SGSubsystemMgr::GroupType>(g));
const string_list& names(grp->member_names());
// don't cancel the pager until after shutdown, since AIModels (and
// potentially others) can queue delete requests on the pager.
render->getViewer()->getDatabasePager()->cancel();
+ render->getViewer()->getDatabasePager()->clear();
+
+ osgDB::Registry::instance()->clearObjectCache();
// preserve the event handler; re-creating it would entail fixing the
// idle handler
globals->set_renderer(NULL);
globals->set_matlib(NULL);
+ globals->set_chatter_queue(NULL);
+
+ simgear::clearEffectCache();
simgear::SGModelLib::resetPropertyRoot();
+
+ simgear::GlobalParticleCallback::setSwitch(NULL);
globals->resetPropertyRoot();
- globals->restoreInitialState();
+ fgInitConfig(0, NULL, true);
+ fgInitGeneral(); // all of this?
+
+ if ( copyProperties(preserved, globals->get_props()) ) {
+ SG_LOG( SG_GENERAL, SG_INFO, "Preserved state restored successfully" );
+ } else {
+ SG_LOG( SG_GENERAL, SG_INFO,
+ "Some errors restoring preserved state (read-only props?)" );
+ }
+
+ fgGetNode("/sim")->removeChild("aircraft-dir");
+ fgInitAircraft(true);
+ flightgear::Options::sharedInstance()->processOptions();
render = new FGRenderer;
render->setEventHandler(eventHandler);
globals->set_renderer(render);
render->init();
render->setViewer(viewer.get());
+
viewer->getDatabasePager()->setUpThreads(1, 1);
- render->splashinit();
+ // must do this before splashinit for Rembrandt
flightgear::CameraGroup::buildDefaultGroup(viewer.get());
-
- fgOSResetProperties();
- fgInitConfig(0, NULL, true);
+ render->splashinit();
+ fgOSResetProperties();
+
// init some things manually
// which do not follow the regular init pattern
projects / flightgear.git / blobdiff