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

Moved shader file loading to a help function

Browse Source
This commit is contained in:
Robert Osfield 2016-10-20 09:59:26 +01:00
parent c32e6c01ed
commit b5c071eed9
1 changed files with 38 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
examples/osgshaderpipeline/osgshaderpipeline.cpp
View File

@ -19,6 +19,40 @@
#include <iostream> #include <iostream>
bool readShaderArguments(osg::ArgumentParser& arguments, const std::string& option, osg::Program* program, const std::string& fallbackShaderFilename)
{
bool shaderAssigned = false;
std::string shaderFilename;
while(arguments.read(option, shaderFilename))
{
osg::ref_ptr<osg::Shader> shader = osgDB::readRefShaderFile(shaderFilename);
if (shader)
{
shaderAssigned = true;
program->addShader(shader);
}
else
{
OSG_NOTICE<<"Unable to load shader file : "<<shaderFilename<<std::endl;
}
}
if (shaderAssigned) return true;
osg::ref_ptr<osg::Shader> shader = osgDB::readRefShaderFile(fallbackShaderFilename);
if (shader)
{
shaderAssigned = true;
program->addShader(shader);
return true;
}
else
{
OSG_NOTICE<<"Unable to load shader file : "<<fallbackShaderFilename<<std::endl;
return false;
}
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// use an ArgumentParser object to manage the program arguments. // use an ArgumentParser object to manage the program arguments.
@ -36,70 +70,14 @@ int main(int argc, char** argv)
osg::ref_ptr<osg::Program> program = new osg::Program; osg::ref_ptr<osg::Program> program = new osg::Program;
bool vertexShadersAssigned = false; if (!readShaderArguments(arguments, "--vert", program, "shaders/shaderpipeline.vert"))
std::string vertexShaderFilename;
while(arguments.read("--vert", vertexShaderFilename))
{ {
osg::ref_ptr<osg::Shader> vertexShader = osgDB::readRefShaderFile(vertexShaderFilename); return 1;
if (vertexShader)
{
vertexShadersAssigned = true;
program->addShader(vertexShader);
}
else
{
OSG_NOTICE<<"Unable to load vertex shader file : "<<vertexShaderFilename<<std::endl;
}
} }
if (!vertexShadersAssigned) if (!readShaderArguments(arguments, "--frag", program, "shaders/shaderpipeline.frag"))
{ {
vertexShaderFilename = "shaders/shaderpipeline.vert"; return 1;
osg::ref_ptr<osg::Shader> vertexShader = osgDB::readRefShaderFile(vertexShaderFilename);
if (vertexShader)
{
vertexShadersAssigned = true;
program->addShader(vertexShader);
}
else
{
OSG_NOTICE<<"Unable to load vertex shader file : "<<vertexShaderFilename<<std::endl;
return 1;
}
}
bool fragmentShadersAssigned = false;
std::string fragmentShaderFilename;
while(arguments.read("--frag", fragmentShaderFilename))
{
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(fragmentShaderFilename);
if (fragmentShader)
{
fragmentShadersAssigned = true;
program->addShader(fragmentShader);
}
else
{
OSG_NOTICE<<"Unable to load fragment shader file : "<<fragmentShaderFilename<<std::endl;
}
}
if (!fragmentShadersAssigned)
{
fragmentShaderFilename = "shaders/shaderpipeline.frag";
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(fragmentShaderFilename);
if (fragmentShader)
{
fragmentShadersAssigned = true;
program->addShader(fragmentShader);
}
else
{
OSG_NOTICE<<"Unable to load fragment shader file : "<<fragmentShaderFilename<<std::endl;
return 1;
}
} }
// assign program to topmost StateSet // assign program to topmost StateSet