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

Introduced support for controlling mipmapping of osgTerrain::ImageLayer and compression of osgTerrain::HeightFieldLayer.

Browse Source
This commit is contained in:
Robert Osfield
2008-10-20 08:43:25 +00:00
parent 351ac1614c
commit 10186190f6
18 changed files with 430 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/osgterrain/osgterrain.cpp
View File

@@ -646,7 +646,7 @@ int main(int argc, char** argv)
std::string filterName;
osgTerrain::Layer::Filter filter = osgTerrain::Layer::LINEAR;
osg::Texture::FilterMode filter = osg::Texture::LINEAR;
bool readParameter = false;
float minValue, maxValue;
@@ -705,7 +705,7 @@ int main(int argc, char** argv)
hfl->setLocator(locator.get());
hfl->setValidDataOperator(validDataOperator.get());
hfl->setFilter(filter);
hfl->setMagFilter(filter);
if (offset!=0.0f || scale!=1.0f)
{
@@ -740,7 +740,7 @@ int main(int argc, char** argv)
imageLayer->setImage(image.get());
imageLayer->setLocator(locator.get());
imageLayer->setValidDataOperator(validDataOperator.get());
imageLayer->setFilter(filter);
imageLayer->setMagFilter(filter);
if (offset!=0.0f || scale!=1.0f)
{
@@ -775,7 +775,7 @@ int main(int argc, char** argv)
imageLayer->setImage(image.get());
imageLayer->setLocator(locator.get());
imageLayer->setValidDataOperator(validDataOperator.get());
imageLayer->setFilter(filter);
imageLayer->setMagFilter(filter);
if (offset!=0.0f || scale!=1.0f)
{
@@ -805,11 +805,11 @@ int main(int argc, char** argv)
if (filterName=="NEAREST")
{
osg::notify(osg::NOTICE)<<"--filter "<<filterName<<std::endl;
filter = osgTerrain::Layer::NEAREST;
filter = osg::Texture::NEAREST;
}
else if (filterName=="LINEAR")
{
filter = osgTerrain::Layer::LINEAR;
filter = osg::Texture::LINEAR;
osg::notify(osg::NOTICE)<<"--filter "<<filterName<<std::endl;
}
else
@@ -819,7 +819,7 @@ int main(int argc, char** argv)
if (terrainTile->getColorLayer(layerNum))
{
terrainTile->getColorLayer(layerNum)->setFilter(filter);
terrainTile->getColorLayer(layerNum)->setMagFilter(filter);
}
}