#endif
#include <string>
+
#include <boost/algorithm/string/compare.hpp>
#include <boost/algorithm/string/predicate.hpp>
+#include <osgViewer/Viewer>
+
+#include <simgear/canvas/Canvas.hxx>
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/misc/strutils.hxx>
#include <simgear/props/props_io.hxx>
+#include <simgear/scene/tsync/terrasync.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>
#include <Sound/soundmanager.hxx>
#include <Systems/system_mgr.hxx>
#include <Time/light.hxx>
+#include <Time/TimeManager.hxx>
+
#include <Traffic/TrafficMgr.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
#include <FDM/fdm_shell.hxx>
#include <Environment/environment_mgr.hxx>
#include <Viewer/renderer.hxx>
#include <Viewer/viewmgr.hxx>
+#include <Viewer/FGEventHandler.hxx>
#include <Navaids/NavDataCache.hxx>
#include <Instrumentation/HUD/HUD.hxx>
#include <Cockpit/cockpitDisplayManager.hxx>
#include <Network/HTTPClient.hxx>
#include <Network/fgcom.hxx>
+#include <Viewer/CameraGroup.hxx>
+
#include "fg_init.hxx"
#include "fg_io.hxx"
#include "fg_commands.hxx"
#include <GUI/CocoaHelpers.h> // for Mac impl of platformDefaultDataPath()
#endif
+//#define NEW_RESET 1
+
using std::string;
using std::endl;
using std::cerr;
using std::cout;
using namespace boost::algorithm;
+extern osg::ref_ptr<osgViewer::Viewer> viewer;
// Return the current base package version
string fgBasePackageVersion() {
#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.",
}
// Read in configuration (file and command line)
-int fgInitConfig ( int argc, char **argv )
+int fgInitConfig ( int argc, char **argv, bool reinit )
{
SGPath dataPath = globals->get_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
fgSetDefaults();
flightgear::Options* options = flightgear::Options::sharedInstance();
- options->init(argc, argv, dataPath);
- bool loadDefaults = flightgear::Options::sharedInstance()->shouldLoadDefaultConfig();
+ if (!reinit) {
+ options->init(argc, argv, dataPath);
+ }
+
+ 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)
// initialization routines. If you are adding a subsystem to flight
// gear, its initialization call should located in this routine.
// Returns non-zero if a problem encountered.
-void fgCreateSubsystems() {
+void fgCreateSubsystems(bool duringReset) {
SG_LOG( SG_GENERAL, SG_INFO, "Creating Subsystems");
SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
mpath.append( fgGetString("/sim/rendering/materials-file") );
if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(),
globals->get_props()) ) {
- throw sg_io_exception("Error loading materials file", mpath);
+ throw sg_io_exception("Error loading materials file", mpath);
}
-
+
globals->add_subsystem( "http", new FGHTTPClient );
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
// 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);
// Initialize the lighting subsystem.
////////////////////////////////////////////////////////////////////
- globals->add_subsystem("lighting", new FGLight, SGSubsystemMgr::DISPLAY);
-
// ordering here is important : Nasal (via events), then models, then views
- globals->add_subsystem("events", globals->get_event_mgr(), SGSubsystemMgr::DISPLAY);
+ if (!duringReset) {
+ globals->add_subsystem("lighting", new FGLight, SGSubsystemMgr::DISPLAY);
+ globals->add_subsystem("events", globals->get_event_mgr(), SGSubsystemMgr::DISPLAY);
+ }
globals->add_subsystem("aircraft-model", new FGAircraftModel, SGSubsystemMgr::DISPLAY);
globals->add_subsystem("model-manager", new FGModelMgr, SGSubsystemMgr::DISPLAY);
// Reset: this is what the 'reset' command (and hence, GUI) is attached to
void fgReInitSubsystems()
{
+#ifdef NEW_RESET
+ fgResetIdleState();
+ return;
+#endif
+
SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master");
SG_LOG( SG_GENERAL, SG_INFO, "fgReInitSubsystems()");
fgSetBool("/sim/sceneryloaded",false);
}
+void fgStartNewReset()
+{
+ 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 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());
+ string_list::const_iterator it;
+ for (it = names.begin(); it != names.end(); ++it) {
+ if ((*it == "time") || (*it == "terrasync") || (*it == "events")
+ || (*it == "lighting"))
+ {
+ continue;
+ }
+
+ try {
+ subsystemManger->remove(it->c_str());
+ } catch (std::exception& e) {
+ SG_LOG(SG_GENERAL, SG_INFO, "caught std::exception shutting down:" << *it);
+ } catch (...) {
+ SG_LOG(SG_GENERAL, SG_INFO, "caught generic exception shutting down:" << *it);
+ }
+
+ // don't delete here, dropping the ref should be sufficient
+ }
+ } // of top-level groups iteration
+
+ // order is important here since tile-manager shutdown needs to
+ // access the scenery object
+ globals->set_tile_mgr(NULL);
+ globals->set_scenery(NULL);
+ flightgear::CameraGroup::setDefault(NULL);
+
+ FGRenderer* render = globals->get_renderer();
+ // 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
+ osg::ref_ptr<flightgear::FGEventHandler> eventHandler = render->getEventHandler();
+
+ globals->set_renderer(NULL);
+ globals->set_matlib(NULL);
+ globals->set_chatter_queue(NULL);
+
+ simgear::clearEffectCache();
+ simgear::SGModelLib::resetPropertyRoot();
+
+ simgear::GlobalParticleCallback::setSwitch(NULL);
+
+ globals->resetPropertyRoot();
+ 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);
+
+ // must do this before splashinit for Rembrandt
+ flightgear::CameraGroup::buildDefaultGroup(viewer.get());
+ render->splashinit();
+
+ fgOSResetProperties();
+
+// init some things manually
+// which do not follow the regular init pattern
+
+ globals->get_event_mgr()->init();
+ globals->get_event_mgr()->setRealtimeProperty(fgGetNode("/sim/time/delta-realtime-sec", true));
+
+ globals->set_matlib( new SGMaterialLib );
+
+// terra-sync needs the property tree root, pass it back in
+ simgear::SGTerraSync* terra_sync = static_cast<simgear::SGTerraSync*>(subsystemManger->get_subsystem("terrasync"));
+ terra_sync->setRoot(globals->get_props());
+
+ fgSetBool("/sim/signals/reinit", false);
+ fgSetBool("/sim/freeze/master", false);
+ fgSetBool("/sim/sceneryloaded",false);
+}
projects / flightgear.git / blobdiff