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

Timestamp:

10/06/08 19:02:20 (5 years ago)

Author:

robert

Message:

Refactored ImageSequence? to provided a cleaner and more robust implementation

Files:

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

OpenSceneGraph/trunk/include/osg/ImageSequence

@@ -20 +20 @@
 
 #include <list>
+#include <set>
 
 namespace osg {
@@ -49 +50 @@
         virtual double getTimeMultiplier() const { return _timeMultiplier; }
 
-        typedef std::list< osg::ref_ptr<osg::Image> >   Images;
-        typedef std::list< std::string >                FileNames;
+        typedef std::vector< osg::ref_ptr<osg::Image> >   Images;
+        typedef std::vector< std::string >                FileNames;
         
         virtual void seek(double time);
@@ -76 +77 @@
         void addImageFile(const std::string& fileName);
         
+        void setImageFile(unsigned int pos, const std::string& fileName);
+        std::string getImageFile(unsigned int pos) const;
+        
+        unsigned int getNumImageFiles() const { return _fileNames.size(); }
+
         FileNames& getFileNames() { return _fileNames; }
         const FileNames& getFileNames() const { return _fileNames; }
@@ -81 +87 @@
         void addImage(osg::Image* image);
         
+        void setImage(int s,int t,int r,
+                      GLint internalTextureformat,
+                      GLenum pixelFormat,GLenum type,
+                      unsigned char* data,
+                      AllocationMode mode,
+                      int packing=1) { Image::setImage(s,t,r,internalTextureformat, pixelFormat, type, data, mode, packing); }
+
+        void setImage(unsigned int pos, osg::Image* image);
+        Image* getImage(unsigned int pos);
+        const Image* getImage(unsigned int pos) const;
+        
+        unsigned int getNumImages() const { return _images.size(); }
+
         Images& getImages() { return _images; }
         const Images& getImages() const { return _images; }
@@ -96 +115 @@
         virtual ~ImageSequence() {}
         
+        virtual void applyLoopingMode();
+
         void setImageToChild(const osg::Image* image);
         
         void computeTimePerImage();
+
+        int imageIndex(double time);
+
 
         double                          _referenceTime;
@@ -108 +132 @@
         double                          _timePerImage;
 
-        OpenThreads::Mutex              _mutex;
+        mutable OpenThreads::Mutex      _mutex;
         FileNames                       _fileNames;
-        FileNames::iterator             _fileNamesIterator;
-        double                          _fileNamesIteratorTime;
 
         Images                          _images;
         
-        typedef std::pair< std::string, osg::ref_ptr<osg::Image> >  FileNameImagePair;
-        typedef std::list< FileNameImagePair >  FileNameImageList;
-        FileNameImageList               _filesRequested;
+        typedef std::set< std::string > FilesRequested;
+        FilesRequested                  _filesRequested;
+        
+        int                             _previousAppliedImageIndex;
                 
-        Images::iterator                _imageIterator;
-        double                          _imageIteratorTime;
         
         bool                            _seekTimeSet;
         double                          _seekTime;
+