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

Merge pull request #437 from filnet/text_typo

Browse Source 
osgText: fix typos related to SIGNED_DISTANCE_FIELD
This commit is contained in:
OpenSceneGraph git repository 2018-01-11 14:32:53 +00:00 committed by GitHub
commit bfbae8ad12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgText/Text.cpp
View File

@ -157,7 +157,7 @@ osg::StateSet* Text::createStateSet()
if (_shaderTechnique>GREYSCALE) 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 #if 0

6
src/osgText/shaders/text_frag.cpp
View File

@ -1,11 +1,11 @@
char text_frag[] = "$OSG_GLSL_VERSION\n" char text_frag[] = "$OSG_GLSL_VERSION\n"
"\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" "\n"
"#ifdef GL_ES\n" "#ifdef GL_ES\n"
" #extension GL_OES_standard_derivatives : enable\n" " #extension GL_OES_standard_derivatives : enable\n"
" #ifndef GL_OES_standard_derivatives\n" " #ifndef GL_OES_standard_derivatives\n"
" #undef SIGNED_DISTNACE_FIELD\n" " #undef SIGNED_DISTANCE_FIELD\n"
" #endif\n" " #endif\n"
"#endif\n" "#endif\n"
"\n" "\n"
@ -55,7 +55,7 @@ char text_frag[] = "$OSG_GLSL_VERSION\n"
"const float GLYPH_DIMENSION = 32.0;\n" "const float GLYPH_DIMENSION = 32.0;\n"
"#endif\n" "#endif\n"
"\n" "\n"
"#ifdef SIGNED_DISTNACE_FIELD\n" "#ifdef SIGNED_DISTANCE_FIELD\n"
"\n" "\n"
"float distanceFromEdge(vec2 tc)\n" "float distanceFromEdge(vec2 tc)\n"
"{\n" "{\n"