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

Moved the 't' operation on texture modes across to use the new

Browse Source 
StateSet::setTextureMode methods, this enables 't' to work once more!
This commit is contained in:
Robert Osfield
2002-07-18 19:54:22 +00:00
parent 53be9bee49
commit 325b119218
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgGLUT/Viewer.cpp
View File

@@ -996,7 +996,7 @@ void Viewer::keyboard(unsigned char key, int x, int y)
texture = 1 - texture;
if (texture)
{
globalStateSet->setModeToInherit(GL_TEXTURE_2D);
globalStateSet->setTextureModeToInherit(0,GL_TEXTURE_2D);
// globalStateSet->setAttributeToInherit(osg::StateAttribute::TEXTURE);
}
else
@@ -1004,9 +1004,9 @@ void Viewer::keyboard(unsigned char key, int x, int y)
// use blank texture to override all local texture in scene graph.
// thus causing them to all use the same texture attribute, hence
// preventing a state attribute change due to unused textures.
static osg::ref_ptr<osg::Texture> blank_texture = osgNew osg::Texture;
globalStateSet->setMode(GL_TEXTURE_2D,osg::StateAttribute::OVERRIDE_OFF);
// globalStateSet->setAttribute(blank_texture.get(),true);
globalStateSet->setTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::OVERRIDE_OFF);
// static osg::ref_ptr<osg::Texture> blank_texture = osgNew osg::Texture;
// globalStateSet->setTextureAttribute(0,blank_texture.get());
}
break;