Added support for ImageSequence to all Texture classes
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include <osg/GLExtensions>
|
||||
#include <osg/Texture2DArray>
|
||||
#include <osg/State>
|
||||
#include <osg/ImageSequence>
|
||||
#include <osg/Notify>
|
||||
|
||||
#include <string.h>
|
||||
@@ -110,9 +111,40 @@ void Texture2DArray::setImage(unsigned int layer, Image* image)
|
||||
return;
|
||||
}
|
||||
|
||||
if (_images[layer] == image) return;
|
||||
|
||||
unsigned numImageSequencesBefore = 0;
|
||||
for (unsigned int i=0; i<getNumImages(); ++i)
|
||||
{
|
||||
osg::ImageSequence* is = dynamic_cast<osg::ImageSequence*>(_images[i].get());
|
||||
if (is) ++numImageSequencesBefore;
|
||||
}
|
||||
|
||||
// set image
|
||||
_images[layer] = image;
|
||||
_modifiedCount[layer].setAllElementsTo(0);
|
||||
|
||||
// find out if we need to reset the update callback to handle the animation of ImageSequence
|
||||
unsigned numImageSequencesAfter = 0;
|
||||
for (unsigned int i=0; i<getNumImages(); ++i)
|
||||
{
|
||||
osg::ImageSequence* is = dynamic_cast<osg::ImageSequence*>(_images[i].get());
|
||||
if (is) ++numImageSequencesAfter;
|
||||
}
|
||||
|
||||
if (numImageSequencesBefore>0)
|
||||
{
|
||||
if (numImageSequencesAfter==0)
|
||||
{
|
||||
setUpdateCallback(0);
|
||||
setDataVariance(osg::Object::STATIC);
|
||||
}
|
||||
}
|
||||
else if (numImageSequencesAfter>0)
|
||||
{
|
||||
setUpdateCallback(new ImageSequence::UpdateCallback());
|
||||
setDataVariance(osg::Object::DYNAMIC);
|
||||
}
|
||||
}
|
||||
|
||||
void Texture2DArray::setTextureSize(int width, int height, int depth)
|
||||
|
||||
Reference in New Issue
Block a user