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

From Csaba Halasz and Robert Osfield, support for passing in ReaderWriter::Options object into readFontFile

Browse Source
This commit is contained in:
Robert Osfield
2007-07-02 12:30:14 +00:00
parent c7a316e445
commit 19d1a563fe
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/osgText/Font
View File

@@ -23,14 +23,13 @@
#include <osg/StateSet>
#include <osg/buffered_value>
#include <osg/TexEnv>
#include <osgDB/ReaderWriter>
#include <osgText/Export>
namespace osgText {
class Font;
class Text;
enum KerningType
{
KERNING_DEFAULT, //default locked to integer kerning values
@@ -57,10 +56,10 @@ enum KerningType
* If the given file could not be found, the path part will be stripped and
* the file will be searched again in the OS specific directories.
*/
extern OSGTEXT_EXPORT Font* readFontFile(const std::string& filename);
extern OSGTEXT_EXPORT Font* readFontFile(const std::string& filename, const osgDB::ReaderWriter::Options* userOptions = 0);
/** read a font from specified stream.*/
extern OSGTEXT_EXPORT Font* readFontStream(std::istream& stream);
extern OSGTEXT_EXPORT Font* readFontStream(std::istream& stream, const osgDB::ReaderWriter::Options* userOptions = 0);
extern OSGTEXT_EXPORT std::string findFontFile(const std::string& str);