Changeset 13191 for OpenSceneGraph/trunk/src/osg/ImageSequence.cpp

Timestamp:

05/23/13 20:29:47 (6 hours ago)

Author:

robert

Message:

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

Files:

• OpenSceneGraph/trunk/src/osg/ImageSequence.cpp (modified) (18 diffs)

OpenSceneGraph/trunk/src/osg/ImageSequence.cpp

@@ -23 +23 @@
 using namespace osg;
 
+ImageSequence::ImageData::ImageData()
+{
+}
+
+ImageSequence::ImageData::ImageData(const ImageData& id):
+    _filename(id._filename),
+    _image(id._image),
+    _imageRequest(id._imageRequest)
+{
+}
+
+ImageSequence::ImageData& ImageSequence::ImageData::operator = (const ImageSequence::ImageData& rhs)
+{
+    if (&rhs!=this)
+    {
+        _filename = rhs._filename;
+        _image = rhs._image;
+        _imageRequest = rhs._imageRequest;
+    }
+    return *this;
+}
+
 ImageSequence::ImageSequence()
 {
@@ -97 +119 @@
 void ImageSequence::computeTimePerImage()
 {
-    if (!_fileNames.empty()) _timePerImage = _length / double(_fileNames.size());
-    else if (!_images.empty()) _timePerImage = _length / double(_images.size());
+    if (!_imageDataList.empty()) _timePerImage = _length / double(_imageDataList.size());
     else _timePerImage = _length;
 }
@@ -106 +127 @@
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
 
-    if (pos>=_fileNames.size()) _fileNames.resize(pos);
-    _fileNames[pos] = fileName;
+    if (pos>=_imageDataList.size()) _imageDataList.resize(pos);
+    _imageDataList[pos]._filename = fileName;
 }
 
@@ -113 +134 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-    return pos<_fileNames.size() ? _fileNames[pos] : std::string();
+    return pos<_imageDataList.size() ? _imageDataList[pos]._filename : std::string();
 }
 
@@ -119 +140 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-    _fileNames.push_back(fileName);
+    _imageDataList.push_back(ImageData());
+    _imageDataList.back()._filename = fileName;
     computeTimePerImage();
 }
@@ -127 +149 @@
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
 
-    OSG_INFO<<"ImageSequence::setImage("<<pos<<","<<image->getFileName()<<")"<<std::endl;
-
-    if (pos>=_images.size()) _images.resize(pos+1);
-
-    _images[pos] = image;
-
-    // prune from file requested list.
-    FilesRequested::iterator itr = _filesRequested.find(image->getFileName());
-    if (itr!=_filesRequested.end()) _filesRequested.erase(itr);
+    if (pos>=_imageDataList.size()) _imageDataList.resize(pos+1);
+
+    _imageDataList[pos]._image = image;
+    _imageDataList[pos]._filename = image->getFileName();
 }
 
@@ -141 +158 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-    return pos<_images.size() ? _images[pos].get() : 0;
+    return pos<_imageDataList.size() ? _imageDataList[pos]._image.get() : 0;
 }
 
@@ -147 +164 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-    return pos<_images.size() ? _images[pos].get() : 0;
+    return pos<_imageDataList.size() ? _imageDataList[pos]._image.get() : 0;
 }
 
@@ -157 +174 @@
 
     // OSG_NOTICE<<"merging image in order expected : "<<image->getFileName()<<std::endl;
-    _images.push_back(image);
+    _imageDataList.push_back(ImageData());
+    _imageDataList.back()._image = image;
 
     computeTimePerImage();
