FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added BlendingPolicy support into osgTerrain::Terrain.

Browse Source
This commit is contained in:
Robert Osfield
2010-03-16 18:43:59 +00:00
parent 1537af6235
commit c4e82f0221
5 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -802,19 +802,35 @@ void GeometryTechnique::applyColorLayers()
void GeometryTechnique::applyTransparency()
{
if (_terrainTile->getBlendingPolicy()==TerrainTile::DO_NOT_SET_BLENDING)
TerrainTile::BlendingPolicy blendingPolicy = _terrainTile->getBlendingPolicy();
if (blendingPolicy == TerrainTile::INHERIT && _terrainTile->getTerrain())
{
OSG_INFO<<"GeometryTechnique::applyTransparency() inheriting policy from Terrain"<<std::endl;
blendingPolicy = _terrainTile->getTerrain()->getBlendingPolicy();
}
if (blendingPolicy == TerrainTile::INHERIT)
{
OSG_INFO<<"GeometryTechnique::applyTransparency() policy is INHERIT, defaulting to ENABLE_BLENDING_WHEN_ALPHA_PRESENT"<<std::endl;
blendingPolicy = TerrainTile::ENABLE_BLENDING_WHEN_ALPHA_PRESENT;
}
if (blendingPolicy == TerrainTile::DO_NOT_SET_BLENDING)
{
OSG_INFO<<"blendingPolicy == TerrainTile::DO_NOT_SET_BLENDING"<<std::endl;
return;
}
bool enableBlending = false;
if (_terrainTile->getBlendingPolicy()==TerrainTile::ENABLE_BLENDING)
if (blendingPolicy == TerrainTile::ENABLE_BLENDING)
{
OSG_INFO<<"blendingPolicy == TerrainTile::ENABLE_BLENDING"<<std::endl;
enableBlending = true;
}
else if (_terrainTile->getBlendingPolicy()==TerrainTile::ENABLE_BLENDING_WHEN_ALPHA_PRESENT)
else if (blendingPolicy == TerrainTile::ENABLE_BLENDING_WHEN_ALPHA_PRESENT)
{
OSG_INFO<<"blendingPolicy == TerrainTile::ENABLE_BLENDING_WHEN_ALPHA_PRESENT"<<std::endl;
for(unsigned int i=0; i<_terrainTile->getNumColorLayers(); ++i)
{
osg::Image* image = (_terrainTile->getColorLayer(i)!=0) ? _terrainTile->getColorLayer(i)->getImage() : 0;

4
src/osgTerrain/Terrain.cpp
View File

@@ -21,7 +21,8 @@ using namespace osgTerrain;
Terrain::Terrain():
_sampleRatio(1.0),
_verticalScale(1.0)
_verticalScale(1.0),
_blendingPolicy(TerrainTile::INHERIT)
{
_terrainTechnique = new GeometryTechnique;
}
@@ -30,6 +31,7 @@ Terrain::Terrain(const Terrain& ts, const osg::CopyOp& copyop):
osg::Group(ts,copyop),
_sampleRatio(ts._sampleRatio),
_verticalScale(ts._verticalScale),
_blendingPolicy(ts._blendingPolicy),
_terrainTechnique(ts._terrainTechnique)
{
}

2
src/osgTerrain/TerrainTile.cpp
View File

@@ -62,7 +62,7 @@ TerrainTile::TerrainTile():
_hasBeenTraversal(false),
_requiresNormals(true),
_treatBoundariesToValidDataAsDefaultValue(false),
_blendingPolicy(ENABLE_BLENDING_WHEN_ALPHA_PRESENT)
_blendingPolicy(INHERIT)
{
setThreadSafeRefUnref(true);
}