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

Fixed bug related to clean up of text fonts.

Browse Source
This commit is contained in:
Robert Osfield
2006-10-03 11:14:34 +00:00
parent 392232ec06
commit 7c6b528588
10 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgText/Font.cpp
View File

@@ -256,12 +256,14 @@ Font::Glyph* Font::getGlyph(unsigned int charcode)
void Font::releaseGLObjects(osg::State* state) const
{
for(GlyphTextureList::const_iterator itr=_glyphTextureList.begin();
itr!=_glyphTextureList.end();
++itr)
{
(*itr)->releaseGLObjects(state);
}
for(GlyphTextureList::const_iterator itr=_glyphTextureList.begin();
itr!=_glyphTextureList.end();
++itr)
{
(*itr)->releaseGLObjects(state);
}
const_cast<Font*>(this)->_glyphTextureList.clear();
const_cast<Font*>(this)->_sizeGlyphMap.clear();
}
osg::Vec2 Font::getKerning(unsigned int leftcharcode,unsigned int rightcharcode, KerningType kerningType)
@@ -280,12 +282,8 @@ bool Font::hasVertical() const
void Font::addGlyph(unsigned int width, unsigned int height, unsigned int charcode, Glyph* glyph)
{
//cout << "charcode "<<(char)charcode<<" "<<&_glyphTextureList<<endl;
_sizeGlyphMap[SizePair(width,height)][charcode]=glyph;
int posX=0,posY=0;
GlyphTexture* glyphTexture = 0;