# include <config.h>
#endif
+#include <simgear/compiler.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h> // strcmp()
-#ifdef _WIN32
+#if defined(SG_WINDOWS)
# include <io.h> // isatty()
+# include <process.h> // _getpid()
+# include <Windows.h>
# define isatty _isatty
+#else
+// for open() and options
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <fcntl.h>
#endif
-#include <simgear/compiler.h>
-
#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 <simgear/package/Root.hxx>
+#include <simgear/package/Package.hxx>
+#include <simgear/package/Install.hxx>
+#include <simgear/package/Catalog.hxx>
+
#include <Aircraft/controls.hxx>
#include <Aircraft/replay.hxx>
#include <Aircraft/FlightHistory.hxx>
#include <Airports/runways.hxx>
#include <Airports/airport.hxx>
#include <Airports/dynamics.hxx>
+#include <Airports/airportdynamicsmanager.hxx>
#include <AIModel/AIManager.hxx>
-#include <ATCDCL/ATISmgr.hxx>
#include <ATC/atc_mgr.hxx>
#include <Autopilot/route_mgr.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 <Instrumentation/instrument_mgr.hxx>
#include <Model/acmodel.hxx>
#include <Navaids/navdb.hxx>
#include <Navaids/navlist.hxx>
#include <Scenery/scenery.hxx>
+#include <Scenery/SceneryPager.hxx>
#include <Scenery/tilemgr.hxx>
#include <Scripting/NasalSys.hxx>
#include <Sound/voice.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 <Network/http/httpd.hxx>
+#include <Include/version.h>
+#include <Viewer/splash.hxx>
+#include <Viewer/CameraGroup.hxx>
#include "fg_init.hxx"
#include "fg_io.hxx"
#include "main.hxx"
#include "positioninit.hxx"
#include "util.hxx"
+#include "AircraftDirVisitorBase.hxx"
+
+#if defined(SG_MAC)
+#include <GUI/CocoaHelpers.h> // for Mac impl of platformDefaultDataPath()
+#endif
using std::string;
using std::endl;
using std::cerr;
using std::cout;
+
using namespace boost::algorithm;
+using namespace simgear::pkg;
+extern osg::ref_ptr<osgViewer::Viewer> viewer;
// Return the current base package version
-string fgBasePackageVersion() {
- SGPath base_path( globals->get_fg_root() );
- base_path.append("version");
-
- sg_gzifstream in( base_path.str() );
- if ( !in.is_open() ) {
- SGPath old_path( globals->get_fg_root() );
- old_path.append( "Thanks" );
- sg_gzifstream old( old_path.str() );
- if ( !old.is_open() ) {
- return "[none]";
- } else {
- return "[old version]";
- }
+string fgBasePackageVersion(const SGPath& base_path) {
+ SGPath p(base_path);
+ p.append("version");
+ if (!p.exists()) {
+ return string();
+ }
+
+ sg_gzifstream in( p.str() );
+ if (!in.is_open()) {
+ return string();
}
string version;
return version;
}
-
-template <class T>
-bool fgFindAircraftInDir(const SGPath& dirPath, T* obj, bool (T::*pred)(const SGPath& p))
-{
- if (!dirPath.exists()) {
- SG_LOG(SG_GENERAL, SG_WARN, "fgFindAircraftInDir: no such path:" << dirPath.str());
- return false;
- }
-
- bool recurse = true;
- simgear::Dir dir(dirPath);
- simgear::PathList setFiles(dir.children(simgear::Dir::TYPE_FILE, "-set.xml"));
- simgear::PathList::iterator p;
- for (p = setFiles.begin(); p != setFiles.end(); ++p) {
- // check file name ends with -set.xml
-
- // if we found a -set.xml at this level, don't recurse any deeper
- recurse = false;
-
- bool done = (obj->*pred)(*p);
- if (done) {
- return true;
- }
- } // of -set.xml iteration
-
- if (!recurse) {
- return false;
- }
-
- simgear::PathList subdirs(dir.children(simgear::Dir::TYPE_DIR | simgear::Dir::NO_DOT_OR_DOTDOT));
- for (p = subdirs.begin(); p != subdirs.end(); ++p) {
- if (p->file() == "CVS") {
- continue;
- }
-
- if (fgFindAircraftInDir(*p, obj, pred)) {
- return true;
- }
- } // of subdirs iteration
-
- return false;
-}
-
-template <class T>
-void fgFindAircraft(T* obj, bool (T::*pred)(const SGPath& p))
-{
- const string_list& paths(globals->get_aircraft_paths());
- string_list::const_iterator it = paths.begin();
- for (; it != paths.end(); ++it) {
- bool done = fgFindAircraftInDir(SGPath(*it), obj, pred);
- if (done) {
- return;
- }
- } // of aircraft paths iteration
-
- // if we reach this point, search the default location (always last)
- SGPath rootAircraft(globals->get_fg_root());
- rootAircraft.append("Aircraft");
- fgFindAircraftInDir(rootAircraft, obj, pred);
-}
-
-class FindAndCacheAircraft
+class FindAndCacheAircraft : public AircraftDirVistorBase
{
public:
FindAndCacheAircraft(SGPropertyNode* autoSave)
{
std::string aircraft = fgGetString( "/sim/aircraft", "");
if (aircraft.empty()) {
+ flightgear::fatalMessageBox("No aircraft", "No aircraft was specified");
SG_LOG(SG_GENERAL, SG_ALERT, "no aircraft specified");
return false;
}
readProperties(setFile.str(), globals->get_props());
} catch ( const sg_exception &e ) {
SG_LOG(SG_INPUT, SG_ALERT, "Error reading aircraft: " << e.getFormattedMessage());
+ flightgear::fatalMessageBox("Error reading aircraft",
+ "An error occured reading the requested aircraft (" + aircraft + ")",
+ e.getFormattedMessage());
return false;
}
} else {
SG_LOG(SG_GENERAL, SG_ALERT, "aircraft '" << _searchAircraft <<
"' not found in specified dir:" << aircraftDir);
+ flightgear::fatalMessageBox("Aircraft not found",
+ "The requested aircraft '" + aircraft + "' could not be found in the specified location.",
+ aircraftDir);
return false;
}
}
n->setAttribute(SGPropertyNode::USERARCHIVE, true);
_cache->removeChildren("aircraft");
- fgFindAircraft(this, &FindAndCacheAircraft::checkAircraft);
+ visitAircraftPaths();
}
if (_foundPath.str().empty()) {
SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find specified aircraft: " << aircraft );
+ flightgear::fatalMessageBox("Aircraft not found",
+ "The requested aircraft '" + aircraft + "' could not be found in any of the search paths");
+
return false;
}
readProperties(_foundPath.str(), globals->get_props());
} catch ( const sg_exception &e ) {
SG_LOG(SG_INPUT, SG_ALERT, "Error reading aircraft: " << e.getFormattedMessage());
+ flightgear::fatalMessageBox("Error reading aircraft",
+ "An error occured reading the requested aircraft (" + aircraft + ")",
+ e.getFormattedMessage());
return false;
}
return false;
}
- bool checkAircraft(const SGPath& p)
+ virtual VisitResult visit(const SGPath& p)
{
// create cache node
int i = 0;
if ( boost::equals(fileName, _searchAircraft.c_str(), is_iequal()) ) {
_foundPath = p;
- return true;
+ return VISIT_DONE;
}
- return false;
+ return VISIT_CONTINUE;
}
std::string _searchAircraft;
return config;
}
-#elif __APPLE__
-#include <CoreServices/CoreServices.h>
+#elif defined(SG_MAC)
-static SGPath platformDefaultDataPath()
-{
- FSRef ref;
- OSErr err = FSFindFolder(kUserDomain, kApplicationSupportFolderType, false, &ref);
- if (err) {
- return SGPath();
- }
+// platformDefaultDataPath defined in GUI/CocoaHelpers.h
- unsigned char path[1024];
- if (FSRefMakePath(&ref, path, 1024) != noErr) {
- return SGPath();
- }
-
- SGPath appData;
- appData.set((const char*) path);
- appData.append("FlightGear");
- return appData;
-}
#else
static SGPath platformDefaultDataPath()
{
}
#endif
-void fgInitHome()
+bool fgInitHome()
{
SGPath dataPath = SGPath::fromEnv("FG_HOME", platformDefaultDataPath());
globals->set_fg_home(dataPath.c_str());
if (!fgHome.exists()) {
fgHome.create(0755);
}
+
+ if (!fgHome.exists()) {
+ flightgear::fatalMessageBox("Problem setting up user data",
+ "Unable to create the user-data storage folder at: '"
+ + dataPath.str() + "'");
+ return false;
+ }
+
+ if (fgGetBool("/sim/fghome-readonly", false)) {
+ // user / config forced us into readonly mode, fine
+ SG_LOG(SG_GENERAL, SG_INFO, "Running with FG_HOME readonly");
+ return true;
+ }
+
+// write our PID, and check writeability
+ SGPath pidPath(dataPath, "fgfs.pid");
+ if (pidPath.exists()) {
+ SG_LOG(SG_GENERAL, SG_INFO, "flightgear instance already running, switching to FG_HOME read-only.");
+ // set a marker property so terrasync/navcache don't try to write
+ // from secondary instances
+ fgSetBool("/sim/fghome-readonly", true);
+ return true;
+ }
+
+ char buf[16];
+ bool result = false;
+#if defined(SG_WINDOWS)
+ size_t len = snprintf(buf, 16, "%d", _getpid());
+
+ HANDLE f = CreateFileA(pidPath.c_str(), GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ, /* sharing */
+ NULL, /* security attributes */
+ CREATE_NEW, /* error if already exists */
+ FILE_FLAG_DELETE_ON_CLOSE,
+ NULL /* template */);
+
+ result = (f != INVALID_HANDLE_VALUE);
+ if (result) {
+ DWORD written;
+ WriteFile(f, buf, len, &written, NULL /* overlapped */);
+ }
+#else
+ // POSIX, do open+unlink trick to the file is deleted on exit, even if we
+ // crash or exit(-1)
+ 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) {
+ result = ::write(fd, buf, len) == len;
+ if( ::unlink(pidPath.c_str()) != 0 ) // delete file when app quits
+ result = 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.",
+ "User-data at:" + dataPath.str());
+ }
+ return result;
}
// 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
- // Nasal security is set up. Use FG_HOME if necessary.
+ // Set /sim/fg-home. Use FG_HOME if necessary.
+ // deliberately not a tied property, for fgValidatePath security
+ // write-protect to avoid accidents
SGPropertyNode *home = fgGetNode("/sim", true);
- home->removeChild("fg-home", 0, false);
+ home->removeChild("fg-home", 0);
home = home->getChild("fg-home", 0, true);
home->setStringValue(dataPath.c_str());
home->setAttribute(SGPropertyNode::WRITE, false);
+ 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");
// told to explicitly ignore
if (options->isOptionSet("restore-defaults") || options->isOptionSet("ignore-autosave"))
{
- SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
+ SG_LOG(SG_GENERAL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
}
else
{
} 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;
+}
- FindAndCacheAircraft f(globals->get_props());
- if (!f.loadAircraft()) {
- return flightgear::FG_OPTIONS_ERROR;
+static void initAircraftDirsNasalSecurity()
+{
+ // deliberately not a tied property, for fgValidatePath security
+ // write-protect to avoid accidents
+ SGPropertyNode* sim = fgGetNode("/sim", true);
+ sim->removeChildren("fg-aircraft");
+
+ int index = 0;
+ string_list const aircraft_paths = globals->get_aircraft_paths();
+ for( string_list::const_iterator it = aircraft_paths.begin();
+ it != aircraft_paths.end();
+ ++it, ++index )
+ {
+ SGPropertyNode* n = sim->getChild("fg-aircraft", index, true);
+ n->setStringValue(*it);
+ n->setAttribute(SGPropertyNode::WRITE, false);
}
+}
+
+void fgInitAircraftPaths(bool reinit)
+{
+ if (!globals->packageRoot()) {
+ fgInitPackageRoot();
+ }
- // parse options after loading aircraft to ensure any user
- // overrides of defaults are honored.
- return options->processOptions();
+ SGSharedPtr<Root> pkgRoot(globals->packageRoot());
+ SGPropertyNode* aircraftProp = fgGetNode("/sim/aircraft", true);
+ aircraftProp->setAttribute(SGPropertyNode::PRESERVE, true);
+
+ if (!reinit) {
+ flightgear::Options::sharedInstance()->initPaths();
+ }
}
+int fgInitAircraft(bool reinit)
+{
+ if (!reinit) {
+ flightgear::Options::sharedInstance()->initAircraft();
+ }
+
+ SGSharedPtr<Root> pkgRoot(globals->packageRoot());
+ SGPropertyNode* aircraftProp = fgGetNode("/sim/aircraft", true);
+
+ string aircraftId(aircraftProp->getStringValue());
+ PackageRef acftPackage = pkgRoot->getPackageById(aircraftId);
+ if (acftPackage) {
+ if (acftPackage->isInstalled()) {
+ SG_LOG(SG_GENERAL, SG_INFO, "Loading aircraft from package:" << acftPackage->qualifiedId());
+
+ // set catalog path so intra-package dependencies within the catalog
+ // are resolved correctly.
+ globals->set_catalog_aircraft_path(acftPackage->catalog()->installRoot());
+
+ // set aircraft-dir to short circuit the search process
+ InstallRef acftInstall = acftPackage->install();
+ fgSetString("/sim/aircraft-dir", acftInstall->path().c_str());
+
+ // overwrite the fully qualified ID with the aircraft one, so the
+ // code in FindAndCacheAircraft works as normal
+ // note since we may be using a variant, we can't use the package ID
+ size_t lastDot = aircraftId.rfind('.');
+ if (lastDot != std::string::npos) {
+ aircraftId = aircraftId.substr(lastDot + 1);
+ }
+ aircraftProp->setStringValue(aircraftId);
+
+ // run the traditional-code path below
+ } else {
+#if 0
+ // naturally the better option would be to on-demand install it!
+ flightgear::fatalMessageBox("Aircraft not installed",
+ "Requested aircraft is not currently installed.",
+ aircraftId);
+
+ return flightgear::FG_OPTIONS_ERROR;
+#endif
+ // fall back the default aircraft instead
+ }
+ }
+ initAircraftDirsNasalSecurity();
+
+ FindAndCacheAircraft f(globals->get_props());
+ if (!f.loadAircraft()) {
+ return flightgear::FG_OPTIONS_ERROR;
+ }
+
+ return flightgear::FG_OPTIONS_OK;
+}
/**
* Initialize vor/ndb/ils/fix list management and query systems (as
bool
fgInitNav ()
{
- flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
- static bool doingRebuild = false;
- if (doingRebuild || cache->isRebuildRequired()) {
- doingRebuild = true;
- bool finished = cache->rebuild();
- if (!finished) {
- // sleep to give the rebuild thread more time
- SGTimeStamp::sleepForMSec(50);
- return false;
+ flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
+ static bool doingRebuild = false;
+
+ if (!cache) {
+ cache = flightgear::NavDataCache::createInstance();
+ doingRebuild = cache->isRebuildRequired();
}
- }
-
+
+ static const char* splashIdentsByRebuildPhase[] = {
+ "loading-nav-dat",
+ "navdata-airports",
+ "navdata-navaids",
+ "navdata-fixes",
+ "navdata-pois"
+ };
+
+ if (doingRebuild) {
+ flightgear::NavDataCache::RebuildPhase phase;
+ phase = cache->rebuild();
+ if (phase != flightgear::NavDataCache::REBUILD_DONE) {
+ // update the splash text based on percentage, phase
+
+ fgSplashProgress(splashIdentsByRebuildPhase[phase],
+ cache->rebuildPhaseCompletionPercentage());
+
+ // sleep to give the rebuild thread more time
+ SGTimeStamp::sleepForMSec(50);
+ return false;
+ }
+ }
+
FGTACANList *channellist = new FGTACANList;
globals->set_channellist( channellist );
simgear::Dir cwd(simgear::Dir::current());
SGPropertyNode *curr = fgGetNode("/sim", true);
- curr->removeChild("fg-current", 0, false);
+ curr->removeChild("fg-current", 0);
curr = curr->getChild("fg-current", 0, true);
curr->setStringValue(cwd.path().str());
curr->setAttribute(SGPropertyNode::WRITE, false);
SG_LOG( SG_GENERAL, SG_INFO, "aircraft-dir = " << '"' << fgGetString("/sim/aircraft-dir") << '"' );
SG_LOG( SG_GENERAL, SG_INFO, "fghome-dir = " << '"' << globals->get_fg_home() << '"');
- SG_LOG( SG_GENERAL, SG_INFO, "aircraft-dir = " << '"' << fgGetString("/sim/aircraft-dir") << '"');
-
+ SG_LOG( SG_GENERAL, SG_INFO, "download-dir = " << '"' << fgGetString("/sim/paths/download-dir") << '"' );
+ SG_LOG( SG_GENERAL, SG_INFO, "terrasync-dir = " << '"' << fgGetString("/sim/terrasync/scenery-dir") << '"' );
+
SG_LOG( SG_GENERAL, SG_INFO, "aircraft-search-paths = \n\t" << simgear::strutils::join(globals->get_aircraft_paths(), "\n\t") );
SG_LOG( SG_GENERAL, SG_INFO, "scenery-search-paths = \n\t" << simgear::strutils::join(globals->get_fg_scenery(), "\n\t") );
}
// 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, "========== ==========");
// to be updated in every loop.
// Sound manager is updated last so it can use the CPU while the GPU
// is processing the scenery (doubled the frame-rate for me) -EMH-
- globals->add_subsystem("sound", new FGSoundManager, SGSubsystemMgr::SOUND);
+ globals->add_new_subsystem<FGSoundManager>(SGSubsystemMgr::SOUND);
////////////////////////////////////////////////////////////////////
// Initialize the event manager subsystem.
// Initialize the property interpolator subsystem. Put into the INIT
// group because the "nasal" subsystem may need it at GENERAL take-down.
////////////////////////////////////////////////////////////////////
- FGInterpolator* interp = new FGInterpolator;
- interp->setRealtimeProperty(fgGetNode("/sim/time/delta-realtime-sec", true));
- globals->add_subsystem("prop-interpolator", interp, SGSubsystemMgr::INIT);
- SGPropertyNode::setInterpolationMgr(interp);
+ globals->add_subsystem("prop-interpolator", new FGInterpolator, SGSubsystemMgr::INIT);
+
////////////////////////////////////////////////////////////////////
// Add the FlightGear property utilities.
globals->add_subsystem("properties", new FGProperties);
+ ////////////////////////////////////////////////////////////////////
+ // Add the FlightGear property utilities.
+ ////////////////////////////////////////////////////////////////////
+ globals->add_new_subsystem<flightgear::AirportDynamicsManager>();
+
////////////////////////////////////////////////////////////////////
// Add the performance monitoring system.
////////////////////////////////////////////////////////////////////
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);
+ }
+
+ // may exist already due to GUI startup
+ if (!globals->get_subsystem("http")) {
+ globals->add_subsystem( "http", new FGHTTPClient );
}
- globals->add_subsystem( "http", new FGHTTPClient );
-
////////////////////////////////////////////////////////////////////
// Initialize the scenery management subsystem.
////////////////////////////////////////////////////////////////////
globals->add_subsystem( "xml-autopilot", FGXMLAutopilotGroup::createInstance("autopilot"), SGSubsystemMgr::FDM );
globals->add_subsystem( "xml-proprules", FGXMLAutopilotGroup::createInstance("property-rule"), SGSubsystemMgr::GENERAL );
- globals->add_subsystem( "route-manager", new FGRouteMgr );
+ globals->add_new_subsystem<FGRouteMgr>();
////////////////////////////////////////////////////////////////////
// Initialize the Input-Output subsystem
////////////////////////////////////////////////////////////////////
// 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);
- ////////////////////////////////////////////////////////////////////
- // Initialise the ATIS Manager
- // Note that this is old stuff, but is necessary for the
- // current ATIS implementation. Therefore, leave it in here
- // until the ATIS system is ported over to make use of the ATIS
- // sub system infrastructure.
- ////////////////////////////////////////////////////////////////////
-
- globals->add_subsystem("ATIS", new FGATISMgr, SGSubsystemMgr::INIT, 0.4);
-
////////////////////////////////////////////////////////////////////
// Initialize the ATC subsystem
////////////////////////////////////////////////////////////////////
// Initialize the controls subsystem.
////////////////////////////////////////////////////////////////////
- globals->add_subsystem("controls", new FGControls, SGSubsystemMgr::GENERAL);
+ globals->add_new_subsystem<FGControls>(SGSubsystemMgr::GENERAL);
////////////////////////////////////////////////////////////////////
// Initialize the input subsystem.
globals->add_subsystem("fgcom", new FGCom);
#endif
+ {
+ SGSubsystem * httpd = flightgear::http::FGHttpd::createInstance( fgGetNode(flightgear::http::PROPERTY_ROOT) );
+ if( NULL != httpd )
+ globals->add_subsystem("httpd", httpd );
+ }
+
////////////////////////////////////////////////////////////////////
// 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);
- globals->add_subsystem("view-manager", new FGViewMgr, SGSubsystemMgr::DISPLAY);
-
- globals->add_subsystem("tile-manager", globals->get_tile_mgr(),
- SGSubsystemMgr::DISPLAY);
+ globals->add_new_subsystem<FGViewMgr>(SGSubsystemMgr::DISPLAY);
}
void fgPostInitSubsystems()
nasal->init();
SG_LOG(SG_GENERAL, SG_INFO, "Nasal init took:" << st.elapsedMSec());
- // Ensure IOrules and path validation are working properly by trying to
- // access a folder/file which should never be accessible.
- const char* no_access_path =
-#ifdef _WIN32
- "Z:"
-#endif
- "/do-not-access";
-
- if( fgValidatePath(no_access_path, true) )
- SG_LOG
- (
- SG_GENERAL,
- SG_ALERT,
- "Check your IOrules! (write to '" << no_access_path << "' is allowed)"
- );
- if( fgValidatePath(no_access_path, false) )
- SG_LOG
- (
- SG_GENERAL,
- SG_ALERT,
- "Check your IOrules! (read from '" << no_access_path << "' is allowed)"
- );
-
// initialize methods that depend on other subsystems.
st.stamp();
globals->get_subsystem_mgr()->postinit();
fgSetBool("/sim/initialized", true);
SG_LOG( SG_GENERAL, SG_INFO, endl);
-
- // Save the initial state for future
- // reference.
- globals->saveInitialState();
}
-// Reset: this is what the 'reset' command (and hence, GUI) is attached to
-void fgReInitSubsystems()
+// re-position is a simplified version of the traditional (legacy)
+// reset procedure. We only need to poke systems which will be upset by
+// a sudden change in aircraft position. Since this potentially includes
+// Nasal, we trigger the 'reinit' signal.
+void fgStartReposition()
{
- SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master");
-
- SG_LOG( SG_GENERAL, SG_INFO, "fgReInitSubsystems()");
+ SGPropertyNode *master_freeze = fgGetNode("/sim/freeze/master");
+ SG_LOG( SG_GENERAL, SG_INFO, "fgStartReposition()");
+
+ // ensure we are frozen
+ bool freeze = master_freeze->getBoolValue();
+ if ( !freeze ) {
+ master_freeze->setBoolValue(true);
+ }
+
+ // set this signal so Nasal scripts can take action.
+ fgSetBool("/sim/signals/reinit", true);
+ fgSetBool("/sim/crashed", false);
+
+ FDMShell* fdm = static_cast<FDMShell*>(globals->get_subsystem("flight"));
+ fdm->unbind();
+
+ // update our position based on current presets
+ // this will mark position as needed finalized which we'll do in the
+ // main-loop
+ flightgear::initPosition();
+
+ simgear::SGTerraSync* terraSync =
+ static_cast<simgear::SGTerraSync*>(globals->get_subsystem("terrasync"));
+ if (terraSync) {
+ terraSync->reposition();
+ }
+
+ // Initialize the FDM
+ globals->get_subsystem("flight")->reinit();
+
+ // reset replay buffers
+ globals->get_subsystem("replay")->reinit();
+
+ // ugly: finalizePosition waits for METAR to arrive for the new airport.
+ // we don't re-init the environment manager here, since historically we did
+ // not, and doing so seems to have other issues. All that's needed is to
+ // schedule METAR fetch immediately, so it's available for finalizePosition.
+ // So we manually extract the METAR-fetching component inside the environment
+ // manager, and re-init that.
+ SGSubsystemGroup* envMgr = static_cast<SGSubsystemGroup*>(globals->get_subsystem("environment"));
+ if (envMgr) {
+ envMgr->get_subsystem("realwx")->reinit();
+ }
+
+ // need to bind FDMshell again, since we manually unbound it above...
+ fdm->bind();
+
+ // need to reset aircraft (systems/instruments/autopilot)
+ // so they can adapt to current environment
+ globals->get_subsystem("systems")->reinit();
+ globals->get_subsystem("instrumentation")->reinit();
+ globals->get_subsystem("xml-autopilot")->reinit();
+
+ // setup state to end re-init
+ fgSetBool("/sim/signals/reinit", false);
+ if ( !freeze ) {
+ master_freeze->setBoolValue(false);
+ }
+ fgSetBool("/sim/sceneryloaded",false);
+}
-// setup state to begin re-init
- bool freeze = master_freeze->getBoolValue();
- if ( !freeze ) {
- master_freeze->setBoolValue(true);
- }
+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/crashed", false);
+ 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") || (*it == FGTileMgr::subsystemName()) || (*it == FGScenery::subsystemName()))
+ {
+ 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
+
+ FGRenderer* render = globals->get_renderer();
+ // needed or we crash in multi-threaded OSG mode
+ render->getViewer()->stopThreading();
+
+ // order is important here since tile-manager shutdown needs to
+ // access the scenery object
+ subsystemManger->remove(FGTileMgr::subsystemName());
+ subsystemManger->remove(FGScenery::subsystemName());
-// do actual re-init steps
- globals->get_subsystem("flight")->unbind();
+ FGScenery::getPagerSingleton()->clearRequests();
+ flightgear::CameraGroup::setDefault(NULL);
+
+ // 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);
- // reset control state, before restoring initial state; -set or config files
- // may specify values for flaps, trim tabs, magnetos, etc
- globals->get_controls()->reset_all();
+ simgear::clearEffectCache();
+ simgear::SGModelLib::resetPropertyRoot();
- globals->restoreInitialState();
-
- // update our position based on current presets
- // this will mark position as needed finalized which we'll do in the
- // main-loop
- flightgear::initPosition();
+ simgear::GlobalParticleCallback::setSwitch(NULL);
- simgear::SGTerraSync* terraSync =
- static_cast<simgear::SGTerraSync*>(globals->get_subsystem("terrasync"));
- if (terraSync) {
- terraSync->reposition();
- }
+ globals->resetPropertyRoot();
+ // otherwise channels are duplicated
+ globals->get_channel_options_list()->clear();
+
+ fgInitConfig(0, NULL, true);
+ fgInitGeneral(); // all of this?
- // Force reupdating the positions of the ai 3d models. They are used for
- // initializing ground level for the FDM.
- globals->get_subsystem("ai-model")->reinit();
-
- // Initialize the FDM
- globals->get_subsystem("flight")->reinit();
-
- // reset replay buffers
- globals->get_subsystem("replay")->reinit();
+ flightgear::Options::sharedInstance()->processOptions();
- // reload offsets from config defaults
- globals->get_viewmgr()->reinit();
-
- // ugly: finalizePosition waits for METAR to arrive for the new airport.
- // we don't re-init the environment manager here, since historically we did
- // not, and doing so seems to have other issues. All that's needed is to
- // schedule METAR fetch immediately, so it's available for finalizePosition.
- // So we manually extract the METAR-fetching component inside the environment
- // manager, and re-init that.
- SGSubsystemGroup* envMgr = static_cast<SGSubsystemGroup*>(globals->get_subsystem("environment"));
- if (envMgr) {
- envMgr->get_subsystem("realwx")->reinit();
+ // PRESERVED properties over-write state from options, intentionally
+ 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?)" );
}
-
- globals->get_subsystem("time")->reinit();
- // need to bind FDMshell again, since we manually unbound it above...
- globals->get_subsystem("flight")->bind();
-
- // need to reset aircraft (systems/instruments) so they can adapt to current environment
- globals->get_subsystem("systems")->reinit();
- globals->get_subsystem("instrumentation")->reinit();
+ fgGetNode("/sim")->removeChild("aircraft-dir");
+ fgInitAircraftPaths(true);
+ fgInitAircraft(true);
+
+ render = new FGRenderer;
+ render->setEventHandler(eventHandler);
+ eventHandler->reset();
+ 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();
+ viewer->startThreading();
+
+ fgOSResetProperties();
- globals->get_subsystem("ATIS")->reinit();
+// 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());
-// setup state to end re-init
fgSetBool("/sim/signals/reinit", false);
- if ( !freeze ) {
- master_freeze->setBoolValue(false);
- }
+ fgSetBool("/sim/freeze/master", false);
fgSetBool("/sim/sceneryloaded",false);
}
-
-///////////////////////////////////////////////////////////////////////////////
-// helper object to implement the --show-aircraft command.
-// resides here so we can share the fgFindAircraftInDir template above,
-// and hence ensure this command lists exectly the same aircraft as the normal
-// loading path.
-class ShowAircraft
+void fgInitPackageRoot()
{
-public:
- ShowAircraft()
- {
- _minStatus = getNumMaturity(fgGetString("/sim/aircraft-min-status", "all"));
- }
-
-
- void show(const SGPath& path)
- {
- fgFindAircraftInDir(path, this, &ShowAircraft::processAircraft);
-
- std::sort(_aircraft.begin(), _aircraft.end(), ciLessLibC());
- SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows
- cout << "Available aircraft:" << endl;
- for ( unsigned int i = 0; i < _aircraft.size(); i++ ) {
- cout << _aircraft[i] << endl;
- }
- }
-
-private:
- bool processAircraft(const SGPath& path)
- {
- SGPropertyNode root;
- try {
- readProperties(path.str(), &root);
- } catch (sg_exception& ) {
- return false;
+ if (globals->packageRoot()) {
+ return;
}
-
- int maturity = 0;
- string descStr(" ");
- descStr += path.file();
- // trim common suffix from file names
- int nPos = descStr.rfind("-set.xml");
- if (nPos == (int)(descStr.size() - 8)) {
- descStr.resize(nPos);
- }
-
- SGPropertyNode *node = root.getNode("sim");
- if (node) {
- SGPropertyNode* desc = node->getNode("description");
- // if a status tag is found, read it in
- if (node->hasValue("status")) {
- maturity = getNumMaturity(node->getStringValue("status"));
- }
-
- if (desc) {
- if (descStr.size() <= 27+3) {
- descStr.append(29+3-descStr.size(), ' ');
- } else {
- descStr += '\n';
- descStr.append( 32, ' ');
- }
- descStr += desc->getStringValue();
- }
- } // of have 'sim' node
- if (maturity < _minStatus) {
- return false;
- }
-
- _aircraft.push_back(descStr);
- return false;
- }
-
-
- int getNumMaturity(const char * str)
- {
- // changes should also be reflected in $FG_ROOT/data/options.xml &
- // $FG_ROOT/data/Translations/string-default.xml
- const char* levels[] = {"alpha","beta","early-production","production"};
-
- if (!strcmp(str, "all")) {
- return 0;
- }
+ SGPath packageAircraftDir = flightgear::defaultDownloadDir();
+ packageAircraftDir.append("Aircraft");
- for (size_t i=0; i<(sizeof(levels)/sizeof(levels[0]));i++)
- if (strcmp(str,levels[i])==0)
- return i;
+ SGSharedPtr<Root> pkgRoot(new Root(packageAircraftDir, FLIGHTGEAR_VERSION));
+ // set the http client later (too early in startup right now)
+ globals->setPackageRoot(pkgRoot);
- return 0;
- }
-
- // recommended in Meyers, Effective STL when internationalization and embedded
- // NULLs aren't an issue. Much faster than the STL or Boost lex versions.
- struct ciLessLibC : public std::binary_function<string, string, bool>
- {
- bool operator()(const std::string &lhs, const std::string &rhs) const
- {
- return strcasecmp(lhs.c_str(), rhs.c_str()) < 0 ? 1 : 0;
- }
- };
-
- int _minStatus;
- string_list _aircraft;
-};
-
-void fgShowAircraft(const SGPath &path)
-{
- ShowAircraft s;
- s.show(path);
-
-#ifdef _MSC_VER
- cout << "Hit a key to continue..." << endl;
- std::cin.get();
-#endif
}
-
-
projects / flightgear.git / blobdiff