Changeset 13191 for OpenSceneGraph/trunk/include/osg/ImageSequence

Timestamp:

05/23/13 20:29:47 (less than one hour ago)

Author:

robert

Message:

Added repolation of the _deadparts stack which would otherwise been invalidatd by the depth sort of particles.

Files:

• OpenSceneGraph/trunk/include/osg/ImageSequence (modified) (7 diffs)

OpenSceneGraph/trunk/include/osg/ImageSequence

@@ -49 +49 @@
         virtual double getTimeMultiplier() const { return _timeMultiplier; }
 
-        typedef std::vector< osg::ref_ptr<osg::Image> >   Images;
-        typedef std::vector< std::string >                FileNames;
+        struct OSG_EXPORT ImageData
+        {
+            ImageData();
+            ImageData(const ImageData& id);
+            ImageData& operator = (const ImageData& id);
+
+            std::string                     _filename;
+            osg::ref_ptr<osg::Image>        _image;
+            osg::ref_ptr<osg::Referenced>   _imageRequest;
+        };
+
+        typedef std::vector<ImageData> ImageDataList;
 
         virtual void seek(double time);
@@ -79 +89 @@
         std::string getImageFile(unsigned int pos) const;
 
-        unsigned int getNumImageFiles() const { return _fileNames.size(); }
-
-        FileNames& getFileNames() { return _fileNames; }
-        const FileNames& getFileNames() const { return _fileNames; }
-
         void addImage(osg::Image* image);
 
@@ -97 +102 @@
         const Image* getImage(unsigned int pos) const;
 
-        unsigned int getNumImages() const { return _images.size(); }
+        unsigned int getNumImageData() const { return _imageDataList.size(); }
 
-        Images& getImages() { return _images; }
-        const Images& getImages() const { return _images; }
+        ImageDataList& getImageDataList() { return _imageDataList; }
+        const ImageDataList& getImageDataList() const { return _imageDataList; }
 
+        
         /** ImageSequence requires a call to update(NodeVisitor*) during the update traversal so return true.*/
         virtual bool requiresUpdateCall() const { return true; }
@@ -108 +114 @@
         virtual void update(NodeVisitor* nv);
 
-    protected:
+
+        /** Set the optional osgDB::Options object to use when reading images.*/
+        void setReadOptions(osg::Referenced* options) { _readOptions = options; }
+
+        /** Get the optional osgDB::Options object used when reading images.*/
+        osg::Referenced* getReadOptions() { return _readOptions.get(); }
+
+        /** Get the optional osgDB::Options object used when reading images.*/
+        const osg::Referenced* getReadOptions() const { return _readOptions.get(); }
+
+protected:
 
         virtual ~ImageSequence() {}
@@ -114 +130 @@
         virtual void applyLoopingMode();
 
-        void setImageToChild(const osg::Image* image);
+        void setImageToChild(int pos);
 
         void computeTimePerImage();
@@ -130 +146 @@
 
         mutable OpenThreads::Mutex      _mutex;
-        FileNames                       _fileNames;
 
-        Images                          _images;
-
-        typedef std::set< std::string > FilesRequested;
-        FilesRequested                  _filesRequested;
+        ImageDataList                   _imageDataList;
 
         int                             _previousAppliedImageIndex;
@@ -143 +155 @@
         double                          _seekTime;
 
-
+        osg::ref_ptr<osg::Referenced>       _readOptions;
 
 };