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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield
2008-12-18 11:06:57 +00:00
parent 1cd6541bfd
commit 4ad20a413a
14 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -283,7 +283,7 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
float minHeight = 0.0;
//float minHeight = 0.0;
float scaleHeight = _terrainTile->getTerrain() ? _terrainTile->getTerrain()->getVerticalScale() : 1.0f;
// allocate and assign tex coords
@@ -311,7 +311,7 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
if (switchLayer)
{
if (switchLayer->getActiveLayer()>=0 &&
switchLayer->getActiveLayer()<switchLayer->getNumLayers() &&
static_cast<unsigned int>(switchLayer->getActiveLayer())<switchLayer->getNumLayers() &&
switchLayer->getLayer(switchLayer->getActiveLayer()))
{
locator = switchLayer->getLayer(switchLayer->getActiveLayer())->getLocator();
@@ -697,7 +697,8 @@ void GeometryTechnique::applyColorLayers()
osgTerrain::SwitchLayer* switchLayer = dynamic_cast<osgTerrain::SwitchLayer*>(colorLayer);
if (switchLayer)
{
if (switchLayer->getActiveLayer()<0 || switchLayer->getActiveLayer()>=switchLayer->getNumLayers())
if (switchLayer->getActiveLayer()<0 ||
static_cast<unsigned int>(switchLayer->getActiveLayer())>=switchLayer->getNumLayers())
{
continue;
}