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

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

View File

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

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)
{

View File

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

View File

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

View File

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