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

Renamed DrawableUpdate/Event/Cull callbacks to use new include/osg/Callback versions

Browse Source
This commit is contained in:
Robert Osfield
2016-01-19 11:39:28 +00:00
parent e8fd414661
commit 55a8f4abbc
18 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osganimationviewer/AnimtkViewerGUI.cpp
View File

@@ -26,7 +26,7 @@
const std::string IMAGE_PATH = "osgWidget/";
template <class T>
struct Sampler: public osg::Drawable::UpdateCallback
struct Sampler: public osg::DrawableUpdateCallback
{
T _motion;
Sampler() {

6
examples/osgcallback/osgcallback.cpp
View File

@@ -65,7 +65,7 @@ class DrawableDrawCallback : public osg::Drawable::DrawCallback
}
};
struct DrawableUpdateCallback : public osg::Drawable::UpdateCallback
struct DrawableUpdateCallback : public osg::DrawableUpdateCallback
{
virtual void update(osg::NodeVisitor*, osg::Drawable* drawable)
{
@@ -73,7 +73,7 @@ struct DrawableUpdateCallback : public osg::Drawable::UpdateCallback
}
};
struct DrawableCullCallback : public osg::Drawable::CullCallback
struct DrawableCullCallback : public osg::DrawableCullCallback
{
/** do customized cull code.*/
virtual bool cull(osg::NodeVisitor*, osg::Drawable* drawable, osg::State* /*state*/) const
@@ -158,7 +158,7 @@ class CameraEventCallback : public osg::NodeCallback
};
struct TestDrawableUpdateCallback : public osg::Drawable::UpdateCallback
struct TestDrawableUpdateCallback : public osg::DrawableUpdateCallback
{
TestDrawableUpdateCallback(const std::string &message): _message(message) {}

2
examples/osggpucull/osggpucull.cpp
View File

@@ -1143,7 +1143,7 @@ osg::Geometry* buildGPUCullGeometry( const std::vector<DynamicInstance>& instanc
// instance wandering ( object goes to random destination point and when it reaches
// destination, it picks another random point and so on ).
// Object parts are animated ( wheels and propellers )
struct AnimateObjectsCallback : public osg::Drawable::UpdateCallback
struct AnimateObjectsCallback : public osg::DrawableUpdateCallback
{
AnimateObjectsCallback( osg::BufferTemplate< std::vector<DynamicInstance> >* instances, osg::Image* instancesImage, const osg::BoundingBox& bbox, unsigned int quantityPerType )
: _instances(instances), _instancesImage(instancesImage), _bbox(bbox), _quantityPerType(quantityPerType), _lastTime(0.0)

4
examples/osgmultiplemovies/osgmultiplemovies.cpp
View File

@@ -41,10 +41,10 @@
#include <iostream>
class ImageStreamStateCallback : public osg::Drawable::UpdateCallback {
class ImageStreamStateCallback : public osg::DrawableUpdateCallback {
public:
ImageStreamStateCallback(osgText::Text* text, osg::ImageStream* is)
: osg::Drawable::UpdateCallback()
: osg::DrawableUpdateCallback()
, _text(text)
, _imageStream(is)
, _fps(0)

2
examples/osgprerender/osgprerender.cpp
View File

@@ -47,7 +47,7 @@
// call back which creates a deformation field to oscillate the model.
class MyGeometryCallback :
public osg::Drawable::UpdateCallback,
public osg::DrawableUpdateCallback,
public osg::Drawable::AttributeFunctor
{
public: