fly/flightgear
1
0
Fork 0
Code Activity

Read FG_ROOT/preferences.xml if we can find that.

Browse source 
Modified Files:
	fgviewer.cxx
This commit is contained in:
frohlich 2009-06-06 10:40:50 +00:00 • committed by Tim Moore
parent 2d7312e462
commit 4b2d677220
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
utils/fgviewer/fgviewer.cxx
View file

@ -12,6 +12,7 @@
#include <osgGA/TerrainManipulator> #include <osgGA/TerrainManipulator>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/scene/material/matlib.hxx> #include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx> #include <simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx>
@ -109,7 +110,17 @@ main(int argc, char** argv)
} }
SGSharedPtr<SGPropertyNode> props = new SGPropertyNode; SGSharedPtr<SGPropertyNode> props = new SGPropertyNode;
props->getNode("sim/startup/season", true)->setStringValue("summer"); try {
SGPath preferencesFile = fg_root;
preferencesFile.append("preferences.xml");
readProperties(preferencesFile.str(), props);
} catch (...) {
// In case of an error, at least make summer :)
props->getNode("sim/startup/season", true)->setStringValue("summer");
std::cerr << "Problems loading FlightGear preferences.\n"
<< "Probably FG_ROOT is not properly set." << std::endl;
}
SGMaterialLib* ml = new SGMaterialLib; SGMaterialLib* ml = new SGMaterialLib;
SGPath mpath(fg_root); SGPath mpath(fg_root);
mpath.append("materials.xml"); mpath.append("materials.xml");