From fd806293be0d39b58f61e09d0b7e5de82c02870c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 3 Jun 2015 09:07:41 +0000 Subject: [PATCH] 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 --- examples/osggeometryshaders/osggeometryshaders.cpp | 2 +- examples/osgparametric/osgparametric.cpp | 2 +- examples/osgshaders/GL2Scene.cpp | 2 +- examples/osgsimpleshaders/osgsimpleshaders.cpp | 2 +- examples/osgtransformfeedback/osgtransformfeedback.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/osggeometryshaders/osggeometryshaders.cpp b/examples/osggeometryshaders/osggeometryshaders.cpp index 27df86946..b3bd7d210 100644 --- a/examples/osggeometryshaders/osggeometryshaders.cpp +++ b/examples/osggeometryshaders/osggeometryshaders.cpp @@ -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 ) : diff --git a/examples/osgparametric/osgparametric.cpp b/examples/osgparametric/osgparametric.cpp index ae1c55eec..c5cc74f8d 100644 --- a/examples/osgparametric/osgparametric.cpp +++ b/examples/osgparametric/osgparametric.cpp @@ -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) { diff --git a/examples/osgshaders/GL2Scene.cpp b/examples/osgshaders/GL2Scene.cpp index 405921192..f06592983 100644 --- a/examples/osgshaders/GL2Scene.cpp +++ b/examples/osgshaders/GL2Scene.cpp @@ -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: diff --git a/examples/osgsimpleshaders/osgsimpleshaders.cpp b/examples/osgsimpleshaders/osgsimpleshaders.cpp index 37f226146..0bfac44c4 100644 --- a/examples/osgsimpleshaders/osgsimpleshaders.cpp +++ b/examples/osgsimpleshaders/osgsimpleshaders.cpp @@ -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 }; diff --git a/examples/osgtransformfeedback/osgtransformfeedback.cpp b/examples/osgtransformfeedback/osgtransformfeedback.cpp index 15beab2a0..33df564a0 100644 --- a/examples/osgtransformfeedback/osgtransformfeedback.cpp +++ b/examples/osgtransformfeedback/osgtransformfeedback.cpp @@ -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 ) :