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

39
src/osgText/Glyph.cpp
View File

@@ -164,7 +164,8 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
int upper = glyph->t()+search_distance;
float multiplier = 1.0/255.0f;
float max_distance = sqrtf(float(search_distance*search_distance)*2.0f);
float max_distance = glyph->getFontResolution().first/4;
int num_channels = TEXTURE_IMAGE_NUM_CHANNELS;
@@ -177,8 +178,12 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
bool use_SDF_for_Outline = true;
float outer_outline_distance = float(search_distance);
float inner_outline_distance = float(outer_outline_distance)/2.0f;
float outer_outline_distance = float(glyph->getFontResolution().first)*0.14f;
float inner_outline_distance = outer_outline_distance*0.5f;
unsigned char full_on = 255;
unsigned char mid_point = full_on/2;
float mid_point_f = float(mid_point)*multiplier;
for(int dr=lower; dr<=upper; ++dr)
{
@@ -195,19 +200,19 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
float center_value_f = center_value*multiplier;
float min_distance = FLT_MAX;
if (center_value>0 && center_value<255)
if (center_value>0 && center_value<full_on)
{
inner_max_value = 255;
outer_max_value = 255;
if (center_value_f>=0.5f)
if (center_value_f>=mid_point_f)
{
min_distance = center_value_f-0.5f;
min_distance = center_value_f-mid_point_f;
value = 128+(min_distance/max_distance)*127;
}
else
{
min_distance = 0.5f-center_value_f;
min_distance = mid_point_f-center_value_f;
value = 127-(min_distance/max_distance)*127;
}
}
@@ -235,8 +240,8 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
float local_multiplier = (abs(dx)>abs(dy)) ? D/float(abs(dx)) : D/float(abs(dy));
float local_distance = sqrtf(float(radius*radius)+float(span*span));
if (center_value==0) local_distance += (0.5f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - 0.5f)*local_multiplier;
if (center_value==0) local_distance += (mid_point_f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - mid_point_f)*local_multiplier;
if (local_distance<min_distance) min_distance = local_distance;
@@ -263,8 +268,8 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
float local_multiplier = (abs(dx)>abs(dy)) ? D/float(abs(dx)) : D/float(abs(dy));
float local_distance = sqrtf(float(radius*radius)+float(span*span));
if (center_value==0) local_distance += (0.5f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - 0.5f)*local_multiplier;
if (center_value==0) local_distance += (mid_point_f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - mid_point_f)*local_multiplier;
if (local_distance<min_distance) min_distance = local_distance;
@@ -292,8 +297,8 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
float local_distance = sqrtf(float(radius*radius)+float(span*span));
if (center_value==0) local_distance += (0.5f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - 0.5f)*local_multiplier;
if (center_value==0) local_distance += (mid_point_f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - mid_point_f)*local_multiplier;
if (local_distance<min_distance) min_distance = local_distance;
@@ -320,8 +325,8 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
float local_multiplier = (abs(dx)>abs(dy)) ? D/float(abs(dx)) : D/float(abs(dy));
float local_distance = sqrtf(float(radius*radius)+float(span*span));
if (center_value==0) local_distance += (0.5f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - 0.5f)*local_multiplier;
if (center_value==0) local_distance += (mid_point_f-local_value_f)*local_multiplier;
else local_distance += (local_value_f - mid_point_f)*local_multiplier;
if (local_distance<min_distance) min_distance = local_distance;
@@ -349,7 +354,7 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
// signed distance field value
*(dest_ptr++) = value;
float outline_distance = max_distance/3.0f;
float outline_distance = inner_outline_distance;
// compute the alpha value of outline, one texel thick
unsigned char outline = 0;
@@ -376,7 +381,7 @@ void GlyphTexture::copyGlyphImage(Glyph* glyph)
*(dest_ptr++) = outline;
outline_distance *= 2.0f;
outline_distance = outer_outline_distance;
// compute the alpha value of outline, one texel thick
outline = 0;

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();