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

To control the GlyphTexture Min/MagFilter values Added --min <value> and --mag <value> filter with LINEAR, NEAREST and LINEAR_MIPMAP_LINER options for values

Browse Source
This commit is contained in:
Robert Osfield 2017-09-06 10:40:05 +01:00
parent 07a8d082e4
commit 20ee12e986
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/osgfont/osgfont.cpp
View File

@ -65,6 +65,8 @@ struct TextSettings
{ {
TextSettings(): TextSettings():
fontFilename("fonts/arial.ttf"), fontFilename("fonts/arial.ttf"),
minFilter(osg::Texture::LINEAR_MIPMAP_LINEAR),
magFilter(osg::Texture::LINEAR),
glyphImageMargin(1), glyphImageMargin(1),
glyphImageMarginRatio(0.02), glyphImageMarginRatio(0.02),
glyphInterval(1), glyphInterval(1),
@ -75,6 +77,14 @@ struct TextSettings
{ {
} }
void readFilterMode(const std::string& value, osg::Texture::FilterMode& filterMode)
{
if (value=="LINEAR") filterMode = osg::Texture::LINEAR;
if (value=="NEAREST") filterMode = osg::Texture::NEAREST;
if (value=="LINEAR_MIPMAP_LINEAR") filterMode = osg::Texture::LINEAR_MIPMAP_LINEAR;
}
void read(osg::ArgumentParser& arguments) void read(osg::ArgumentParser& arguments)
{ {
if (arguments.read("--test")) if (arguments.read("--test"))
@ -94,6 +104,10 @@ struct TextSettings
if (arguments.read("--font",fontFilename)) {} if (arguments.read("--font",fontFilename)) {}
std::string value;
if (arguments.read("--min", value)) { readFilterMode(value, minFilter); }
if (arguments.read("--mag", value)) { readFilterMode(value, magFilter); }
if (arguments.read("--margin", glyphImageMargin)) {} if (arguments.read("--margin", glyphImageMargin)) {}
if (arguments.read("--margin-ratio", glyphImageMarginRatio)) {} if (arguments.read("--margin-ratio", glyphImageMarginRatio)) {}
@ -123,6 +137,8 @@ struct TextSettings
} }
std::string fontFilename; std::string fontFilename;
osg::Texture::FilterMode minFilter;
osg::Texture::FilterMode magFilter;
unsigned int glyphImageMargin; unsigned int glyphImageMargin;
float glyphImageMarginRatio; float glyphImageMarginRatio;
int glyphInterval; int glyphInterval;
@ -144,6 +160,8 @@ osgText::Text* createLabel(const std::string& l, TextSettings& settings, unsigne
font->setGlyphImageMargin(settings.glyphImageMargin); font->setGlyphImageMargin(settings.glyphImageMargin);
font->setGlyphImageMarginRatio(settings.glyphImageMarginRatio); font->setGlyphImageMarginRatio(settings.glyphImageMarginRatio);
font->setMinFilterHint(settings.minFilter);
font->setMagFilterHint(settings.magFilter);
settings.setText(*label); settings.setText(*label);