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

Improvements to SDF and outline generation

Browse Source
This commit is contained in:
Robert Osfield
2017-09-26 10:42:47 +01:00
parent 708ae1c076
commit 6d4128324b
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgText/Text.cpp
View File

@@ -90,6 +90,7 @@ osg::StateSet* Text::createStateSet()
defineList["BACKDROP_COLOR"] = osg::StateSet::DefinePair(ss.str(), osg::StateAttribute::ON);
if (_backdropType==OUTLINE)
{
ss.str("");
@@ -121,7 +122,7 @@ osg::StateSet* Text::createStateSet()
}
if (_fontSize.second>8)
if (_fontSize.second>16/* && _backdropImplementation==USE_SHADERS*/)
{
OSG_NOTICE<<"Requesting SDF support _fontSize.second="<<_fontSize.second<<std::endl;
defineList["SIGNED_DISTNACE_FIELD"] = osg::StateSet::DefinePair("1", osg::StateAttribute::ON);
@@ -150,7 +151,7 @@ osg::StateSet* Text::createStateSet()
{
if ((*itr)->getDefineList()==defineList)
{
// OSG_NOTICE<<"Text::createStateSet() : Matched DefineList, return StateSet "<<itr->get()<<std::endl;
OSG_NOTICE<<"Text::createStateSet() : Matched DefineList, return StateSet "<<itr->get()<<std::endl;
return itr->get();
}
else
@@ -159,7 +160,7 @@ osg::StateSet* Text::createStateSet()
}
}
// OSG_NOTICE<<"Text::createStateSet() : Not Matched DefineList, creating new StateSet"<<std::endl;
OSG_NOTICE<<"Text::createStateSet() : Not Matched DefineList, creating new StateSet"<<std::endl;
osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
@@ -463,6 +464,8 @@ void Text::computeGlyphRepresentation()
float hr = _characterHeight;
float wr = hr/getCharacterAspectRatio();
float texelMargin = 5.0f;
for(String::iterator itr=_text.begin();
itr!=_text.end();
)
@@ -630,8 +633,6 @@ void Text::computeGlyphRepresentation()
osg::Vec2 maxtc = glyph->getMaxTexCoord();
osg::Vec2 vDiff = maxtc - mintc;
float texelMargin = 5.0f;
float fHorizTCMargin = texelMargin / glyph->getTexture()->getTextureWidth();
float fVertTCMargin = texelMargin / glyph->getTexture()->getTextureHeight();
float fHorizQuadMargin = vDiff.x() == 0.0f ? 0.0f : width * fHorizTCMargin / vDiff.x();