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

From Mike Weiblen, added new rot, scale and trans pseudo loaders.

Browse Source
This commit is contained in:
Robert Osfield
2004-05-07 15:18:59 +00:00
parent a196ea1d5d
commit bdeb391a00
14 changed files with 678 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgGL2/ProgramObject.cpp
View File

@@ -12,7 +12,7 @@
*/
/* file: src/osgGL2/ProgramObject.cpp
* author: Mike Weiblen 2003-12-27
* author: Mike Weiblen 2004-02-04
*
* See http://www.3dlabs.com/opengl2/ for more information regarding
* the OpenGL Shading Language.
@@ -56,7 +56,10 @@ public:
}
}
const std::string& operator()() { return _text; }
friend std::ostream& operator<< ( std::ostream& o, const InfoLog& log )
{
return o << log._text;
}
private:
InfoLog();
@@ -338,7 +341,7 @@ void ProgramObject::PerContextProgObj::build()
if( _dirty )
{
InfoLog log( _extensions.get(), _glProgObjHandle );
osg::notify(osg::WARN) << "glLinkProgram FAILED:\n" << log() << std::endl;
osg::notify(osg::WARN) << "glLinkProgram FAILED:\n" << log << std::endl;
}
}
@@ -533,7 +536,7 @@ void ShaderObject::PerContextShaderObj::build()
{
InfoLog log( _extensions.get(), _glShaderObjHandle );
osg::notify(osg::WARN) << _shadObj->getTypename() <<
" glCompileShader FAILED:\n" << log() << std::endl;
" glCompileShader FAILED:\n" << log << std::endl;
}
}