Changeset 8992 for OpenSceneGraph/trunk/examples/osgimagesequence/osgimagesequence.cpp

Timestamp:

10/06/08 19:03:32 (5 years ago)

Author:

robert

Message:

Improved the ImageSequence::setLength() settting.

Files:

• OpenSceneGraph/trunk/examples/osgimagesequence/osgimagesequence.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgimagesequence/osgimagesequence.cpp

@@ -94 +94 @@
         else
         {
-            imageSequence->setLength(float(imageSequence->getImages().size())*0.1f);
+            unsigned int maxNum = osg::maximum(imageSequence->getFileNames().size(),
+                                               imageSequence->getImages().size());
+                                               
+            imageSequence->setLength(float(maxNum)*0.1f);
         }
     }
@@ -126 +129 @@
     texture->setImage(imageSequence.get());
     //texture->setTextureSize(512,512);
-    
-    //texture->setUpdateCallback(new osg::ImageSequence::UpdateCallback);
 #else    
     osg::TextureRectangle* texture = new osg::TextureRectangle;
@@ -133 +134 @@
     texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
     texture->setWrap(osg::Texture::WRAP_R,osg::Texture::REPEAT);
-    // texture->setResizeNonPowerOfTwoHint(false);
     texture->setImage(imageSequence.get());
     //texture->setTextureSize(512,512);
-    
-    //texture->setUpdateCallback(new osg::ImageSequence::UpdateCallback);
 #endif