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

Added ImageSequence IO support in Texture classes

Browse Source
This commit is contained in:
Robert Osfield
2008-07-22 12:40:02 +00:00
parent 5ab73e9f80
commit 14771d3a4d
6 changed files with 203 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/osgPlugins/osg/TextureCubeMap.cpp
View File

@@ -1,4 +1,5 @@
#include "osg/TextureCubeMap"
#include "osg/ImageSequence"
#include "osgDB/Registry"
#include "osgDB/Input"
@@ -27,7 +28,13 @@ RegisterDotOsgWrapperProxy g_TextureCubeMapProxy
matched = false;\
if (fr[1].matchWord(#FACE)) \
{\
if (fr[2].isString())\
if (fr[2].matchWord("ImageSequence") || fr[2].matchWord("Image")) \
{ \
osg::Image* image = fr.readImage(); \
if (image) texture.setImage(osg::TextureCubeMap::FACE,image); \
\
} \
else if (fr[2].isString())\
{ \
Image* image = fr.readImage(fr[2].getStr());\
if (image) texture.setImage(osg::TextureCubeMap::FACE,image);\
@@ -63,20 +70,28 @@ bool TextureCubeMap_readLocalData(Object& obj, Input& fr)
const osg::Image* image = texture.getImage(osg::TextureCubeMap::FACE);\
if (image)\
{\
std::string fileName = image->getFileName();\
if (fw.getOutputTextureFiles())\
{\
if (fileName.empty())\
const osg::ImageSequence* is = dynamic_cast<const osg::ImageSequence*>(image); \
if (is) \
{ \
fw.writeObject(*is); \
} \
else \
{ \
std::string fileName = image->getFileName();\
if (fw.getOutputTextureFiles())\
{\
fileName = fw.getTextureFileNameForOutput();\
if (fileName.empty())\
{\
fileName = fw.getTextureFileNameForOutput();\
}\
osgDB::writeImageFile(*image, fileName);\
}\
if (!fileName.empty())\
{\
fw.indent() << "image "<<#FACE<<" "<<fw.wrapString(fw.getFileNameForOutput(fileName))<< std::endl;\
}\
osgDB::writeImageFile(*image, fileName);\
}\
if (!fileName.empty())\
{\
fw.indent() << "image "<<#FACE<<" "<<fw.wrapString(fw.getFileNameForOutput(fileName))<< std::endl;\
}\
}\
} \
}
bool TextureCubeMap_writeLocalData(const Object& obj, Output& fw)