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

Changed Font::setSize to Font::setFontResolution

Browse Source
This commit is contained in:
Robert Osfield
2005-01-27 11:10:50 +00:00
parent 67a5a020bf
commit a086a6d01b
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgText/Text.cpp
View File

@@ -257,7 +257,7 @@ String::iterator Text::computeLastCharacterOnLine(osg::Vec2 cursor, String::iter
Font* activefont = getActiveFont();
if (!activefont) return last;
float hr = _characterHeight/(float)activefont->getHeight();
float hr = _characterHeight/(float)activefont->getFontHeight();
float wr = hr/_characterAspectRatio;
bool horizontal = _layout!=VERTICAL;
@@ -370,9 +370,9 @@ void Text::computeGlyphRepresentation()
bool horizontal = _layout!=VERTICAL;
bool kerning = true;
activefont->setSize(_fontWidth,_fontHeight);
activefont->setFontResolution(_fontWidth,_fontHeight);
float hr = _characterHeight/(float)activefont->getHeight();
float hr = _characterHeight/(float)activefont->getFontHeight();
float wr = hr/_characterAspectRatio;
std::set<unsigned int> deliminatorSet;