Fixed handling of TextureCubeMap's with mipmapped/ImageSequence/PBO's.

This commit is contained in:
Robert Osfield
2008-07-22 14:47:59 +00:00
parent 14771d3a4d
commit 669d6be0b2
5 changed files with 61 additions and 42 deletions

View File

@@ -30,15 +30,17 @@ RegisterDotOsgWrapperProxy g_TextureCubeMapProxy
{\
if (fr[2].matchWord("ImageSequence") || fr[2].matchWord("Image")) \
{ \
fr += 2;\
osg::Image* image = fr.readImage(); \
if (image) texture.setImage(osg::TextureCubeMap::FACE,image); \
\
iteratorAdvanced = true; \
matched = true;\
} \
else if (fr[2].isString())\
{ \
Image* image = fr.readImage(fr[2].getStr());\
if (image) texture.setImage(osg::TextureCubeMap::FACE,image);\
fr += 2;\
fr += 3;\
iteratorAdvanced = true; \
matched = true;\
}\
@@ -73,6 +75,7 @@ bool TextureCubeMap_readLocalData(Object& obj, Input& fr)
const osg::ImageSequence* is = dynamic_cast<const osg::ImageSequence*>(image); \
if (is) \
{ \
fw.indent() << "image "<<#FACE<<std::endl; \
fw.writeObject(*is); \
} \
else \