#include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/structure/event_mgr.hxx>
+#include <simgear/structure/SGPerfMon.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sg_dir.hxx>
#include <simgear/misc/sgstream.hxx>
#include <Traffic/TrafficMgr.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
#include <FDM/fdm_shell.hxx>
-
+#include <Environment/ephemeris.hxx>
#include <Environment/environment_mgr.hxx>
#include "fg_init.hxx"
}
_searchAircraft = aircraft + "-set.xml";
+ std::string aircraftDir = fgGetString("/sim/aircraft-dir", "");
+ if (!aircraftDir.empty()) {
+ // aircraft-dir was set, skip any searching at all, if it's valid
+ simgear::Dir acPath(aircraftDir);
+ SGPath setFile = acPath.file(_searchAircraft);
+ if (setFile.exists()) {
+ SG_LOG(SG_GENERAL, SG_INFO, "found aircraft in dir: " << aircraftDir );
+
+ try {
+ readProperties(setFile.str(), globals->get_props());
+ } catch ( const sg_exception &e ) {
+ SG_LOG(SG_INPUT, SG_ALERT, "Error reading aircraft: " << e.getFormattedMessage());
+ return false;
+ }
+
+ return true;
+ } else {
+ SG_LOG(SG_GENERAL, SG_ALERT, "aircraft '" << _searchAircraft <<
+ "' not found in specified dir:" << aircraftDir);
+ return false;
+ }
+ }
+
if (!checkCache()) {
// prepare cache for re-scan
SGPropertyNode *n = _cache->getNode("fg-root", true);
SGPropertyNode* _cache;
};
-// Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv ) {
+#ifdef _WIN32
+static SGPath platformDefaultDataPath()
+{
+ char *envp = ::getenv( "APPDATA" );
+ SGPath config( envp );
+ config.append( "flightgear.org" );
+ return config;
+}
+#elif __APPLE__
+
+#include <CoreServices/CoreServices.h>
+
+static SGPath platformDefaultDataPath()
+{
+ FSRef ref;
+ OSErr err = FSFindFolder(kUserDomain, kApplicationSupportFolderType, false, &ref);
+ if (err) {
+ return SGPath();
+ }
+
+ 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()
+{
+ SGPath config( homedir );
+ config.append( ".fgfs" );
+ return config;
+}
+#endif
- flightgear::Options::sharedInstance()->init(argc, argv);
+// Read in configuration (file and command line)
+bool fgInitConfig ( int argc, char **argv )
+{
+ SGPath dataPath = platformDefaultDataPath();
+
+ const char *fg_home = getenv("FG_HOME");
+ if (fg_home)
+ dataPath = fg_home;
+
+ simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
+ if (!exportDir.exists()) {
+ exportDir.create(0777);
+ }
+
+ // Set /sim/fg-home and don't allow malign code to override it until
+ // Nasal security is set up. Use FG_HOME if necessary.
+ SGPropertyNode *home = fgGetNode("/sim", true);
+ home->removeChild("fg-home", 0, false);
+ home = home->getChild("fg-home", 0, true);
+ home->setStringValue(dataPath.c_str());
+ home->setAttribute(SGPropertyNode::WRITE, false);
+
+ flightgear::Options::sharedInstance()->init(argc, argv, dataPath);
// Read global preferences from $FG_ROOT/preferences.xml
SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
}
SGPropertyNode autosave;
-#ifdef _WIN32
- char *envp = ::getenv( "APPDATA" );
- if (envp != NULL ) {
- SGPath config( envp );
- config.append( "flightgear.org" );
-#else
- if ( homedir != NULL ) {
- SGPath config( homedir );
- config.append( ".fgfs" );
-#endif
- const char *fg_home = getenv("FG_HOME");
- if (fg_home)
- config = fg_home;
-
- SGPath home_export(config.str());
- home_export.append("Export/dummy");
- home_export.create_dir(0777);
-
- // Set /sim/fg-home and don't allow malign code to override it until
- // Nasal security is set up. Use FG_HOME if necessary.
- SGPropertyNode *home = fgGetNode("/sim", true);
- home->removeChild("fg-home", 0, false);
- home = home->getChild("fg-home", 0, true);
- home->setStringValue(config.c_str());
- home->setAttribute(SGPropertyNode::WRITE, false);
-
- config.append( "autosave.xml" );
- if (config.exists()) {
- SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << config.str());
- try {
- readProperties(config.str(), &autosave, SGPropertyNode::USERARCHIVE);
- } catch (sg_exception& e) {
- SG_LOG(SG_INPUT, SG_WARN, "failed to read user settings:" << e.getMessage()
- << "(from " << e.getOrigin() << ")");
- }
- }
+
+
+ SGPath autosaveFile = simgear::Dir(dataPath).file("autosave.xml");
+ if (autosaveFile.exists()) {
+ SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << autosaveFile.str());
+ try {
+ readProperties(autosaveFile.str(), &autosave, SGPropertyNode::USERARCHIVE);
+ } catch (sg_exception& e) {
+ SG_LOG(SG_INPUT, SG_WARN, "failed to read user settings:" << e.getMessage()
+ << "(from " << e.getOrigin() << ")");
+ }
}
-
- // Scan user config files and command line for a specified aircraft.
+
+ // Scan user config files and command line for a specified aircraft.
flightgear::Options::sharedInstance()->initAircraft();
-
+
FindAndCacheAircraft f(&autosave);
if (!f.loadAircraft()) {
return false;
copyProperties(&autosave, globals->get_props());
+ // TODO Move some of the code above into loadUserSettings after the 2.6 release
+ // call dummy function, for now just to indicate that data was loaded
+ globals->loadUserSettings();
+
// parse options after loading aircraft to ensure any user
// overrides of defaults are honored.
flightgear::Options::sharedInstance()->processOptions();
// gear, its initialization call should located in this routine.
// Returns non-zero if a problem encountered.
bool fgInitSubsystems() {
- // static const SGPropertyNode *longitude
- // = fgGetNode("/sim/presets/longitude-deg");
- // static const SGPropertyNode *latitude
- // = fgGetNode("/sim/presets/latitude-deg");
- // static const SGPropertyNode *altitude
- // = fgGetNode("/sim/presets/altitude-ft");
SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
+ ////////////////////////////////////////////////////////////////////
+ // Initialize the sound subsystem.
+ ////////////////////////////////////////////////////////////////////
+ // Sound manager uses an own subsystem group "SOUND" which is the last
+ // 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 SGSoundMgr, SGSubsystemMgr::SOUND);
+
////////////////////////////////////////////////////////////////////
// Initialize the event manager subsystem.
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
globals->add_subsystem("properties", new FGProperties);
+
+ ////////////////////////////////////////////////////////////////////
+ // Add the performance monitoring system.
+ ////////////////////////////////////////////////////////////////////
+ globals->add_subsystem("performance-mon",
+ new SGPerformanceMonitor(globals->get_subsystem_mgr(),
+ fgGetNode("/sim/performance-monitor", true)));
+
////////////////////////////////////////////////////////////////////
// Initialize the material property subsystem.
////////////////////////////////////////////////////////////////////
// Initialize the weather modeling subsystem
globals->add_subsystem("environment", new FGEnvironmentMgr);
-
+ globals->add_subsystem("ephemeris", new Ephemeris);
+
////////////////////////////////////////////////////////////////////
// Initialize the aircraft systems and instrumentation (before the
// autopilot.)
// sub system infrastructure.
////////////////////////////////////////////////////////////////////
- SG_LOG(SG_GENERAL, SG_INFO, " ATC Manager");
- globals->set_ATC_mgr(new FGATCMgr);
- globals->get_ATC_mgr()->init();
+ globals->add_subsystem("ATC-old", new FGATCMgr, SGSubsystemMgr::INIT);
////////////////////////////////////////////////////////////////////
// Initialize the ATC subsystem
// Initialise the AI Model Manager
////////////////////////////////////////////////////////////////////
SG_LOG(SG_GENERAL, SG_INFO, " AI Model Manager");
- globals->add_subsystem("ai_model", new FGAIManager, SGSubsystemMgr::POST_FDM);
- globals->add_subsystem("submodel_mgr", new FGSubmodelMgr, SGSubsystemMgr::POST_FDM);
+ globals->add_subsystem("ai-model", new FGAIManager, SGSubsystemMgr::POST_FDM);
+ globals->add_subsystem("submodel-mgr", new FGSubmodelMgr, SGSubsystemMgr::POST_FDM);
// It's probably a good idea to initialize the top level traffic manager
// After the AI and ATC systems have been initialized properly.
// AI Traffic manager
- globals->add_subsystem("Traffic Manager", new FGTrafficManager, SGSubsystemMgr::POST_FDM);
+ globals->add_subsystem("traffic-manager", new FGTrafficManager, SGSubsystemMgr::POST_FDM);
////////////////////////////////////////////////////////////////////
// Add a new 2D panel.
// 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();
+ globals->get_subsystem("ai-model")->reinit();
// Initialize the FDM
globals->get_subsystem("flight")->reinit();
projects / flightgear.git / blobdiff