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

Moved the

Browse Source 
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON);

into the #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) block to solve problems under GLES and GL3.x/GL4.x
This commit is contained in:
Robert Osfield 2012-02-23 17:51:40 +00:00
parent 6d351ba237
commit b4155dd817
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgText/Text.cpp
View File

@ -1211,12 +1211,8 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie
unsigned int contextID = state.getContextID(); unsigned int contextID = state.getContextID();
state.applyMode(GL_BLEND,true); state.applyMode(GL_BLEND,true);
#if 1
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON);
#else
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::OFF);
#endif
#if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON);
state.applyTextureAttribute(0,getActiveFont()->getTexEnv()); state.applyTextureAttribute(0,getActiveFont()->getTexEnv());
#endif #endif
if (_characterSizeMode!=OBJECT_COORDS || _autoRotateToScreen) if (_characterSizeMode!=OBJECT_COORDS || _autoRotateToScreen)
@ -1350,12 +1346,8 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie
} }
} }
#if 1
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON);
#else
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::OFF);
#endif
#if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON);
state.applyTextureAttribute(0,getActiveFont()->getTexEnv()); state.applyTextureAttribute(0,getActiveFont()->getTexEnv());
#endif #endif