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

Further work on new 3D text support

Browse Source
This commit is contained in:
Robert Osfield
2010-09-06 15:43:59 +00:00
parent 32db4d6a98
commit a6abbb545e
10 changed files with 109 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/osgText/Text3D
View File

@@ -16,8 +16,7 @@
#include <osgText/TextBase>
#include <osgText/Font3D>
#include <osgText/Font>
namespace osgText {
@@ -75,11 +74,7 @@ public:
/** Set the Font to use to render the text.
* setFont(0) sets the use of the default font.*/
inline void setFont(Font3D* font=0) { setFont(osg::ref_ptr<Font3D>(font)); };
/** Set the Font to use to render the text.*/
void setFont(osg::ref_ptr<Font3D> font);
void setFont(Font* font);
/** Set the font, loaded from the specified front file, to use to render the text,
* setFont("") sets the use of the default font.
@@ -87,7 +82,7 @@ public:
void setFont(const std::string& fontfile);
/** Get the font. Return 0 if default is being used.*/
const Font3D* getFont() const { return _font.get(); }
const Font* getFont() const { return _font.get(); }
@@ -156,7 +151,7 @@ protected:
TextRenderInfo _textRenderInfo;
osg::ref_ptr<Font3D> _font;
osg::ref_ptr<Font> _font;
float _characterDepth;