Permalink
Browse files

Merge pull request #437 from filnet/text_typo

osgText: fix typos related to SIGNED_DISTANCE_FIELD
  • Loading branch information...
openscenegraph committed Jan 11, 2018
2 parents e84c93d + 3e12972 commit bfbae8ad1210ff3eb4e010f98acb55d219215664
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/osgText/Text.cpp
  2. +3 −3 src/osgText/shaders/text_frag.cpp
View
@@ -157,7 +157,7 @@ osg::StateSet* Text::createStateSet()
if (_shaderTechnique>GREYSCALE)
{
defineList["SIGNED_DISTNACE_FIELD"] = osg::StateSet::DefinePair("1", osg::StateAttribute::ON);
defineList["SIGNED_DISTANCE_FIELD"] = osg::StateSet::DefinePair("1", osg::StateAttribute::ON);
}
#if 0
@@ -1,11 +1,11 @@
char text_frag[] = "$OSG_GLSL_VERSION\n"
"\n"
"#pragma import_defines( BACKDROP_COLOR, SHADOW, OUTLINE, SIGNED_DISTNACE_FIELD, TEXTURE_DIMENSION, GLYPH_DIMENSION)\n"
"#pragma import_defines( BACKDROP_COLOR, SHADOW, OUTLINE, SIGNED_DISTANCE_FIELD, TEXTURE_DIMENSION, GLYPH_DIMENSION)\n"
"\n"
"#ifdef GL_ES\n"
" #extension GL_OES_standard_derivatives : enable\n"
" #ifndef GL_OES_standard_derivatives\n"
" #undef SIGNED_DISTNACE_FIELD\n"
" #undef SIGNED_DISTANCE_FIELD\n"
" #endif\n"
"#endif\n"
"\n"
@@ -55,7 +55,7 @@ char text_frag[] = "$OSG_GLSL_VERSION\n"
"const float GLYPH_DIMENSION = 32.0;\n"
"#endif\n"
"\n"
"#ifdef SIGNED_DISTNACE_FIELD\n"
"#ifdef SIGNED_DISTANCE_FIELD\n"
"\n"
"float distanceFromEdge(vec2 tc)\n"
"{\n"

0 comments on commit bfbae8a

Please sign in to comment.