Renamed osgTerrain::TerrainNode to osgTerrain::Terrain and introduced basic

.osg read support for osgTerrain::Terrain.
This commit is contained in:
Robert Osfield
2007-08-07 19:53:57 +00:00
parent 1fc50423c6
commit 1c6193ba78
10 changed files with 381 additions and 373 deletions

View File

@@ -47,7 +47,7 @@
#include <osgGA/AnimationPathManipulator>
#include <osgGA/TerrainManipulator>
#include <osgTerrain/TerrainNode>
#include <osgTerrain/Terrain>
#include <osgTerrain/GeometryTechnique>
#include <osgTerrain/Layer>
@@ -672,7 +672,7 @@ int main(int argc, char** argv)
}
osg::ref_ptr<osgTerrain::TerrainNode> terrain = new osgTerrain::TerrainNode;
osg::ref_ptr<osgTerrain::Terrain> terrain = new osgTerrain::Terrain;
osg::ref_ptr<osgTerrain::Locator> locator = new osgTerrain::EllipsoidLocator(-osg::PI, -osg::PI*0.5, 2.0*osg::PI, osg::PI, 0.0);
osg::ref_ptr<osgTerrain::ValidDataOperator> validDataOperator = new osgTerrain::NoDataValue(0.0);
osg::ref_ptr<osgTerrain::Layer> lastAppliedLayer;
@@ -834,12 +834,12 @@ int main(int argc, char** argv)
if (filterName=="NEAREST")
{
osg::notify(osg::NOTICE)<<"--filter "<<filterName<<std::endl;
terrain->setColorFilter(layerNum, osgTerrain::TerrainNode::NEAREST);
terrain->setColorFilter(layerNum, osgTerrain::Terrain::NEAREST);
}
else if (filterName=="LINEAR")
{
osg::notify(osg::NOTICE)<<"--filter "<<filterName<<std::endl;
terrain->setColorFilter(layerNum, osgTerrain::TerrainNode::LINEAR);
terrain->setColorFilter(layerNum, osgTerrain::Terrain::LINEAR);
}
else
{