#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 <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
#include "fg_init.hxx"
#include "fg_io.hxx"
#include "options.hxx"
#include "globals.hxx"
#include "logger.hxx"
-#include "renderer.hxx"
-#include "viewmgr.hxx"
#include "main.hxx"
}
-// Initialize the localization
-SGPropertyNode *fgInitLocale(const char *language) {
- SGPropertyNode *c_node = NULL, *d_node = NULL;
- SGPropertyNode *intl = fgGetNode("/sim/intl");
-
- SG_LOG(SG_GENERAL, SG_INFO, "Selecting language: " << language );
-
- // localization not defined
- if (!intl)
- return NULL;
-
- //
- // Select the proper language from the list
- //
- vector<SGPropertyNode_ptr> locale = intl->getChildren("locale");
- for (unsigned int i = 0; i < locale.size(); i++) {
-
- vector<SGPropertyNode_ptr> lang = locale[i]->getChildren("lang");
- for (unsigned int j = 0; j < lang.size(); j++) {
-
- if (!strcmp(lang[j]->getStringValue(), language)) {
- c_node = locale[i];
- break;
- }
- }
- }
-
-
- // Get the defaults
- d_node = intl->getChild("locale");
- if (!c_node)
- c_node = d_node;
-
- // Check for localized font
- SGPropertyNode *font_n = c_node->getNode("font", true);
- if ( !strcmp(font_n->getStringValue(), "") )
- font_n->setStringValue(d_node->getStringValue("font", "typewriter.txf"));
-
-
- //
- // Load the default strings
- //
- SGPath d_path( globals->get_fg_root() );
-
- const char *d_path_str = d_node->getStringValue("strings");
- if (!d_path_str) {
- SG_LOG(SG_GENERAL, SG_ALERT, "No path in " << d_node->getPath() << "/strings.");
- return NULL;
- }
-
- d_path.append(d_path_str);
- SG_LOG(SG_GENERAL, SG_INFO, "Reading localized strings from " << d_path.str());
-
- SGPropertyNode *strings = c_node->getNode("strings");
- try {
- readProperties(d_path.str(), strings);
- } catch (const sg_exception &) {
- SG_LOG(SG_GENERAL, SG_ALERT, "Unable to read the localized strings");
- return NULL;
- }
-
- //
- // Load the language specific strings
- //
- if (c_node != d_node) {
- SGPath c_path( globals->get_fg_root() );
-
- const char *c_path_str = c_node->getStringValue("strings");
- if (!c_path_str) {
- SG_LOG(SG_GENERAL, SG_ALERT, "No path in " << c_node->getPath() << "/strings");
- return NULL;
- }
-
- c_path.append(c_path_str);
- SG_LOG(SG_GENERAL, SG_INFO, "Reading localized strings from " << c_path.str());
-
- try {
- readProperties(c_path.str(), strings);
- } catch (const sg_exception &) {
- SG_LOG(SG_GENERAL, SG_ALERT,
- "Unable to read the localized strings from " << c_path.str());
- return NULL;
- }
- }
-
- return c_node;
-}
-
-
-
-// Initialize the localization routines
-bool fgDetectLanguage() {
- const char *language = ::getenv("LANG");
-
- if (language == NULL) {
- SG_LOG(SG_GENERAL, SG_INFO, "Unable to detect the language" );
- language = "C";
- }
-
- SGPropertyNode *locale = fgInitLocale(language);
- if (!locale) {
- SG_LOG(SG_GENERAL, SG_ALERT,
- "No internationalization settings specified in preferences.xml" );
-
- return false;
- }
-
- globals->set_locale( locale );
-
- return true;
-}
-
template <class T>
bool fgFindAircraftInDir(const SGPath& dirPath, T* obj, bool (T::*pred)(const SGPath& p))
{
SGPath appData;
appData.set((const char*) path);
- appData.append("flightgear.org");
+ appData.append("FlightGear");
return appData;
}
#else
fgLoadProps("preferences.xml", globals->get_props());
SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
- // Detect the required language as early as possible
- if ( !fgDetectLanguage() ) {
- return false;
- }
-
- SGPropertyNode autosave;
-
+ globals->loadUserSettings(dataPath);
- 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);
+
+ FindAndCacheAircraft f(globals->get_props());
if (!f.loadAircraft()) {
return false;
}
- copyProperties(&autosave, globals->get_props());
-
// parse options after loading aircraft to ensure any user
// overrides of defaults are honored.
flightgear::Options::sharedInstance()->processOptions();
p_metar.append( "Airports/metar.dat" );
fgAirportDBLoad( aptdb.str(), p_metar.str() );
- FGAirport::installPropertyListener();
- FGPositioned::installCommands();
FGNavList *navlist = new FGNavList;
FGNavList *loclist = new FGNavList;
// 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.)
// Initialize the XML Autopilot subsystem.
////////////////////////////////////////////////////////////////////
- globals->add_subsystem( "xml-autopilot", FGXMLAutopilotGroup::createInstance(), SGSubsystemMgr::FDM );
+ 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 );
////////////////////////////////////////////////////////////////////
// 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.
// End of subsystem initialization.
////////////////////////////////////////////////////////////////////
+ fgSetBool("/sim/crashed", false);
fgSetBool("/sim/initialized", true);
SG_LOG( SG_GENERAL, SG_INFO, endl);
// 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