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

Merge pull request #352 from remoe/patch-3

Browse Source 
addShader fix
This commit is contained in:
OpenSceneGraph git repository
2017-09-22 07:56:30 +01:00
committed by GitHub
parent b6bb0caf8d 49c336e514
commit e2d20a337d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgText/Text.cpp
View File

@@ -204,14 +204,14 @@ osg::StateSet* Text::createStateSet()
OSG_NOTICE<<"Using shaders/text_greyscale.frag"<<std::endl;
#include "shaders/text_greyscale_frag.cpp"
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::VERTEX, "shaders/text_greyscale.frag", text_greyscale_frag));
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::FRAGMENT, "shaders/text_greyscale.frag", text_greyscale_frag));
}
else
{
OSG_NOTICE<<"Using shaders/text_sdf.frag"<<std::endl;
#include "shaders/text_sdf_frag.cpp"
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::VERTEX, "shaders/text_sdf.frag", text_sdf_frag));
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::FRAGMENT, "shaders/text_sdf.frag", text_sdf_frag));
}
return stateset.release();