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

Moved osgText::GlyphTechnique::Features enum to osgText::ShaderTechinque enum to make it's roll clearer

Browse Source
This commit is contained in:
Robert Osfield
2017-10-20 17:03:25 +01:00
parent 6b75439ae4
commit 97aeb16551
8 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgText/Font
View File

@@ -108,8 +108,8 @@ public:
virtual bool getVerticalSize(float& ascender, float& descender) const { return _implementation ? _implementation->getVerticalSize(ascender, descender) : false; }
void setGyphTextureFeatures(GlyphTexture::Features features) { _glyphTextureFeatures = features; }
GlyphTexture::Features getGlyphTextureFeatures() const { return _glyphTextureFeatures; }
void setShaderTechnique(ShaderTechnique features) { _shaderTechnique = features; }
ShaderTechnique getShaderTechnique() const { return _shaderTechnique; }
/** Set the size of texture to create to store the glyph images when rendering.
@@ -186,7 +186,7 @@ protected:
// current active size of font
FontResolution _fontSize;
GlyphTexture::Features _glyphTextureFeatures;
ShaderTechnique _shaderTechnique;
unsigned int _textureWidthHint;
unsigned int _textureHeightHint;

25
include/osgText/Glyph
View File

@@ -38,6 +38,13 @@ class Glyph3D;
class GlyphGeometry;
class GlyphTexture;
enum ShaderTechnique
{
GREYSCALE = 0x1,
SIGNED_DISTANCE_FIELD = 0x2,
ALL_FEATURES = GREYSCALE | SIGNED_DISTANCE_FIELD
};
class OSGTEXT_EXPORT Glyph : public osg::Image
{
public:
@@ -251,15 +258,9 @@ public:
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
virtual int compare(const osg::StateAttribute& rhs) const;
enum Features
{
GREYSCALE,
SIGNED_DISTANCE_FIELD,
ALL_FEATURES
};
void setShaderTechnique(ShaderTechnique technique) { _shaderTechnique = technique; }
void setGlyphTextureFeatures(Features features) { _glyphTextureFeatures = features; }
Features getGlyphTextureFeatures() const { return _glyphTextureFeatures; }
ShaderTechnique getShaderTechnique() const { return _shaderTechnique; }
int getEffectMargin(const Glyph* glyph);
@@ -284,11 +285,11 @@ protected:
void copyGlyphImage(Glyph* glyph);
Features _glyphTextureFeatures;
ShaderTechnique _shaderTechnique;
int _usedY;
int _partUsedX;
int _partUsedY;
int _usedY;
int _partUsedX;
int _partUsedY;
typedef std::vector< osg::ref_ptr<Glyph> > GlyphRefList;
typedef std::vector< const Glyph* > GlyphPtrList;