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

From Serge Lages, introduce readRef*File() methods which pass back ref_ptr<> rather than C pointers.

Browse Source
This commit is contained in:
Robert Osfield
2007-12-12 17:04:48 +00:00
parent 88f3a864ac
commit 256391c3b4
10 changed files with 248 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgText/Font
View File

@@ -59,6 +59,10 @@ extern OSGTEXT_EXPORT Font* readFontFile(const std::string& filename, const osgD
/** read a font from specified stream.*/
extern OSGTEXT_EXPORT Font* readFontStream(std::istream& stream, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT osg::ref_ptr<Font> readRefFontFile(const std::string& filename, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT osg::ref_ptr<Font> readRefFontStream(std::istream& stream, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT std::string findFontFile(const std::string& str);
/** Pure virtual base class for fonts.

4
include/osgText/Font3D
View File

@@ -54,6 +54,10 @@ extern OSGTEXT_EXPORT Font3D* readFont3DFile(const std::string& filename, const
/** read a font from specified stream.*/
extern OSGTEXT_EXPORT Font3D* readFont3DStream(std::istream& stream, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT osg::ref_ptr<Font3D> readRefFont3DFile(const std::string& filename, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT osg::ref_ptr<Font3D> readRefFont3DStream(std::istream& stream, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT std::string findFont3DFile(const std::string& str);
/** Pure virtual base class for fonts.