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

Added a _fontFallback to TextBase to cache any fallback font (usually DefaultFont) that is used when the Textbase::_font is null.

Browse Source
This commit is contained in:
Robert Osfield
2019-07-31 14:11:59 +01:00
parent 92abaca210
commit 149c04b0df
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgText/Text.cpp
View File

@@ -249,12 +249,11 @@ osg::StateSet* Text::createStateSet()
Font* Text::getActiveFont()
{
return _font.valid() ? _font.get() : Font::getDefaultFont().get();
}
if (_font.valid()) return _font.get();
const Font* Text::getActiveFont() const
{
return _font.valid() ? _font.get() : Font::getDefaultFont().get();
if (!_fontFallback) _fontFallback = Font::getDefaultFont();
return _fontFallback.get();
}
String::iterator Text::computeLastCharacterOnLine(osg::Vec2& cursor, String::iterator first,String::iterator last)