// 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 {
new FGNasalModelData);
else
result=
- SGModelLib::loadPagedModel(modelPath, globals->get_props(),
+ SGModelLib::loadPagedModel(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++;