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

Convesion of osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 15:47:52 +00:00
parent e753be1b20
commit a79a8d30f9
67 changed files with 775 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osg/VertexProgram.cpp
View File

@@ -154,15 +154,15 @@ void VertexProgram::apply(State& state) const
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorposition);
if (errorposition != -1)
{
notify(osg::FATAL) << "VertexProgram: " << glGetString(GL_PROGRAM_ERROR_STRING_ARB) << std::endl;
OSG_FATAL << "VertexProgram: " << glGetString(GL_PROGRAM_ERROR_STRING_ARB) << std::endl;
std::string::size_type start = _vertexProgram.rfind('\n', errorposition);
std::string::size_type stop = _vertexProgram.find('\n', errorposition);
if (start!=std::string::npos && stop!=std::string::npos)
{
notify(osg::FATAL) << " : " << _vertexProgram.substr(start+1, stop-start-2) << std::endl;
OSG_FATAL << " : " << _vertexProgram.substr(start+1, stop-start-2) << std::endl;
std::string pointAtproblem(errorposition-(start+1), ' ');
notify(osg::FATAL) << " : " << pointAtproblem << '^' << std::endl;
OSG_FATAL << " : " << pointAtproblem << '^' << std::endl;
}
return;
}
@@ -191,7 +191,7 @@ void VertexProgram::apply(State& state) const
glMatrixMode(GL_MODELVIEW); // restore matrix mode
}
#else
osg::notify(osg::NOTICE)<<"Warning: VertexProgram::apply(State&) - not supported."<<std::endl;
OSG_NOTICE<<"Warning: VertexProgram::apply(State&) - not supported."<<std::endl;
#endif
}
@@ -277,7 +277,7 @@ void VertexProgram::Extensions::glBindProgram(GLenum target, GLuint id) const
}
else
{
notify(WARN)<<"Error: glBindProgram not supported by OpenGL driver"<<std::endl;
OSG_WARN<<"Error: glBindProgram not supported by OpenGL driver"<<std::endl;
}
}
@@ -289,7 +289,7 @@ void VertexProgram::Extensions::glGenPrograms(GLsizei n, GLuint *programs) const
}
else
{
notify(WARN)<<"Error: glGenPrograms not supported by OpenGL driver"<<std::endl;
OSG_WARN<<"Error: glGenPrograms not supported by OpenGL driver"<<std::endl;
}
}
@@ -301,7 +301,7 @@ void VertexProgram::Extensions::glDeletePrograms(GLsizei n, GLuint *programs) co
}
else
{
notify(WARN)<<"Error: glDeletePrograms not supported by OpenGL driver"<<std::endl;
OSG_WARN<<"Error: glDeletePrograms not supported by OpenGL driver"<<std::endl;
}
}
@@ -313,7 +313,7 @@ void VertexProgram::Extensions::glProgramString(GLenum target, GLenum format, GL
}
else
{
notify(WARN)<<"Error: glProgramString not supported by OpenGL driver"<<std::endl;
OSG_WARN<<"Error: glProgramString not supported by OpenGL driver"<<std::endl;
}
}
@@ -325,6 +325,6 @@ void VertexProgram::Extensions::glProgramLocalParameter4fv(GLenum target, GLuint
}
else
{
notify(WARN)<<"Error: glProgramLocalParameter4fv not supported by OpenGL driver"<<std::endl;
OSG_WARN<<"Error: glProgramLocalParameter4fv not supported by OpenGL driver"<<std::endl;
}
}