f61a6aa4e7
The DatabasePager now passes the Terrain pointer into the ReaderWriter's via osgDB::Options object, rather than pushing a NodePath containing the Terrain onto NodeVisitor. This change means that the DatabasePager nolonger needs to observer the whole NodePath and will be lighter and quicker for it. The change also means that ReadFileCallback can now run custom NodeVisitor's on the scene graph without having to worry about TerrainTile's constructing scene graphs prior to the Terrain being assigned. Also changed is the NodeVisitor::DatabaseRequestHandler which now requires a NodePath to the node that you wish to add to rather than just the pointer to the node you wish to add to. This is more robust when handling scenes with multiple parental paths, whereas previously errors could have occurred due to the default of picking the first available parental path. This change means that subclasses of DatabasePager will need to be updated to use this new function entry point.
105 lines
3.6 KiB
C++
105 lines
3.6 KiB
C++
#include <osgTerrain/TerrainTile>
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
|
|
// _tileID
|
|
static bool checkTileID( const osgTerrain::TerrainTile& tile )
|
|
{
|
|
return tile.getTileID().valid();
|
|
}
|
|
|
|
static bool readTileID( osgDB::InputStream& is, osgTerrain::TerrainTile& tile )
|
|
{
|
|
osgTerrain::TileID id;
|
|
is >> id.level >> id.x >> id.y;
|
|
tile.setTileID( id );
|
|
return true;
|
|
}
|
|
|
|
static bool writeTileID( osgDB::OutputStream& os, const osgTerrain::TerrainTile& tile )
|
|
{
|
|
const osgTerrain::TileID& id = tile.getTileID();
|
|
os << id.level << id.x << id.y << std::endl;
|
|
return true;
|
|
}
|
|
|
|
// _colorLayers
|
|
static bool checkColorLayers( const osgTerrain::TerrainTile& tile )
|
|
{
|
|
return tile.getNumColorLayers()>0;
|
|
}
|
|
|
|
static bool readColorLayers( osgDB::InputStream& is, osgTerrain::TerrainTile& tile )
|
|
{
|
|
unsigned int numValidLayers = 0; is >> numValidLayers >> osgDB::BEGIN_BRACKET;
|
|
for ( unsigned int i=0; i<numValidLayers; ++i )
|
|
{
|
|
unsigned int layerNum=0; is >> osgDB::PROPERTY("Layer") >> layerNum;
|
|
osgTerrain::Layer* layer = dynamic_cast<osgTerrain::Layer*>( is.readObject() );
|
|
if ( layer ) tile.setColorLayer( layerNum, layer );
|
|
}
|
|
is >> osgDB::END_BRACKET;
|
|
return true;
|
|
}
|
|
|
|
static bool writeColorLayers( osgDB::OutputStream& os, const osgTerrain::TerrainTile& tile )
|
|
{
|
|
unsigned int numValidLayers = 0;
|
|
for ( unsigned int i=0; i<tile.getNumColorLayers(); ++i )
|
|
{
|
|
if (tile.getColorLayer(i)) ++numValidLayers;
|
|
}
|
|
|
|
os << numValidLayers << osgDB::BEGIN_BRACKET << std::endl;
|
|
for ( unsigned int i=0; i<tile.getNumColorLayers(); ++i )
|
|
{
|
|
if (tile.getColorLayer(i)) os << osgDB::PROPERTY("Layer") << i << tile.getColorLayer(i);
|
|
}
|
|
os << osgDB::END_BRACKET << std::endl;
|
|
return true;
|
|
}
|
|
|
|
struct TerrainTileFinishedObjectReadCallback : public osgDB::FinishedObjectReadCallback
|
|
{
|
|
virtual void objectRead(osgDB::InputStream& is, osg::Object& obj)
|
|
{
|
|
osgTerrain::TerrainTile& tile = static_cast<osgTerrain::TerrainTile&>(obj);
|
|
|
|
if (is.getOptions())
|
|
{
|
|
osg::ref_ptr<osg::Node> node;
|
|
if (is.getOptions()->getTerrain().lock(node))
|
|
{
|
|
tile.setTerrain(node->asTerrain());
|
|
}
|
|
}
|
|
|
|
if ( osgTerrain::TerrainTile::getTileLoadedCallback().valid() )
|
|
osgTerrain::TerrainTile::getTileLoadedCallback()->loaded( &tile, is.getOptions() );
|
|
}
|
|
};
|
|
|
|
|
|
REGISTER_OBJECT_WRAPPER( osgTerrain_TerrainTile,
|
|
new osgTerrain::TerrainTile,
|
|
osgTerrain::TerrainTile,
|
|
"osg::Object osg::Node osg::Group osgTerrain::TerrainTile" )
|
|
{
|
|
ADD_USER_SERIALIZER( TileID ); // _tileID
|
|
ADD_OBJECT_SERIALIZER( TerrainTechnique, osgTerrain::TerrainTechnique, NULL ); // _terrainTechnique
|
|
ADD_OBJECT_SERIALIZER( Locator, osgTerrain::Locator, NULL ); // _locator
|
|
ADD_OBJECT_SERIALIZER( ElevationLayer, osgTerrain::Layer, NULL ); // _elevationLayer
|
|
ADD_USER_SERIALIZER( ColorLayers ); // _colorLayers
|
|
ADD_BOOL_SERIALIZER( RequiresNormals, true ); // _requiresNormals
|
|
ADD_BOOL_SERIALIZER( TreatBoundariesToValidDataAsDefaultValue, false ); // _treatBoundariesToValidDataAsDefaultValue
|
|
BEGIN_ENUM_SERIALIZER( BlendingPolicy, INHERIT );
|
|
ADD_ENUM_VALUE( INHERIT );
|
|
ADD_ENUM_VALUE( DO_NOT_SET_BLENDING );
|
|
ADD_ENUM_VALUE( ENABLE_BLENDING );
|
|
ADD_ENUM_VALUE( ENABLE_BLENDING_WHEN_ALPHA_PRESENT );
|
|
END_ENUM_SERIALIZER(); // BlendingPolicy
|
|
|
|
wrapper->addFinishedObjectReadCallback( new TerrainTileFinishedObjectReadCallback() );
|
|
}
|