Merged fixes to osgVolume's handling of ImageSequence animated volumes, merge command:

svn merge -r 9746:9747 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8
This commit is contained in:
Robert Osfield
2009-02-10 18:51:43 +00:00
parent 2fcd7f1d99
commit 51f6fa249f
6 changed files with 103 additions and 2 deletions

View File

@@ -78,6 +78,12 @@ class OSGVOLUME_EXPORT Layer : public osg::Object
void addProperty(Property* property);
/** Specify whether ImageLayer requires update traversal. */
virtual bool requiresUpdateTraversal() const { return false; }
/** Call update on the Layer.*/
virtual void update(osg::NodeVisitor& /*nv*/) {}
/** increment the modified count."*/
virtual void dirty() {};
@@ -137,6 +143,10 @@ class OSGVOLUME_EXPORT ImageLayer : public Layer
/** Compute the min color component of the image and then translate and pixels by this offset to make the new min component 0.*/
void translateMinToZero();
virtual bool requiresUpdateTraversal() const;
virtual void update(osg::NodeVisitor& /*nv*/);
virtual void dirty();
virtual void setModifiedCount(unsigned int value);
virtual unsigned int getModifiedCount() const;
@@ -175,6 +185,10 @@ class OSGVOLUME_EXPORT CompositeLayer : public Layer
unsigned int getNumLayers() const { return _layers.size(); }
bool requiresUpdateTraversal() const;
virtual void update(osg::NodeVisitor& /*nv*/);
protected:
virtual ~CompositeLayer() {}

View File

@@ -107,7 +107,7 @@ class OSGVOLUME_EXPORT VolumeTile : public osg::Group
const Locator* getLocator() const { return _locator.get(); }
void setLayer(Layer* layer) { _layer = layer; }
void setLayer(Layer* layer);
Layer* getLayer() { return _layer.get(); }
const Layer* getLayer() const { return _layer.get(); }