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

Refactored to use a typedef of Font to Font3D rather than have a separate Font3D class

Browse Source
This commit is contained in:
Robert Osfield
2010-09-03 09:08:19 +00:00
parent 8c3e3055e7
commit ba10f56f86
20 changed files with 50 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgText/Text3D.cpp
View File

@@ -135,7 +135,7 @@ String::iterator Text3D::computeLastCharacterOnLine(osg::Vec2& cursor, String::i
return lastChar;
}
Glyph3D* glyph = _font->getGlyph(charcode);
Glyph3D* glyph = _font->getGlyph3D(charcode);
if (glyph)
{
const osg::BoundingBox & bb = glyph->getBoundingBox();
@@ -245,7 +245,7 @@ String::iterator Text3D::computeLastCharacterOnLine(osg::Vec2& cursor, String::i
// Subtract off glyphs from the cursor position (to correctly center text)
if(*prevChar != '-')
{
Glyph3D* glyph = _font->getGlyph(*prevChar);
Glyph3D* glyph = _font->getGlyph3D(*prevChar);
if (glyph)
{
switch(_layout)
@@ -316,7 +316,7 @@ void Text3D::computeGlyphRepresentation()
{
unsigned int charcode = *itr;
Glyph3D* glyph = _font->getGlyph(charcode);
Glyph3D* glyph = _font->getGlyph3D(charcode);
if (glyph)
{
const osg::BoundingBox & bb = glyph->getBoundingBox();