FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted back to using std::list<std::String>

Browse Source
This commit is contained in:
Robert Osfield
2008-07-25 17:42:37 +00:00
parent d137394169
commit 65d5ef608d
5 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osg/ImageSequence.cpp
View File

@@ -214,9 +214,12 @@ void ImageSequence::update(osg::NodeVisitor* nv)
{
if (_fileNames.size()>_images.size())
{
for(unsigned int i=_images.size(); i<_fileNames.size(); ++i)
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(_fileNames[i]);
osg::Image* image = irh->readImageFile(*itr);
_images.push_back(image);
}
}
@@ -246,7 +249,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
//
if (_fileNamesIterator!=_fileNames.end())
{
// osg::notify(osg::NOTICE)<<" _fileNamesIteratorTime = "<<_fileNamesIteratorTime<<std::endl;
//osg::notify(osg::NOTICE)<<" _fileNamesIteratorTime = "<<_fileNamesIteratorTime<<" "<<_timePerImage<<std::endl;
while(preLoadTime > (_fileNamesIteratorTime + _timePerImage))
{
_fileNamesIteratorTime += _timePerImage;