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

From Wang Rui, "I've fixed the bug of writing/reading scenes including the ImageSequence serializer. Current trunk version will fail when handing image sequences because it forces to set className to "osg::Image" in InputStream.cpp. I have to read a value saved in file instead so I must add a hardhanded version checking for backward compatibility.

Browse Source 
Now we can work with ImageSequence objects, in both osgt and osgb files."
This commit is contained in:
Robert Osfield
2013-01-28 14:56:52 +00:00
parent 45585b78fb
commit 84c857d24d
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgDB/InputStream.cpp
View File

@@ -481,10 +481,11 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
osg::Image* InputStream::readImage(bool readFromExternal)
{
std::string className = "osg::Image";
if ( _fileVersion>94 ) // ClassName property is only supported in 3.1.4 and higher
*this >> PROPERTY("ClassName") >> className;
std::string className="osg::Image";
unsigned int id = 0;
*this >> PROPERTY("UniqueID") >> id;
if ( getException() ) return NULL;
@@ -501,14 +502,11 @@ osg::Image* InputStream::readImage(bool readFromExternal)
if ( getException() ) return NULL;
osg::ref_ptr<osg::Image> image = NULL;
switch ( decision )
{
case IMAGE_INLINE_DATA:
if ( isBinary() )
{
image = new osg::Image;
// _origin, _s & _t & _r, _internalTextureFormat
int origin, s, t, r, internalFormat;
*this >> origin >> s >> t >> r >> internalFormat;
@@ -527,6 +525,7 @@ osg::Image* InputStream::readImage(bool readFromExternal)
if ( getException() ) return NULL;
readCharArray( data, size );
image = new osg::Image;
image->setOrigin( (osg::Image::Origin)origin );
image->setImage( s, t, r, internalFormat, pixelFormat, dataType,
(unsigned char*)data, (osg::Image::AllocationMode)mode, packing );
@@ -539,7 +538,7 @@ osg::Image* InputStream::readImage(bool readFromExternal)
{
*this >> levels[i];
}
if ( levelSize>0 )
if ( image && levelSize>0 )
image->setMipmapLevels( levels );
readFromExternal = false;
}
@@ -591,20 +590,19 @@ osg::Image* InputStream::readImage(bool readFromExternal)
break;
}
if ( readFromExternal )
if ( readFromExternal && !name.empty() )
{
image = osgDB::readImageFile( name, getOptions() );
if ( !image && _forceReadingImage ) image = new osg::Image;
}
image = static_cast<osg::Image*>( readObjectFields(className, id, image.get()) );
if ( image.valid() )
{
image->setFileName( name );
image->setWriteHint( (osg::Image::WriteHint)writeHint );
}
image = static_cast<osg::Image*>( readObjectFields(className, id, image.get()) );
return image.release();
return image.release();
}
osg::Object* InputStream::readObject( osg::Object* existingObj )
@@ -654,7 +652,6 @@ osg::Object* InputStream::readObjectFields( const std::string& className, unsign
continue;
}
_fields.push_back( assocWrapper->getName() );
assocWrapper->read( *this, *obj );
if ( getException() ) return NULL;

8
src/osgDB/OutputStream.cpp
View File

@@ -306,14 +306,14 @@ void OutputStream::writeImage( const osg::Image* img )
{
if ( !img ) return;
// std::string name = img->libraryName();
// name += std::string("::") + img->className();
std::string name = img->libraryName();
name += std::string("::") + img->className();
bool newID = false;
unsigned int id = findOrCreateObjectID( img, newID );
// *this << name << BEGIN_BRACKET << std::endl; // Write object name
*this << PROPERTY("UniqueID") << id << std::endl; // Write image ID
*this << PROPERTY("ClassName") << name << std::endl; // Write object name
*this << PROPERTY("UniqueID") << id << std::endl; // Write image ID
if ( getException() ) return;
if (newID)