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

Removed old redundent TexGen usage.

Browse Source
This commit is contained in:
Robert Osfield
2014-01-16 17:26:35 +00:00
parent e8cd06c6e9
commit 706afaccae
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgVolume/MultipassTechnique.cpp
View File

@@ -22,7 +22,6 @@
#include <osg/Program>
#include <osg/Material>
#include <osg/CullFace>
#include <osg/TexGen>
#include <osg/Texture1D>
#include <osg/Texture2D>
#include <osg/Texture3D>
@@ -298,7 +297,6 @@ void MultipassTechnique::init()
osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
_volumeRenderStateSet = stateset;
unsigned int texgenTextureUnit = 0;
unsigned int volumeTextureUnit = 3;
// set up uniforms
@@ -342,22 +340,6 @@ void MultipassTechnique::init()
{
tf = dynamic_cast<osg::TransferFunction1D*>(cpv._tfProperty->getTransferFunction());
}
osg::ref_ptr<osg::TexGen> texgen = new osg::TexGen;
texgen->setMode(osg::TexGen::OBJECT_LINEAR);
texgen->setPlanesFromMatrix( geometryMatrix * osg::Matrix::inverse(imageMatrix));
if (masterLocator)
{
osg::ref_ptr<TexGenLocatorCallback> locatorCallback = new TexGenLocatorCallback(texgen, masterLocator, layerLocator);
masterLocator->addCallback(locatorCallback.get());
if (masterLocator != layerLocator)
{
if (layerLocator) layerLocator->addCallback(locatorCallback.get());
}
}
stateset->setTextureAttributeAndModes(texgenTextureUnit, texgen.get(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
}

2
src/osgVolume/VolumeScene.cpp
View File

@@ -138,7 +138,7 @@ VolumeScene::TileData* VolumeScene::tileVisited(osgUtil::CullVisitor* cv, osgVol
tileData->stateset = new osg::StateSet;
tileData->stateset->setTextureAttribute(2, tileData->depthTexture.get());
tileData->texgenUniform = new osg::Uniform("texgen2",osg::Matrixf());
tileData->texgenUniform = new osg::Uniform("texgen",osg::Matrixf());
tileData->stateset->addUniform(tileData->texgenUniform);
}