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

Added support for SwitchLayer into GeometryTechnique

Browse Source
This commit is contained in:
Robert Osfield
2008-09-11 14:27:50 +00:00
parent ff299eb104
commit 2be243deda
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -298,10 +298,26 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
} }
else else
{ {
Locator* locator = colorLayer->getLocator();
if (!locator)
{
osgTerrain::SwitchLayer* switchLayer = dynamic_cast<osgTerrain::SwitchLayer*>(colorLayer);
if (switchLayer)
{
if (switchLayer->getActiveLayer()>=0 &&
switchLayer->getActiveLayer()<switchLayer->getNumLayers() &&
switchLayer->getLayer(switchLayer->getActiveLayer()))
{
locator = switchLayer->getLayer(switchLayer->getActiveLayer())->getLocator();
}
}
}
TexCoordLocatorPair& tclp = layerToTexCoordMap[colorLayer]; TexCoordLocatorPair& tclp = layerToTexCoordMap[colorLayer];
tclp.first = new osg::Vec2Array; tclp.first = new osg::Vec2Array;
tclp.first->reserve(numVertices); tclp.first->reserve(numVertices);
tclp.second = colorLayer->getLocator() ? colorLayer->getLocator() : masterLocator; tclp.second = locator ? locator : masterLocator;
geometry->setTexCoordArray(layerNum, tclp.first.get()); geometry->setTexCoordArray(layerNum, tclp.first.get());
} }
} }
@@ -673,6 +689,18 @@ void GeometryTechnique::applyColorLayers()
osgTerrain::Layer* colorLayer = _terrainTile->getColorLayer(layerNum); osgTerrain::Layer* colorLayer = _terrainTile->getColorLayer(layerNum);
if (!colorLayer) continue; if (!colorLayer) continue;
osgTerrain::SwitchLayer* switchLayer = dynamic_cast<osgTerrain::SwitchLayer*>(colorLayer);
if (switchLayer)
{
if (switchLayer->getActiveLayer()<0 || switchLayer->getActiveLayer()>=switchLayer->getNumLayers())
{
continue;
}
colorLayer = switchLayer->getLayer(switchLayer->getActiveLayer());
if (!colorLayer) continue;
}
osg::Image* image = colorLayer->getImage(); osg::Image* image = colorLayer->getImage();
if (!image) continue; if (!image) continue;