#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/splash.hxx>
#include <Scripting/NasalSys.hxx>
#include "scenery.hxx"
#include "SceneryPager.hxx"
#include "tilemgr.hxx"
-using std::for_each;
using flightgear::SceneryPager;
-using simgear::SGModelLib;
-using simgear::TileEntry;
-using simgear::TileCache;
FGTileMgr::FGTileMgr():
state( Start ),
last_state( Running ),
- vis( 16000 ),
+ longitude(-1000.0),
+ latitude(-1000.0),
+ scheduled_visibility(100.0),
_terra_sync(NULL),
_visibilityMeters(fgGetNode("/environment/visibility-m", true)),
- _maxTileRangeM(fgGetNode("/sim/rendering/static-lod/bare", true))
+ _maxTileRangeM(fgGetNode("/sim/rendering/static-lod/bare", true)),
+ _disableNasalHooks(fgGetNode("/sim/temp/disable-scenery-nasal", true)),
+ _scenery_loaded(fgGetNode("/sim/sceneryloaded", true)),
+ _scenery_override(fgGetNode("/sim/sceneryloaded-override", true)),
+ _pager(FGScenery::getPagerSingleton())
{
}
const string_list &sc = globals->get_fg_scenery();
fp.clear();
std::copy(sc.begin(), sc.end(), back_inserter(fp));
-
- TileEntry::setModelLoadHelper(this);
+ _options->setPluginStringData("SimGear::FG_ROOT", globals->get_fg_root());
+ if (!_disableNasalHooks->getBoolValue())
+ _options->setModelData(new FGNasalModelDataProxy);
reinit();
}
void FGTileMgr::reinit()
{
+ // protect against multiple scenery reloads and properly reset flags,
+ // otherwise aircraft fall through the ground while reloading scenery
+ if (!fgGetBool("/sim/sceneryloaded",true))
+ return;
+ fgSetBool("/sim/sceneryloaded",false);
+ fgSetDouble("/sim/startup/splash-alpha", 1.0);
+
+ // Reload the materials definitions
+ _options->setMaterialLib(globals->get_matlib());
+
// remove all old scenery nodes from scenegraph and clear cache
osg::Group* group = globals->get_scenery()->get_terrain_branch();
group->removeChildren(0, group->getNumChildren());
previous_bucket.make_bad();
current_bucket.make_bad();
longitude = latitude = -1000.0;
+ scheduled_visibility = 100.0;
_terra_sync = (simgear::SGTerraSync*) globals->get_subsystem("terrasync");
if (_terra_sync)
// << tile_height << endl;
double tileRangeM = std::min(vis,_maxTileRangeM->getDoubleValue());
- xrange = (int)(tileRangeM / tile_width) + 1;
- yrange = (int)(tileRangeM / tile_height) + 1;
+ int xrange = (int)(tileRangeM / tile_width) + 1;
+ int yrange = (int)(tileRangeM / tile_height) + 1;
if ( xrange < 1 ) { xrange = 1; }
if ( yrange < 1 ) { yrange = 1; }
}
}
-osg::Node*
-FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
-{
- SGPath fullPath = modelPath;
- if ((fullPath.isRelative())&&
- (fgGetBool("/sim/paths/use-custom-scenery-data") == true)) {
- string_list sc = globals->get_fg_scenery();
-
- for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {
- // fg_senery contains empty strings as "markers" (see FGGlobals::set_fg_scenery)
- if (!it->empty()) {
- SGPath tmpPath(*it);
- tmpPath.append(modelPath);
- if (tmpPath.exists()) {
- fullPath = tmpPath;
- break;
- }
- }
- }
- }
- osg::Node* result = 0;
- try {
- if(cacheModel)
- result =
- SGModelLib::loadModel(fullPath.str(), globals->get_props(),
- new FGNasalModelData);
- else
- {
- /* TODO FGNasalModelData's callback "modelLoaded" isn't thread-safe.
- * But deferred (or paged) OSG loading runs in a separate thread, which would
- * trigger the FGNasalModelData::modelLoaded callback. We're easily doomed
- * when this happens and the model actually contains a Nasal "load" hook - which
- * would run the Nasal parser and Nasal script execution in a separate thread...
- * => Disabling the callback for now, to test if all Nasal related segfaults are
- * gone. Proper resolution is TBD. We'll need to somehow decouple the OSG callback,
- * so we can run the Nasal stuff in the main thread.
- */
- result=
- SGModelLib::loadDeferredModel(fullPath.str(), globals->get_props(),
- _disableNasalHooks->getBoolValue() ? NULL : new FGNasalModelData);
- }
- } catch (const sg_io_exception& exc) {
- string m(exc.getMessage());
- m += " ";
- m += exc.getLocation().asString();
- SG_LOG( SG_TERRAIN, SG_ALERT, m );
- } catch (const sg_exception& exc) { // XXX may be redundant
- SG_LOG( SG_TERRAIN, SG_ALERT, exc.getMessage());
- }
- return result;
-}
-
/**
* Update the various queues maintained by the tilemagr (private
* internal function, do not call directly.)
*/
void FGTileMgr::update_queues()
{
- SceneryPager* pager = FGScenery::getPagerSingleton();
osg::FrameStamp* framestamp
= globals->get_renderer()->getViewer()->getFrameStamp();
double current_time = framestamp->getReferenceTime();
e->is_current_view() ))
{
// schedule tile for loading with osg pager
- pager->queueRequest(e->tileFileName,
- e->getNode(),
- e->get_priority(),
- framestamp,
- e->getDatabaseRequest(),
- _options.get());
+ _pager->queueRequest(e->tileFileName,
+ e->getNode(),
+ e->get_priority(),
+ framestamp,
+ e->getDatabaseRequest(),
+ _options.get());
loading++;
}
} else
delete old;
// zeros out subgraph ref_ptr, so subgraph is owned by
// the pager and will be deleted in the pager thread.
- pager->queueDeleteRequest(subgraph);
+ _pager->queueDeleteRequest(subgraph);
if (--drop_count > 0)
drop_index = tile_cache.get_drop_tile();
// disk.
void FGTileMgr::update(double)
{
- SGVec3d viewPos = globals->get_current_view()->get_view_pos();
double vis = _visibilityMeters->getDoubleValue();
- schedule_tiles_at(SGGeod::fromCart(viewPos), vis);
+ schedule_tiles_at(globals->get_view_position(), vis);
update_queues();
+
+ // scenery loading check, triggers after each sim (tile manager) reinit
+ if (!_scenery_loaded->getBoolValue())
+ {
+ bool fdmInited = fgGetBool("sim/fdm-initialized");
+ if (_scenery_override->getBoolValue() || (isSceneryLoaded() && fdmInited))
+ {
+ _scenery_loaded->setBoolValue(true);
+ fgSplashProgress("");
+ }
+ else
+ {
+ fgSplashProgress("loading-scenery");
+ // be nice to loader threads while waiting for initial scenery, reduce to 20fps
+ SGTimeStamp::sleepForMSec(50);
+ }
+ }
}
-// schedule tiles for the viewer bucket (FDM/AI/groundcache/... use
-// "schedule_scenery" instead
-int FGTileMgr::schedule_tiles_at(const SGGeod& location, double range_m)
+// schedule tiles for the viewer bucket
+// (FDM/AI/groundcache/... should use "schedule_scenery" instead)
+void FGTileMgr::schedule_tiles_at(const SGGeod& location, double range_m)
{
longitude = location.getLongitudeDeg();
latitude = location.getLatitudeDeg();
// SG_LOG( SG_TERRAIN, SG_DEBUG, "FGTileMgr::update() for "
- // << longitude << " " << latatitude );
+ // << longitude << " " << latitude );
current_bucket.set_bucket( location );
// schedule more tiles when visibility increased considerably
// TODO Calculate tile size - instead of using fixed value (5000m)
- if (range_m-scheduled_visibility > 5000.0)
+ if (range_m - scheduled_visibility > 5000.0)
previous_bucket.make_bad();
// SG_LOG( SG_TERRAIN, SG_DEBUG, "Updating tile list for "
previous_bucket.make_bad();
}
last_state = state;
-
- return 1;
}
/** Schedules scenery for given position. Load request remains valid for given duration
projects / flightgear.git / blobdiff