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

Renamed text.vert and text.frag to osgText_Text.vert and .frag to avoid name overlapping with user shaders.

Browse Source
This commit is contained in:
Robert Osfield
2018-04-26 09:36:52 +01:00
parent cea33e40df
commit 1daacced5a
5 changed files with 292 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgText/Text.cpp
View File

@@ -231,17 +231,17 @@ osg::StateSet* Text::createStateSet()
stateset->setAttributeAndModes(program.get());
{
DEBUG_MESSAGE<<"Using shaders/text.vert"<<std::endl;
DEBUG_MESSAGE<<"Using shaders/osgText_Text.vert"<<std::endl;
#include "shaders/text_vert.cpp"
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::VERTEX, "shaders/text.vert", text_vert));
#include "shaders/osgText_Text_vert.cpp"
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::VERTEX, "shaders/osgText_Text.vert", osgText_Text_vert));
}
{
DEBUG_MESSAGE<<"Using shaders/text.frag"<<std::endl;
DEBUG_MESSAGE<<"Using shaders/osgText_Text.frag"<<std::endl;
#include "shaders/text_frag.cpp"
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::FRAGMENT, "shaders/text.frag", text_frag));
#include "shaders/osgText_Text_frag.cpp"
program->addShader(osgDB::readRefShaderFileWithFallback(osg::Shader::FRAGMENT, "shaders/osgText_Text.frag", osgText_Text_frag));
}
return stateset.release();