Added TexEnv object into Font and apply this in Text::drawImplementation to make

sure that a valid TexEnv is applied
This commit is contained in:
Robert Osfield
2006-08-28 19:37:40 +00:00
parent c8e7a9ea40
commit 6be6bc2eaa
3 changed files with 8 additions and 2 deletions

View File

@@ -142,9 +142,8 @@ Font::Font(FontImplementation* implementation):
{
setImplementation(implementation);
_texenv = new osg::TexEnv;
_stateset = new osg::StateSet;
//_stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
//_stateset->setTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON);
_stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
}

View File

@@ -18,6 +18,7 @@
#include <osg/GL>
#include <osg/Notify>
#include <osg/PolygonOffset>
#include <osg/TexEnv>
#include <osgUtil/CullVisitor>
@@ -1452,6 +1453,7 @@ void Text::drawImplementation(osg::State& state) const
state.applyMode(GL_BLEND,true);
state.applyTextureMode(0,GL_TEXTURE_2D,true);
state.applyTextureAttribute(0,getActiveFont()->getTexEnv());
if (_characterSizeMode!=OBJECT_COORDS || _autoRotateToScreen)
{