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

Change osgText so that the Text drawable now can have its own StateSet

Browse Source 
that users can assign to it without it being overriden.  If none is
assigned externally it now uses a StateSet associated wit the Font assigned
to the Text.
This commit is contained in:
Robert Osfield
2006-07-04 13:56:29 +00:00
parent e8a3444b88
commit 3ad5140942
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgText/Text.cpp
View File

@@ -89,6 +89,14 @@ void Text::setFont(Font* font)
{
if (_font==font) return;
osg::StateSet* previousFontStateSet = _font.valid() ? _font->getStateSet() : 0;
osg::StateSet* newFontStateSet = font ? font->getStateSet() : 0;
if (getStateSet() == previousFontStateSet)
{
setStateSet( newFontStateSet );
}
_font = font;
computeGlyphRepresentation();
@@ -699,8 +707,6 @@ void Text::computeGlyphRepresentation()
}
setStateSet(const_cast<osg::StateSet*>((*_textureGlyphQuadMap.begin()).first.get()));
computePositions();
computeColorGradients();
}
@@ -1443,6 +1449,7 @@ void Text::drawImplementation(osg::State& state) const
glPushAttrib(GL_POLYGON_OFFSET_FILL);
glEnable(GL_POLYGON_OFFSET_FILL);
}
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end();
++titr)
@@ -1505,8 +1512,13 @@ void Text::drawImplementation(osg::State& state) const
// Make sure that the main (foreground) text is on top
glPolygonOffset(-10, -10);
}
glDrawArrays(GL_QUADS,0,transformedCoords.size());
glPolygonOffset(0,0);
if(_backdropType != NONE)
{
glPolygonOffset(0,0);
}
}
}