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

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

@ -148,7 +148,7 @@ public:
std::ios::openmode mode = std::ios::in;
Options* local_opt = prepareReading( result, fileName, mode, options );
if ( !result.success() ) return result;
osgDB::ifstream istream( fileName.c_str(), mode );
return readObject( istream, local_opt );
}
@ -157,14 +157,17 @@ public:
{
osg::ref_ptr<InputIterator> ii = readInputIterator(fin, options);
if ( !ii ) return ReadResult::FILE_NOT_HANDLED;
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);
return ReadResult::FILE_NOT_HANDLED;
}
is.decompress(); CATCH_EXCEPTION(is);
osg::Object* obj = is.readObject(); CATCH_EXCEPTION(is);
return obj;
}