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

Fixed the readObject method so it could handle reading from a file contains any valid type of osg::Object

Browse Source
This commit is contained in:
Robert Osfield 2010-11-30 14:36:37 +00:00
parent 55749eda59
commit e9cd13f120
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgPlugins/osg/ReaderWriterOSG2.cpp
View File

@ -159,12 +159,15 @@ public:
if ( !ii ) return ReadResult::FILE_NOT_HANDLED; if ( !ii ) return ReadResult::FILE_NOT_HANDLED;
InputStream is( options ); InputStream is( options );
if ( is.start(ii.get())!=InputStream::READ_OBJECT )
osgDB::InputStream::ReadType readType = is.start(ii.get());
if ( readType==InputStream::READ_UNKNOWN )
{ {
CATCH_EXCEPTION(is); CATCH_EXCEPTION(is);
return ReadResult::FILE_NOT_HANDLED; return ReadResult::FILE_NOT_HANDLED;
} }
is.decompress(); CATCH_EXCEPTION(is); is.decompress(); CATCH_EXCEPTION(is);
osg::Object* obj = is.readObject(); CATCH_EXCEPTION(is); osg::Object* obj = is.readObject(); CATCH_EXCEPTION(is);
return obj; return obj;
} }