fly/flightgear
1
0
Fork 0
Code Activity

Move all tile-manager init to reinit path.

Browse source 
- improves changing scenery paths at runtime.
This commit is contained in:
James Turner 2014-10-22 21:05:01 +01:00
parent 729392b1f3
commit 779a97b925
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Scenery/tilemgr.cxx
View file

@ -137,35 +137,37 @@ FGTileMgr::~FGTileMgr()
// Initialize the Tile Manager subsystem
void FGTileMgr::init() {
SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
void FGTileMgr::init()
{
reinit();
}
void FGTileMgr::reinit()
{
SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
_terra_sync = static_cast<simgear::SGTerraSync*> (globals->get_subsystem("terrasync"));
// drops the previous options reference
_options = new simgear::SGReaderWriterOptions;
_listener = new TileManagerListener(this);
materialLibChanged();
_options->setPropertyNode(globals->get_props());
osgDB::FilePathList &fp = _options->getDatabasePathList();
const string_list &sc = globals->get_fg_scenery();
fp.clear();
std::copy(sc.begin(), sc.end(), back_inserter(fp));
_options->setPluginStringData("SimGear::FG_ROOT", globals->get_fg_root());
if (globals->get_subsystem("terrasync")) {
_options->setPluginStringData("SimGear::TERRASYNC_ROOT", fgGetString("/sim/terrasync/scenery-dir"));
if (_terra_sync) {
_options->setPluginStringData("SimGear::TERRASYNC_ROOT", fgGetString("/sim/terrasync/scenery-dir"));
}
if (!_disableNasalHooks->getBoolValue())
_options->setModelData(new FGNasalModelDataProxy);
reinit();
}
void FGTileMgr::reinit()
{
_terra_sync = static_cast<simgear::SGTerraSync*> (globals->get_subsystem("terrasync"));
_options->setModelData(new FGNasalModelDataProxy);
// protect against multiple scenery reloads and properly reset flags,
// otherwise aircraft fall through the ground while reloading scenery
if (!fgGetBool("/sim/sceneryloaded",true))