#include <stdlib.h>
#include <string.h> // strcmp()
-#if defined( unix ) || defined( __CYGWIN__ )
-# include <unistd.h> // for gethostname()
-#endif
#ifdef _WIN32
-# include <direct.h> // for getcwd()
-# define getcwd _getcwd
# include <io.h> // isatty()
# define isatty _isatty
-# include "winsock2.h" // for gethostname()
#endif
// work around a stdc++ lib bug in some versions of linux, but doesn't
#include <simgear/misc/interpolator.hxx>
#include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/model/particles.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
#include <Aircraft/controls.hxx>
#include <Aircraft/replay.hxx>
#include <AIModel/AIManager.hxx>
-#include <ATCDCL/ATCmgr.hxx>
+#include <ATCDCL/ATISmgr.hxx>
#include <ATC/atc_mgr.hxx>
#include <Autopilot/route_mgr.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>
+#include <Canvas/canvas_mgr.hxx>
+#include <Canvas/gui_mgr.hxx>
#include <GUI/new_gui.hxx>
#include <Input/input.hxx>
#include <Instrumentation/instrument_mgr.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 <Traffic/TrafficMgr.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"
const char *fg_home = getenv("FG_HOME");
if (fg_home)
dataPath = fg_home;
+
+ globals->set_fg_home(dataPath.c_str());
simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
if (!exportDir.exists()) {
fgLoadProps("preferences.xml", globals->get_props());
SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
- globals->loadUserSettings(dataPath);
+ // do not load user settings when reset to default is requested
+ if (flightgear::Options::sharedInstance()->isOptionSet("restore-defaults"))
+ {
+ SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
+ }
+ else
+ {
+ globals->loadUserSettings(dataPath);
+ }
// Scan user config files and command line for a specified aircraft.
flightgear::Options::sharedInstance()->initAircraft();
string fltType;
string acOperator;
SGPath acData;
- try {
- acData = fgGetString("/sim/fg-home");
+ try {
+ acData = globals->get_fg_home();
acData.append("aircraft-data");
string acfile = fgGetString("/sim/aircraft") + string(".xml");
acData.append(acfile);
p_metar.append( "Airports/metar.dat" );
fgAirportDBLoad( aptdb.str(), p_metar.str() );
- FGAirport::installPropertyListener();
- FGPositioned::installCommands();
FGNavList *navlist = new FGNavList;
FGNavList *loclist = new FGNavList;
}
SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
- globals->set_browser(fgGetString("/sim/startup/browser-app", "firefox %u"));
+ // Note: browser command is hard-coded for Mac/Windows, so this only affects other platforms
+ globals->set_browser(fgGetString("/sim/startup/browser-app", WEB_BROWSER));
+ fgSetString("/sim/startup/browser-app", globals->get_browser());
- char buf[512], *cwd = getcwd(buf, 511);
- buf[511] = '\0';
+ simgear::Dir cwd(simgear::Dir::current());
SGPropertyNode *curr = fgGetNode("/sim", true);
curr->removeChild("fg-current", 0, false);
curr = curr->getChild("fg-current", 0, true);
- curr->setStringValue(cwd ? cwd : "");
+ curr->setStringValue(cwd.path().str());
curr->setAttribute(SGPropertyNode::WRITE, false);
fgSetBool("/sim/startup/stdout-to-terminal", isatty(1) != 0 );
// 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);
+ globals->add_subsystem("sound", new FGSoundManager, SGSubsystemMgr::SOUND);
////////////////////////////////////////////////////////////////////
// Initialize the event manager subsystem.
////////////////////////////////////////////////////////////////////
fgGetBool("/sim/rendering/bump-mapping", false);
-
+ ////////////////////////////////////////////////////////////////////
+ // Initialize the canvas 2d drawing subsystem.
+ ////////////////////////////////////////////////////////////////////
+ globals->add_subsystem("Canvas", new CanvasMgr, SGSubsystemMgr::DISPLAY);
+ globals->add_subsystem("CanvasGUI", new GUIMgr, SGSubsystemMgr::DISPLAY);
////////////////////////////////////////////////////////////////////
- // Initialise the ATC Manager
- // Note that this is old stuff, but might be necessesary for the
+ // 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("ATC-old", new FGATCMgr, SGSubsystemMgr::INIT);
+ globals->add_subsystem("ATIS", new FGATISMgr, SGSubsystemMgr::INIT, 0.4);
////////////////////////////////////////////////////////////////////
// Initialize the ATC subsystem
////////////////////////////////////////////////////////////////////
globals->add_subsystem("ATC", new FGATCManager, SGSubsystemMgr::POST_FDM);
- ////////////////////////////////////////////////////////////////////
- // Initialise the ATIS Subsystem
- ////////////////////////////////////////////////////////////////////
- //globals->add_subsystem("atis", new FGAtisManager, SGSubsystemMgr::POST_FDM);
-
////////////////////////////////////////////////////////////////////
// Initialize multiplayer subsystem
// Add a new 2D panel.
////////////////////////////////////////////////////////////////////
- string panel_path(fgGetString("/sim/panel/path"));
- if (!panel_path.empty()) {
- FGPanel* p = fgReadPanel(panel_path);
- if (p) {
- globals->set_current_panel(p);
- p->init();
- p->bind();
- SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
- } else {
- SG_LOG( SG_INPUT, SG_ALERT,
- "Error reading new panel from " << panel_path );
- }
- }
-
+ fgSetArchivable("/sim/panel/visibility");
+ fgSetArchivable("/sim/panel/x-offset");
+ fgSetArchivable("/sim/panel/y-offset");
+ fgSetArchivable("/sim/panel/jitter");
+
////////////////////////////////////////////////////////////////////
// Initialize the controls subsystem.
////////////////////////////////////////////////////////////////////
// initialize methods that depend on other subsystems.
globals->get_subsystem_mgr()->postinit();
+ ////////////////////////////////////////////////////////////////////
+ // TODO FIXME! UGLY KLUDGE!
+ ////////////////////////////////////////////////////////////////////
+ {
+ /* Scenarios require Nasal, so FGAIManager loads the scenarios,
+ * including its models such as a/c carriers, in its 'postinit',
+ * which is the very last thing we do.
+ * fgInitPosition is called very early in main.cxx/fgIdleFunction,
+ * one of the first things we do, long before scenarios/carriers are
+ * loaded. => When requested "initial preset position" relates to a
+ * carrier, recalculate the 'initial' position here (how have things
+ * ever worked before this hack - this init sequence has always been
+ * this way...?)*/
+ std::string carrier = fgGetString("/sim/presets/carrier","");
+ if (carrier != "")
+ {
+ // clear preset location and re-trigger position setup
+ fgSetDouble("/sim/presets/longitude-deg", 9999);
+ fgSetDouble("/sim/presets/latitude-deg", 9999);
+ fgInitPosition();
+ }
+ }
+
////////////////////////////////////////////////////////////////////////
// End of subsystem initialization.
////////////////////////////////////////////////////////////////////
projects / flightgear.git / blobdiff