Changeset 10924 for OpenSceneGraph/trunk/src/osg/Texture2DArray.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/Texture2DArray.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp

@@ -14 +14 @@
 #include <osg/Texture2DArray>
 #include <osg/State>
-#include <osg/ImageSequence>
 #include <osg/Notify>
 
@@ -114 +113 @@
     if (_images[layer] == image) return;
 
-    unsigned numImageSequencesBefore = 0;
+    unsigned numImageRequireUpdateBefore = 0;
     for (unsigned int i=0; i<getNumImages(); ++i)
     {
-        osg::ImageSequence* is = dynamic_cast<osg::ImageSequence*>(_images[i].get());
-        if (is) ++numImageSequencesBefore;
+        if (_images[i].valid() && _images[i]->requiresUpdateCall()) ++numImageRequireUpdateBefore;
     }
 
@@ -125 +123 @@
    _modifiedCount[layer].setAllElementsTo(0);
 
-    // find out if we need to reset the update callback to handle the animation of ImageSequence
-    unsigned numImageSequencesAfter = 0;
+    // find out if we need to reset the update callback to handle the animation of image
+    unsigned numImageRequireUpdateAfter = 0;
     for (unsigned int i=0; i<getNumImages(); ++i)
     {
-        osg::ImageSequence* is = dynamic_cast<osg::ImageSequence*>(_images[i].get());
-        if (is) ++numImageSequencesAfter;
-    }
-
-    if (numImageSequencesBefore>0)
-    {
-        if (numImageSequencesAfter==0)
+        if (_images[i].valid() && _images[i]->requiresUpdateCall()) ++numImageRequireUpdateAfter;
+    }
+
+    if (numImageRequireUpdateBefore>0)
+    {
+        if (numImageRequireUpdateAfter==0)
         {
             setUpdateCallback(0);
@@ -141 +138 @@
         }
     }
-    else if (numImageSequencesAfter>0)
-    {
-        setUpdateCallback(new ImageSequence::UpdateCallback());
+    else if (numImageRequireUpdateAfter>0)
+    {
+        setUpdateCallback(new Image::UpdateCallback());
         setDataVariance(osg::Object::DYNAMIC);
     }