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

Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation

Browse Source
This commit is contained in:
Robert Osfield 2018-04-05 14:14:49 +01:00
parent 4cb697205e
commit 914e60a872
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/osgDB/ReadFile
View File

@ -197,13 +197,7 @@ inline osg::ref_ptr<osg::Shader> readRefShaderFile(osg::Shader::Type type, const
* The osgDB::Registry is used to load the appropriate ReaderWriter plugin
* for the filename extension, and this plugin then handles the request
* to read the specified file.*/
inline osg::ref_ptr<osg::Shader> readRefShaderFileWithFallback(osg::Shader::Type type, const std::string& filename, const Options* options, const char* fallback)
{
osg::ref_ptr<osg::Shader> shader = readRefShaderFile(filename, options);
if (shader.valid() && type != osg::Shader::UNDEFINED) shader->setType(type);
if (!shader) shader = new osg::Shader(type, fallback);
return shader;
}
osg::ref_ptr<osg::Shader> readRefShaderFileWithFallback(osg::Shader::Type type, const std::string& filename, const Options* options, const char* fallback);
/** Read an osg::Shader from file and set to specified shader type, if a shader isn't loaded fallback to specific shader source.
* The osgDB::Registry is used to load the appropriate ReaderWriter plugin

2
src/osg/Drawable.cpp
View File

@ -693,7 +693,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
VertexArrayState* Drawable::createVertexArrayStateImplementation(RenderInfo& renderInfo) const
{
OSG_NOTICE<<"VertexArrayState* Drawable::createVertexArrayStateImplementation(RenderInfo& renderInfo) const "<<this<<std::endl;
OSG_INFO<<"VertexArrayState* Drawable::createVertexArrayStateImplementation(RenderInfo& renderInfo) const "<<this<<std::endl;
VertexArrayState* vos = new osg::VertexArrayState(renderInfo.getState());
vos->assignAllDispatchers();
return vos;

14
src/osgDB/ReadFile.cpp
View File

@ -297,3 +297,17 @@ osg::ref_ptr<Node> osgDB::readRefNodeFiles(osg::ArgumentParser& arguments,const
}
}
osg::ref_ptr<osg::Shader> osgDB::readRefShaderFileWithFallback(osg::Shader::Type type, const std::string& filename, const Options* options, const char* fallback)
{
ReaderWriter::ReadResult rr = Registry::instance()->readShader(filename,options);
osg::ref_ptr<osg::Shader> shader = rr.getShader();
if (!rr.success())
{
OSG_INFO << "Error reading file " << filename << ": " << rr.statusMessage() << std::endl;
}
if (shader.valid() && type != osg::Shader::UNDEFINED) shader->setType(type);
if (!shader) shader = new osg::Shader(type, fallback);
return shader;
}