#include <functional>
#include <osgViewer/Viewer>
+#include <osgDB/Registry>
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/scene/model/modellib.hxx>
-#include <simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx>
+#include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <simgear/scene/tsync/terrasync.hxx>
#include <Main/globals.hxx>
using simgear::TileCache;
-// helper: listen to property changes affecting tile loading
-class LoaderPropertyWatcher : public SGPropertyChangeListener
-{
-public:
- LoaderPropertyWatcher(FGTileMgr* pTileMgr) :
- _pTileMgr(pTileMgr)
- {
- }
-
- virtual void valueChanged(SGPropertyNode*)
- {
- _pTileMgr->configChanged();
- }
-
-private:
- FGTileMgr* _pTileMgr;
-};
-
-
FGTileMgr::FGTileMgr():
state( Start ),
+ last_state( Running ),
vis( 16000 ),
- _propListener(new LoaderPropertyWatcher(this)),
- _terra_sync(NULL)
+ _terra_sync(NULL),
+ _visibilityMeters(fgGetNode("/environment/visibility-m", true)),
+ _maxTileRangeM(fgGetNode("/sim/rendering/static-lod/bare", true))
{
- _randomObjects = fgGetNode("/sim/rendering/random-objects", true);
- _randomVegetation = fgGetNode("/sim/rendering/random-vegetation", true);
- _maxTileRangeM = fgGetNode("/sim/rendering/static-lod/bare", true);
}
FGTileMgr::~FGTileMgr()
{
- if (_terra_sync)
- _terra_sync->setTileCache(NULL);
-
// remove all nodes we might have left behind
osg::Group* group = globals->get_scenery()->get_terrain_branch();
group->removeChildren(0, group->getNumChildren());
- delete _propListener;
- _propListener = NULL;
// clear OSG cache
osgDB::Registry::instance()->clearObjectCache();
}
void FGTileMgr::init() {
SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
- _options = new SGReaderWriterBTGOptions;
- _options->setMatlib(globals->get_matlib());
-
- _randomObjects.get()->addChangeListener(_propListener, false);
- _randomVegetation.get()->addChangeListener(_propListener, false);
- configChanged();
+ _options = new simgear::SGReaderWriterOptions;
+ _options->setMaterialLib(globals->get_matlib());
+ _options->setPropertyNode(globals->get_props());
osgDB::FilePathList &fp = _options->getDatabasePathList();
const string_list &sc = globals->get_fg_scenery();
std::copy(sc.begin(), sc.end(), back_inserter(fp));
TileEntry::setModelLoadHelper(this);
-
- _visibilityMeters = fgGetNode("/environment/visibility-m", true);
reinit();
}
+void FGTileMgr::refresh_tile(void* tileMgr, long tileIndex)
+{
+ ((FGTileMgr*) tileMgr)->tile_cache.refresh_tile(tileIndex);
+}
void FGTileMgr::reinit()
{
_terra_sync = (simgear::SGTerraSync*) globals->get_subsystem("terrasync");
if (_terra_sync)
- _terra_sync->setTileCache(&tile_cache);
+ _terra_sync->setTileRefreshCb(&refresh_tile, this);
// force an update now
update(0.0);
}
-void FGTileMgr::configChanged()
-{
- _options->setUseRandomObjects(_randomObjects.get()->getBoolValue());
- _options->setUseRandomVegetation(_randomVegetation.get()->getBoolValue());
-}
-
/* schedule a tile for loading, keep request for given amount of time.
* Returns true if tile is already loaded. */
bool FGTileMgr::sched_tile( const SGBucket& b, double priority, bool current_view, double duration)
if ( tile_cache.insert_tile( t ) )
{
// Attach to scene graph
+
t->addToSceneGraph(globals->get_scenery()->get_terrain_branch());
} else
{
// cout << "tile width = " << tile_width << " tile_height = "
// << tile_height << endl;
- double tileRangeM = min(vis,_maxTileRangeM->getDoubleValue());
+ double tileRangeM = std::min(vis,_maxTileRangeM->getDoubleValue());
xrange = (int)(tileRangeM / tile_width) + 1;
yrange = (int)(tileRangeM / tile_height) + 1;
if ( xrange < 1 ) { xrange = 1; }
osg::Node*
FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
{
- SGPath fullPath;
- if (fgGetBool("/sim/paths/use-custom-scenery-data") == true) {
+ 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) {
- SGPath tmpPath(*it);
- tmpPath.append(modelPath);
- if (tmpPath.exists()) {
- fullPath = tmpPath;
- break;
- }
+ // 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;
+ }
+ }
}
- } else {
- fullPath.append(modelPath);
}
osg::Node* result = 0;
try {
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::loadPagedModel(modelPath, globals->get_props(),
- new FGNasalModelData);
+ SGModelLib::loadDeferredModel(fullPath.str(), globals->get_props()/*,
+ new FGNasalModelData*/);
+ }
} catch (const sg_io_exception& exc) {
string m(exc.getMessage());
m += " ";
m += exc.getLocation().asString();
- SG_LOG( SG_ALL, SG_ALERT, m );
+ SG_LOG( SG_TERRAIN, SG_ALERT, m );
} catch (const sg_exception& exc) { // XXX may be redundant
- SG_LOG( SG_ALL, SG_ALERT, exc.getMessage());
+ SG_LOG( SG_TERRAIN, SG_ALERT, exc.getMessage());
}
return result;
}
}
} else
{
- SG_LOG(SG_INPUT, SG_ALERT, "Warning: empty tile in cache!");
+ SG_LOG(SG_TERRAIN, SG_ALERT, "Warning: empty tile in cache!");
}
tile_cache.next();
sz++;
// disk.
void FGTileMgr::update(double)
{
- SG_LOG( SG_TERRAIN, SG_DEBUG, "FGTileMgr::update()" );
SGVec3d viewPos = globals->get_current_view()->get_view_pos();
double vis = _visibilityMeters->getDoubleValue();
schedule_tiles_at(SGGeod::fromCart(viewPos), vis);
// do tile load scheduling.
// Note that we need keep track of both viewer buckets and fdm buckets.
if ( state == Running ) {
- SG_LOG( SG_TERRAIN, SG_DEBUG, "State == Running" );
+ if (last_state != state)
+ {
+ SG_LOG( SG_TERRAIN, SG_DEBUG, "State == Running" );
+ }
if (current_bucket != previous_bucket) {
// We've moved to a new bucket, we need to schedule any
// needed tiles for loading.
// save bucket
previous_bucket = current_bucket;
} else if ( state == Start || state == Inited ) {
- SG_LOG( SG_TERRAIN, SG_INFO, "State == Start || Inited" );
+ SG_LOG( SG_TERRAIN, SG_DEBUG, "State == Start || Inited" );
// do not update bucket yet (position not valid in initial loop)
state = Running;
previous_bucket.make_bad();
}
+ last_state = state;
return 1;
}