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

Merged TextBase fixed from OpenSceneGraph-3.6 commit 149c04b0df

Browse Source
This commit is contained in:
Robert Osfield 2019-07-31 14:30:47 +01:00
parent 2b5e659973
commit fd8019c886
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osgText/Text
View File

@ -265,7 +265,6 @@ protected:
virtual osg::StateSet* createStateSet();
Font* getActiveFont();
const Font* getActiveFont() const;
String::iterator computeLastCharacterOnLine(osg::Vec2& cursor, String::iterator first,String::iterator last);

1
include/osgText/TextBase
View File

@ -312,6 +312,7 @@ protected:
// members which have public access.
osg::Vec4 _color;
osg::ref_ptr<Font> _font;
osg::ref_ptr<Font> _fontFallback;
osg::ref_ptr<Style> _style;
FontResolution _fontSize;
float _characterHeight;

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)