Changeset 10924 for OpenSceneGraph/trunk/src/osg/Texture2D.cpp

Timestamp:

01/07/10 13:14:47 (3 years ago)

Author:

robert

Message:

Refactored the way that osg::Image/ImageSequence manages the update callback that needs to be attached to Textures to make it possible to use the Image::update() mechansim in other subclasses from osg::Image.
To enable the automatic attachment of the required update callback to call osg::Image::update(..) subclasses from osg::Image will
need to implement the osg::Image::requestUpdateCall() and return true, and implement the osg::Image::update(NodeVisitor?*) method to recieve the update call during the update traversal.

Files:

• OpenSceneGraph/trunk/src/osg/Texture2D.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osg/Texture2D.cpp

@@ -14 +14 @@
 #include <osg/GLExtensions>
 #include <osg/Texture2D>
-#include <osg/ImageSequence>
 #include <osg/State>
 #include <osg/Notify>
@@ -111 +110 @@
     if (_image == image) return;
 
-    if (dynamic_cast<osg::ImageSequence*>(_image.get()))
+    if (_image.valid() && _image->requiresUpdateCall())
     {
         setUpdateCallback(0);
@@ -119 +118 @@
     _image = image;
     _modifiedCount.setAllElementsTo(0);
-    
-    if (dynamic_cast<osg::ImageSequence*>(_image.get()))
-    {
-        setUpdateCallback(new ImageSequence::UpdateCallback());
+
+    if (_image.valid() && _image->requiresUpdateCall())
+    {
+        setUpdateCallback(new Image::UpdateCallback());
         setDataVariance(osg::Object::DYNAMIC);
     }