@@ -163 +181 @@
     if (data()==0)
     {
-        setImageToChild(_images.front().get());
-    }
-}
-
-void ImageSequence::setImageToChild(const osg::Image* image)
-{
-    // OSG_NOTICE<<"setImageToChild("<<image<<")"<<std::endl;
-
+        setImageToChild(_imageDataList.size()-1);
+    }
+}
+
+void ImageSequence::setImageToChild(int pos)
+{
+    
+    const osg::Image* image = (pos>=0 && pos<static_cast<int>(_imageDataList.size())) ? _imageDataList[pos]._image.get() : 0;
     if (image==0) return;
 
     // check to see if data is changing, if not don't apply
-    if (image->data() == data()) return;
+    if (image->data() == data())
+    {
+        return;
+    }
+
+
+    if (_mode==PAGE_AND_DISCARD_USED_IMAGES && _previousAppliedImageIndex>=0)
+    {
+        if (_previousAppliedImageIndex<pos)
+        {
+            OSG_INFO<<"Moving forward from "<<_previousAppliedImageIndex<<" to "<<pos<<std::endl;
+            while(_previousAppliedImageIndex<pos)
+            {
+                _imageDataList[_previousAppliedImageIndex]._image = 0;
+                OSG_INFO<<"   deleting "<<_previousAppliedImageIndex<<std::endl;
+                ++_previousAppliedImageIndex;
+            }
+        }
+        else if (_previousAppliedImageIndex>pos)
+        {
+            OSG_INFO<<"Moving back from "<<_previousAppliedImageIndex<<" to "<<pos<<std::endl;
+            while(_previousAppliedImageIndex>pos)
+            {
+                _imageDataList[_previousAppliedImageIndex]._image = 0;
+                OSG_INFO<<"   deleting "<<_previousAppliedImageIndex<<std::endl;
+                --_previousAppliedImageIndex;
+            }
+        }        
+    }
+    
+
+    _previousAppliedImageIndex = pos;
 
     setImage(image->s(),image->t(),image->r(),
@@ -198 +247 @@
     if (time<0.0) return 0;
     int index = int(time/_timePerImage);
-    if (index>=int(_images.size())) return int(_images.size())-1;
+    if (index>=int(_imageDataList.size())) return int(_imageDataList.size())-1;
     return index;
 }
@@ -223 +272 @@
     {
         time = _seekTime;
+        useDirectTimeRequest = true;
         _referenceTime =  fs->getSimulationTime() - time/_timeMultiplier;
     }
@@ -248 +298 @@
     _seekTimeSet = false;
 
-    bool pruneOldImages = false;
-
-    switch(_mode)
-    {
-        case(PRE_LOAD_ALL_IMAGES):
-        {
-            if (irh && _fileNames.size()>_images.size())
-            {
-                FileNames::iterator itr = _fileNames.begin();
-                for(unsigned int i=0;i<_images.size();++i) ++itr;
-
-                for(; itr!=_fileNames.end(); ++itr)
-                {
-                    osg::Image* image = irh->readImageFile(*itr);
-                    _images.push_back(image);
-                }
-            }
-
-            irh = 0;
-            break;
-        }
-        case(PAGE_AND_RETAIN_IMAGES):
-        {
-            break;
-        }
-        case(PAGE_AND_DISCARD_USED_IMAGES):
-        {
-            pruneOldImages = true;
-            break;
+    if (irh && _mode==PRE_LOAD_ALL_IMAGES)
+    {
+        for(ImageDataList::iterator itr = _imageDataList.begin();
+            itr != _imageDataList.end();
+            ++itr)
+        {
+            if (!(itr->_image) && !(itr->_filename.empty()))
+            {
+                itr->_image = irh->readImageFile(itr->_filename);
+            }
         }
     }
@@ -283 +314 @@
     // OSG_NOTICE<<"time= "<<time<<" _timePerImage="<<_timePerImage<<" index="<<index<<" _length="<<_length<<std::endl;
 
-    if (index>=int(_images.size())) index = int(_images.size())-1;
-
-    if (index>=0 && index<int(_images.size()))
-    {
-        if (pruneOldImages)
-        {
+    if (index>=int(_imageDataList.size())) index = int(_imageDataList.size())-1;
+
+    if (index>=0 && index<int(_imageDataList.size()))
+    {
+        // need to find the nearest relevant change.
+        if (!_imageDataList[index]._image)
+        {            
             if (_previousAppliedImageIndex<index)
             {
                 OSG_DEBUG<<"ImageSequence::update(..) Moving forward by "<<index-_previousAppliedImageIndex<<std::endl;
-                while (index>=0 && !_images[index].valid())
+                while (index>=0 && !_imageDataList[index]._image.valid())
                 {
                     --index;
@@ -300 +332 @@
             {
                 OSG_DEBUG<<"ImageSequence::update(..) Moving back by "<<_previousAppliedImageIndex-index<<std::endl;
-                while (index<static_cast<int>(_images.size()) && !_images[index].valid())
+                while (index<static_cast<int>(_imageDataList.size()) && !_imageDataList[index]._image.valid())
                 {
                     ++index;
                 }
             }
+        }
+        
+        if (index>=0 && index!=_previousAppliedImageIndex)
+        {
+            setImageToChild(index);
+        }
+    }
+
+    // OSG_NOTICE<<"time = "<<time<<std::endl;
+
+    if (!irh) return;
+
+    if (useDirectTimeRequest)
+    {
+        int i = int(time/_timePerImage);
+        if ((i>=int(_imageDataList.size()) || !_imageDataList[i]._image))
+        {
+             i = osg::clampTo<int>(i, 0, _imageDataList.size()-1);
+
+             OSG_INFO<<"Requesting file, entry="<<i<<" : _fileNames[i]="<<_imageDataList[i]._filename<<std::endl;
+             irh->requestImageFile(_imageDataList[i]._filename, this, i, time, fs, _imageDataList[i]._imageRequest, _readOptions.get());
+        }
+    }
+    else
+    {
+        double preLoadTime = time + osg::minimum(irh->getPreLoadTime()*_timeMultiplier, _length);
+
+        int startLoadIndex = int(time/_timePerImage);
+        if (startLoadIndex>=int(_imageDataList.size())) startLoadIndex = int(_imageDataList.size())-1;
+        if (startLoadIndex<0) startLoadIndex = 0;
+
+        int endLoadIndex = int(preLoadTime/_timePerImage);
+        if (endLoadIndex>=int(_imageDataList.size()))
+        {
+            if (looping)
+            {
+                endLoadIndex -= int(_imageDataList.size());
+            }
             else
             {
-                // OSG_NOTICE<<"ImageSequence::update(..) Same index."<<std::endl;
-            }
-        }
-
-        if (index>=0)
-        {
-            // OSG_NOTICE<<"at time "<<time<<" setting child = "<<index<<std::endl;
-
-            if (_previousAppliedImageIndex!=index)
-            {
-                if (_previousAppliedImageIndex >= 0 &&
-                    _previousAppliedImageIndex<int(_images.size()) &&
-                    pruneOldImages)
+                endLoadIndex = int(_imageDataList.size())-1;
+            }
+        }
+        if (endLoadIndex<0) endLoadIndex = 0;
+
+        double requestTime = time;
+
+        if (endLoadIndex<startLoadIndex)
+        {
+            for(int i=startLoadIndex; i<int(_imageDataList.size()); ++i)
+            {
+                if (!_imageDataList[i]._image)
                 {
-                    _images[_previousAppliedImageIndex] = 0;
-                }
-
-                setImageToChild(_images[index].get());
-
-                _previousAppliedImageIndex = index;
-            }
-        }
-    }
-
-    // OSG_NOTICE<<"time = "<<time<<std::endl;
-
-    if (!irh) return;
-
-    if (useDirectTimeRequest)
-    {
-        int i = int(time/_timePerImage);
-        if ((i>=int(_images.size()) || !_images[i]))
-        {
-             i = osg::clampTo<int>(i, 0, _fileNames.size()-1);
-             if (_filesRequested.count(_fileNames[i])==0)
-             {
-                 OSG_INFO<<"Requesting file, entry="<<i<<" : _fileNames[i]="<<_fileNames[i]<<std::endl;
-                //_filesRequested.insert(_fileNames[i]);
-                irh->requestImageFile(_fileNames[i], this, i, time, fs);
-             }
-             else
-             {
-                 OSG_DEBUG<<"File already requested, entry="<<i<<" : _fileNames[i]="<<_fileNames[i]<<std::endl;
-             }
-        }
-    }
-    else
-    {
-        double preLoadTime = time + osg::minimum(irh->getPreLoadTime()*_timeMultiplier, _length);
-
-        int startLoadIndex = int(time/_timePerImage);
-        if (startLoadIndex>=int(_images.size())) startLoadIndex = int(_images.size())-1;
-        if (startLoadIndex<0) startLoadIndex = 0;
-
-        int endLoadIndex = int(preLoadTime/_timePerImage);
-        if (endLoadIndex>=int(_fileNames.size()))
-        {
-            if (looping)
-            {
-                endLoadIndex -= int(_fileNames.size());
-            }
-            else
-            {
-                endLoadIndex = int(_fileNames.size())-1;
-            }
-        }
-        if (endLoadIndex<0) endLoadIndex = 0;
-
-        double requestTime = time;
-
-        if (endLoadIndex<startLoadIndex)
-        {
-            for(int i=startLoadIndex; i<int(_fileNames.size()); ++i)
-            {
-                if ((i>=int(_images.size()) || !_images[i]) && _filesRequested.count(_fileNames[i])==0)
-                {
-                    //_filesRequested.insert(_fileNames[i]);
-                    irh->requestImageFile(_fileNames[i], this, i, requestTime, fs);
+                    irh->requestImageFile(_imageDataList[i]._filename, this, i, requestTime, fs, _imageDataList[i]._imageRequest, _readOptions.get());
                 }
                 requestTime += _timePerImage;
@@ -391 +397 @@
             for(int i=0; i<=endLoadIndex; ++i)
             {
-                if ((i>=int(_images.size()) || !_images[i]) && _filesRequested.count(_fileNames[i])==0)
+                if (!_imageDataList[i]._image)
                 {
-                    //_filesRequested.insert(_fileNames[i]);
-                    irh->requestImageFile(_fileNames[i], this, i, requestTime, fs);
+                    irh->requestImageFile(_imageDataList[i]._filename, this, i, requestTime, fs, _imageDataList[i]._imageRequest, _readOptions.get());
                 }
                 requestTime += _timePerImage;
@@ -403 +408 @@
             for(int i=startLoadIndex; i<=endLoadIndex; ++i)
             {
-                if ((i>=int(_images.size()) || !_images[i]) && _filesRequested.count(_fileNames[i])==0)
+                if (!_imageDataList[i]._image)
                 {
-                    //_filesRequested.insert(_fileNames[i]);
-                    irh->requestImageFile(_fileNames[i], this, i, requestTime, fs);
+                    irh->requestImageFile(_imageDataList[i]._filename, this, i, requestTime, fs, _imageDataList[i]._imageRequest, _readOptions.get());
                 }
                 requestTime += _timePerImage;
@@ -412 +416 @@
         }
 
-
-    }
-
-}
+    }
+
+}