#include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/model/particles.hxx>
+#include <simgear/scene/tsync/terrasync.hxx>
#include <Aircraft/controls.hxx>
#include <Aircraft/replay.hxx>
#include <Instrumentation/HUD/HUD.hxx>
#include <Cockpit/cockpitDisplayManager.hxx>
#include <Network/HTTPClient.hxx>
+#include <Network/fgcom.hxx>
#include "fg_init.hxx"
#include "fg_io.hxx"
return config;
}
-SGPath platformDesktopPath()
-{
- /*
- typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
- static GetSpecialFolderPath SHGetSpecialFolderPath = NULL;
-
- // lazy open+resolve of shell32
- if (!SHGetSpecialFolderPath) {
- HINSTANCE shellDll = ::LoadLibrary("shell32");
- SHGetSpecialFolderPath = (GetSpecialFolderPath) GetProcAddress(shellDll, "SHGetSpecialFolderPathA");
- }
-
- if (!SHGetSpecialFolderPath)
- return SGPath();
-
- char path[PATH_MAX];
- if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, false)) {
- return SGPath(path);
- }
-
- // failed, bad
- return SGPath();
- */
-
- return SGPath(fgGetString("/sim/fg-current"));
-}
-
#elif __APPLE__
-
#include <CoreServices/CoreServices.h>
static SGPath platformDefaultDataPath()
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;
}
-
-SGPath platformDesktopPath()
-{
- FSRef ref;
- OSErr err = FSFindFolder(kUserDomain, kDesktopFolderType, false, &ref);
- if (err) {
- return SGPath();
- }
-
- unsigned char path[1024];
- if (FSRefMakePath(&ref, path, 1024) != noErr) {
- return SGPath();
- }
-
- return SGPath((const char*) path);
-}
-
#else
static SGPath platformDefaultDataPath()
{
- SGPath config( getenv("HOME") );
- config.append( ".fgfs" );
- return config;
-}
-
-SGPath platformDesktopPath()
-{
- SGPath config( getenv("HOME") );
- config.append( "Desktop" );
- return config;
+ return SGPath::home() / ".fgfs";
}
#endif
void fgInitHome()
{
- SGPath dataPath = platformDefaultDataPath();
- const char *fg_home = getenv("FG_HOME");
- if (fg_home)
- dataPath = fg_home;
+ SGPath dataPath = SGPath::fromEnv("FG_HOME", platformDefaultDataPath());
+ globals->set_fg_home(dataPath.c_str());
- globals->set_fg_home(dataPath.c_str());
+ simgear::Dir fgHome(dataPath);
+ if (!fgHome.exists()) {
+ fgHome.create(0755);
+ }
}
// Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv )
+int fgInitConfig ( int argc, char **argv )
{
SGPath dataPath = globals->get_fg_home();
+
simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
if (!exportDir.exists()) {
exportDir.create(0777);
SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
fgLoadProps("preferences.xml", globals->get_props());
SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
-
- // do not load user settings when reset to default is requested
- if (flightgear::Options::sharedInstance()->isOptionSet("restore-defaults"))
+
+ // do not load user settings when reset to default is requested, or if
+ // told to explicitly ignore
+ if (options->isOptionSet("restore-defaults") || options->isOptionSet("ignore-autosave"))
{
SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
}
FindAndCacheAircraft f(globals->get_props());
if (!f.loadAircraft()) {
- return false;
+ return flightgear::FG_OPTIONS_ERROR;
}
// parse options after loading aircraft to ensure any user
// overrides of defaults are honored.
- options->processOptions();
-
- return true;
+ return options->processOptions();
}
* Initialize vor/ndb/ils/fix list management and query systems (as
* well as simple airport db list)
* This is called multiple times in the case of a cache rebuild,
- * to allow length caching to take place in the background, without
+ * to allow lengthy caching to take place in the background, without
* blocking the main/UI thread.
*/
bool
SG_LOG( SG_GENERAL, SG_ALERT,
"Cannot continue without a path to the base package "
<< "being defined." );
- exit(-1);
+ return false;
}
SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
mpath.append( fgGetString("/sim/rendering/materials-file") );
if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(),
globals->get_props()) ) {
- SG_LOG( SG_GENERAL, SG_ALERT,
- "Error loading materials file " << mpath.str() );
- exit(-1);
+ throw sg_io_exception("Error loading materials file", mpath);
}
globals->add_subsystem( "http", new FGHTTPClient );
globals->add_subsystem("voice", new FGVoiceMgr, SGSubsystemMgr::DISPLAY);
#endif
+#ifdef ENABLE_IAX
+ ////////////////////////////////////////////////////////////////////
+ // Initialize the FGCom subsystem.
+ ////////////////////////////////////////////////////////////////////
+ globals->add_subsystem("fgcom", new FGCom);
+#endif
+
////////////////////////////////////////////////////////////////////
// Initialize the lighting subsystem.
////////////////////////////////////////////////////////////////////
// main-loop
flightgear::initPosition();
+ simgear::SGTerraSync* terraSync =
+ static_cast<simgear::SGTerraSync*>(globals->get_subsystem("terrasync"));
+ if (terraSync) {
+ terraSync->reposition();
+ }
+
// 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();
{
fgFindAircraftInDir(path, this, &ShowAircraft::processAircraft);
+ simgear::requestConsole(); // ensure console is shown on Windows
+
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;
projects / flightgear.git / blobdiff