#endif
#include <string>
+
#include <boost/algorithm/string/compare.hpp>
#include <boost/algorithm/string/predicate.hpp>
+#include <osgViewer/Viewer>
+
#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/model/particles.hxx>
#include <simgear/scene/tsync/terrasync.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() {
}
// 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();
fgSetDefaults();
flightgear::Options* options = flightgear::Options::sharedInstance();
- options->init(argc, argv, dataPath);
+ if (!reinit) {
+ options->init(argc, argv, dataPath);
+ }
+
bool loadDefaults = flightgear::Options::sharedInstance()->shouldLoadDefaultConfig();
if (loadDefaults) {
// Read global preferences from $FG_ROOT/preferences.xml
// 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, "========== ==========");
// Initialize the material property subsystem.
////////////////////////////////////////////////////////////////////
- SGPath mpath( globals->get_fg_root() );
- 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);
+ if (!duringReset) {
+ SGPath mpath( globals->get_fg_root() );
+ 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);
+ }
}
-
+
globals->add_subsystem( "http", new FGHTTPClient );
////////////////////////////////////////////////////////////////////
// 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()
+{
+ globals->saveInitialState();
+
+ fgSetBool("/sim/signals/reinit", true);
+ fgSetBool("/sim/freeze/master", true);
+
+ SGSubsystemMgr* subsystemManger = globals->get_subsystem_mgr();
+ subsystemManger->shutdown();
+ subsystemManger->unbind();
+
+ // remove them all (with some 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();
+
+ // 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);
+ simgear::SGModelLib::resetPropertyRoot();
+
+ globals->resetPropertyRoot();
+ globals->restoreInitialState();
+
+ render = new FGRenderer;
+ render->setEventHandler(eventHandler);
+ globals->set_renderer(render);
+ render->init();
+ render->setViewer(viewer.get());
+ viewer->getDatabasePager()->setUpThreads(1, 1);
+ render->splashinit();
+
+ flightgear::CameraGroup::buildDefaultGroup(viewer.get());
+
+ fgOSResetProperties();
+ fgInitConfig(0, NULL, true);
+
+// 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));
+
+// 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);
+}
bool fgInitHome();
// Read in configuration (file and command line)
-int fgInitConfig ( int argc, char **argv );
+int fgInitConfig ( int argc, char **argv, bool reinit );
// log various settings / configuration state
// Create all the subsystems needed by the sim
-void fgCreateSubsystems();
+void fgCreateSubsystems(bool duringReset);
// called after the subsystems have been bound and initialised,
// to peform final init
// Reset: this is what the 'reset' command (and hence, GUI) is attached to
void fgReInitSubsystems();
+
+void fgStartNewReset();
+
#endif // _FG_INIT_HXX
////////////////////////////////////////////////////////////////////////
// global global :-)
-FGGlobals *globals;
+FGGlobals *globals = NULL;
// Constructor
FGGlobals::FGGlobals() :
- props( new SGPropertyNode ),
initial_state( NULL ),
- locale( new FGLocale(props) ),
renderer( new FGRenderer ),
subsystem_mgr( new SGSubsystemMgr ),
event_mgr( new SGEventMgr ),
commands( SGCommandMgr::instance() ),
channel_options_list( NULL ),
initial_waypoints( NULL ),
- scenery( NULL ),
- tile_mgr( NULL ),
fontcache ( new FGFontCache ),
channellist( NULL ),
haveUserSettings(false)
{
- simgear::ResourceManager::instance()->addProvider(new AircraftResourceProvider);
- simgear::ResourceManager::instance()->addProvider(new CurrentAircraftDirProvider);
- simgear::PropertyObjectBase::setDefaultRoot(props);
-
- positionLon = props->getNode("position/longitude-deg", true);
- positionLat = props->getNode("position/latitude-deg", true);
- positionAlt = props->getNode("position/altitude-ft", true);
-
- viewLon = props->getNode("sim/current-view/viewer-lon-deg", true);
- viewLat = props->getNode("sim/current-view/viewer-lat-deg", true);
- viewAlt = props->getNode("sim/current-view/viewer-elev-ft", true);
-
- orientPitch = props->getNode("orientation/pitch-deg", true);
- orientHeading = props->getNode("orientation/heading-deg", true);
- orientRoll = props->getNode("orientation/roll-deg", true);
+ SGPropertyNode* root = new SGPropertyNode;
+ props = SGPropertyNode_ptr(root);
+ locale = new FGLocale(props);
+
+ simgear::ResourceManager::instance()->addProvider(new AircraftResourceProvider);
+ simgear::ResourceManager::instance()->addProvider(new CurrentAircraftDirProvider);
+ initProperties();
+}
+
+void FGGlobals::initProperties()
+{
+ simgear::PropertyObjectBase::setDefaultRoot(props);
+
+ positionLon = props->getNode("position/longitude-deg", true);
+ positionLat = props->getNode("position/latitude-deg", true);
+ positionAlt = props->getNode("position/altitude-ft", true);
+
+ viewLon = props->getNode("sim/current-view/viewer-lon-deg", true);
+ viewLat = props->getNode("sim/current-view/viewer-lat-deg", true);
+ viewAlt = props->getNode("sim/current-view/viewer-elev-ft", true);
+
+ orientPitch = props->getNode("orientation/pitch-deg", true);
+ orientHeading = props->getNode("orientation/heading-deg", true);
+ orientRoll = props->getNode("orientation/roll-deg", true);
+
}
// Destructor
// deallocation of AIModel objects. To ensure we can safely
// shut down all subsystems, make sure we take down the
// AIModels system first.
- SGSubsystem* ai = globals->get_subsystem("ai-model");
+ SGSubsystemRef ai = subsystem_mgr->get_subsystem("ai-model");
if (ai) {
- ai->unbind();
subsystem_mgr->remove("ai-model");
+ ai->unbind();
+ ai.clear(); // ensure AI is deleted now, not at end of this method
}
+
+ subsystem_mgr->shutdown();
+ subsystem_mgr->unbind();
subsystem_mgr->remove("aircraft-model");
subsystem_mgr->remove("tile-manager");
subsystem_mgr->remove("model-manager");
-
- subsystem_mgr->shutdown();
- subsystem_mgr->unbind();
+ _tile_mgr.clear();
+
+ // renderer touches subsystems during its destruction
+ set_renderer(NULL);
+ _scenery.clear();
+
delete subsystem_mgr;
subsystem_mgr = NULL; // important so ::get_subsystem returns NULL
-
- delete renderer;
- renderer = NULL;
-
+
delete time_params;
delete matlib;
delete route_mgr;
-
delete ATIS_mgr;
-
delete channel_options_list;
delete initial_waypoints;
- delete scenery;
delete fontcache;
-
delete channellist;
simgear::PropertyObjectBase::setDefaultRoot(NULL);
delete locale;
locale = NULL;
- delete props;
+ props.clear();
}
// set the fg_root path
return renderer;
}
+void FGGlobals::set_renderer(FGRenderer *render)
+{
+ if (render == renderer) {
+ return;
+ }
+
+ delete renderer;
+ renderer = render;
+}
+
SGSubsystemMgr *
FGGlobals::get_subsystem_mgr () const
{
return SGVec3d::fromGeod(get_view_position());
}
+static void treeDumpRefCounts(int depth, SGPropertyNode* nd)
+{
+ for (int i=0; i<nd->nChildren(); ++i) {
+ SGPropertyNode* cp = nd->getChild(i);
+ if (SGReferenced::count(cp) > 1) {
+ SG_LOG(SG_GENERAL, SG_INFO, "\t" << cp->getPath() << " refcount:" << SGReferenced::count(cp));
+ }
+
+ treeDumpRefCounts(depth + 1, cp);
+ }
+}
+
+void
+FGGlobals::resetPropertyRoot()
+{
+ delete locale;
+
+#if DEBUG_RESET
+ SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
+ treeDumpRefCounts(0, props);
+#endif
+ props = new SGPropertyNode;
+ initProperties();
+ locale = new FGLocale(props);
+
+ // remove /sim/fg-root before writing to prevent hijacking
+ SGPropertyNode *n = props->getNode("/sim", true);
+ n->removeChild("fg-root", 0, false);
+ n = n->getChild("fg-root", 0, true);
+ n->setStringValue(fg_root.c_str());
+ n->setAttribute(SGPropertyNode::WRITE, false);
+}
+
// Save the current state as the initial state.
void
FGGlobals::saveInitialState ()
fgSetInt("/sim/time/warp-delta", d);
}
+FGScenery* FGGlobals::get_scenery () const
+{
+ return _scenery.get();
+}
+
+void FGGlobals::set_scenery ( FGScenery *s )
+{
+ _scenery = s;
+}
+
+FGTileMgr* FGGlobals::get_tile_mgr () const
+{
+ return _tile_mgr.get();
+}
+
+void FGGlobals::set_tile_mgr ( FGTileMgr *t )
+{
+ _tile_mgr = t;
+}
+
// end of globals.cxx
string_list *initial_waypoints;
// FlightGear scenery manager
- FGScenery *scenery;
+ SGSharedPtr<FGScenery> _scenery;
// Tile manager
- FGTileMgr *tile_mgr;
+ SGSharedPtr<FGTileMgr> _tile_mgr;
FGFontCache *fontcache;
SGPropertyNode_ptr positionLon, positionLat, positionAlt;
SGPropertyNode_ptr viewLon, viewLat, viewAlt;
SGPropertyNode_ptr orientHeading, orientPitch, orientRoll;
+
+ /**
+ * helper to initialise standard properties on a new property tree
+ */
+ void initProperties();
public:
FGGlobals();
virtual ~FGGlobals();
virtual FGRenderer *get_renderer () const;
-
+ void set_renderer(FGRenderer* render);
+
virtual SGSubsystemMgr *get_subsystem_mgr () const;
virtual SGSubsystem *get_subsystem (const char * name);
FGViewer *get_current_view() const;
inline SGPropertyNode *get_props () { return props; }
- inline void set_props( SGPropertyNode *n ) { props = n; }
+ /**
+ * @brief reset the property tree to new, empty tree. Ensure all
+ * subsystems are shutdown and unbound before call this.
+ */
+ void resetPropertyRoot();
+
inline FGLocale* get_locale () { return locale; }
inline SGCommandMgr *get_commands () { return commands; }
initial_waypoints = list;
}
- inline FGScenery * get_scenery () const { return scenery; }
- inline void set_scenery ( FGScenery *s ) { scenery = s; }
+ FGScenery * get_scenery () const;
+ void set_scenery ( FGScenery *s );
- inline FGTileMgr * get_tile_mgr () const { return tile_mgr; }
- inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; }
+ FGTileMgr * get_tile_mgr () const;
+ void set_tile_mgr ( FGTileMgr *t );
inline FGFontCache *get_fontcache() const { return fontcache; }
// 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;
// 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) {
int fgMainInit( int argc, char **argv );
+void fgResetIdleState();
+
extern std::string hostname;
#endif
globals = new FGGlobals;
- int configResult = fgInitConfig(arguments.argc(), arguments.argv());
+ int configResult = fgInitConfig(arguments.argc(), arguments.argv(), false);
if (configResult == flightgear::FG_OPTIONS_ERROR) {
return EXIT_FAILURE;
} else if (configResult == flightgear::FG_OPTIONS_EXIT) {
projects / flightgear.git / commitdiff