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

From KOS, build fix for osg::Uniform::Callback to osg::UniformCallback change

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14889 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-06-03 09:07:41 +00:00
parent 9222506a2c
commit fd806293be
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osggeometryshaders/osggeometryshaders.cpp
View File

@ -46,7 +46,7 @@
#ifdef ENABLE_GLSL #ifdef ENABLE_GLSL
class SineAnimation: public osg::Uniform::Callback class SineAnimation: public osg::UniformCallback
{ {
public: public:
SineAnimation( float rate = 1.0f, float scale = 1.0f, float offset = 0.0f ) : SineAnimation( float rate = 1.0f, float scale = 1.0f, float offset = 0.0f ) :

2
examples/osgparametric/osgparametric.cpp
View File

@ -96,7 +96,7 @@ char fragmentShaderSource[] =
class UniformVarying : public osg::Uniform::Callback class UniformVarying : public osg::UniformCallback
{ {
virtual void operator () (osg::Uniform* uniform, osg::NodeVisitor* nv) virtual void operator () (osg::Uniform* uniform, osg::NodeVisitor* nv)
{ {

2
examples/osgshaders/GL2Scene.cpp
View File

@ -173,7 +173,7 @@ static osg::Shader* MarbleFragObj;
// for demo simplicity, this one callback animates all the shaders, instancing // for demo simplicity, this one callback animates all the shaders, instancing
// for each uniform but with a specific operation each time. // for each uniform but with a specific operation each time.
class AnimateCallback: public osg::Uniform::Callback class AnimateCallback: public osg::UniformCallback
{ {
public: public:

2
examples/osgsimpleshaders/osgsimpleshaders.cpp
View File

@ -94,7 +94,7 @@ static const char *blockyFragSource = {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// callback for animating various Uniforms (currently only the SIN uniform) // callback for animating various Uniforms (currently only the SIN uniform)
class AnimateCallback: public osg::Uniform::Callback class AnimateCallback: public osg::UniformCallback
{ {
public: public:
enum Operation { SIN }; enum Operation { SIN };

2
examples/osgtransformfeedback/osgtransformfeedback.cpp
View File

@ -47,7 +47,7 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
class SineAnimation: public osg::Uniform::Callback class SineAnimation: public osg::UniformCallback
{ {
public: public:
SineAnimation( float rate = 1.0f, float scale = 1.0f, float offset = 0.0f ) : SineAnimation( float rate = 1.0f, float scale = 1.0f, float offset = 0.0f ) :