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

Added TexEnv object into Font and apply this in Text::drawImplementation to make

Browse Source 
sure that a valid TexEnv is applied
This commit is contained in:
Robert Osfield
2006-08-28 19:37:40 +00:00
parent c8e7a9ea40
commit 6be6bc2eaa
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgText/Font
View File

@@ -22,6 +22,7 @@
#include <osg/Texture2D>
#include <osg/StateSet>
#include <osg/buffered_value>
#include <osg/TexEnv>
#include <osgText/Export>
@@ -87,6 +88,9 @@ public:
virtual std::string getFileName() const;
void setTexEnv(osg::TexEnv* texenv) { if (texenv) _texenv = texenv; }
inline osg::TexEnv* getTexEnv() { return _texenv.get(); }
inline const osg::TexEnv* getTexEnv() const { return _texenv.get(); }
void setStateSet(osg::StateSet* stateset) { _stateset = stateset; }
osg::StateSet* getStateSet() { return _stateset.get(); }
@@ -157,6 +161,7 @@ protected:
typedef std::map< SizePair, GlyphMap > SizeGlyphMap;
osg::ref_ptr<osg::TexEnv> _texenv;
osg::ref_ptr<osg::StateSet> _stateset;
SizeGlyphMap _sizeGlyphMap;
GlyphTextureList _glyphTextureList;