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

Fixed GL3 core profile and shandard shaders to work with new osgText

Browse Source
This commit is contained in:
Robert Osfield
2017-03-17 19:00:33 +00:00
parent 943beb220d
commit 2ef8f00e91
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/osgtext/osgtext.cpp
View File

@@ -64,7 +64,8 @@ static const char *gl3TextFragmentShader = {
"out vec4 color;\n"
"void main(void)\n"
"{\n"
" color = vertexColor * texture(glyphTexture, texCoord).rrrr;\n"
" if (texCoord.x>=0.0) color = vertexColor * vec4(1.0, 1.0, 1.0, texture(glyphTexture, texCoord).r);\n"
" else color = vertexColor;\n"
"}\n"
};
#endif
@@ -87,7 +88,7 @@ static const char* fragmentShader = {
"varying vec4 vertexColor;\n"
"void main(void)\n"
"{\n"
" if (texCoord.x>=0.0) gl_FragColor = vertexColor * vec4(1.0, 1.0, 1.0, texture(glyphTexture, texCoord).a);\n"
" if (texCoord.x>=0.0) gl_FragColor = vertexColor * vec4(1.0, 1.0, 1.0, texture(glyphTexture, texCoord).r);\n"
" else gl_FragColor = vertexColor;\n"
"}\n"
};
@@ -110,7 +111,7 @@ osg::Group* createHUDText()
osg::Program* program = new osg::Program;
program->addShader(new osg::Shader(osg::Shader::VERTEX, gl3TextVertexShader));
program->addShader(new osg::Shader(osg::Shader::FRAGMENT, gl3TextFragmentShader));
geode->getOrCreateStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON);
rootNode->getOrCreateStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON);
#endif
float windowHeight = 1024.0f;