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

Introduced support for specifying whether a serializer supports different types of usage - one or more of READ_WRITE_PROPERTY, GET_PROPERTY and SET_PROPERTY.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14437 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-09-05 11:05:43 +00:00
parent 21fc2fae8d
commit 9e9fe9b9c9
4 changed files with 103 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osgDB/ObjectWrapper.cpp
View File

@@ -199,7 +199,8 @@ bool ObjectWrapper::read( InputStream& is, osg::Object& obj )
{
BaseSerializer* serializer = itr->get();
if ( serializer->_firstVersion <= inputVersion &&
inputVersion <= serializer->_lastVersion )
inputVersion <= serializer->_lastVersion &&
serializer->supportsReadWrite())
{
if ( !serializer->read(is, obj) )
{
@@ -233,7 +234,8 @@ bool ObjectWrapper::write( OutputStream& os, const osg::Object& obj )
{
BaseSerializer* serializer = itr->get();
if ( serializer->_firstVersion <= outputVersion &&
outputVersion <= serializer->_lastVersion )
outputVersion <= serializer->_lastVersion &&
serializer->supportsReadWrite())
{
if ( !serializer->write(os, obj) )
{
@@ -295,16 +297,17 @@ bool ObjectWrapper::readSchema( const StringList& properties, const TypeList& )
void ObjectWrapper::writeSchema( StringList& properties, TypeList& types )
{
for ( SerializerList::iterator itr=_serializers.begin();
itr!=_serializers.end(); ++itr )
SerializerList::iterator sitr = _serializers.begin();
TypeList::iterator titr = _typeList.begin();
while(sitr!=_serializers.end() && titr!=_typeList.end())
{
properties.push_back( (*itr)->getName() );
}
for ( TypeList::iterator itr=_typeList.begin();
itr!=_typeList.end(); ++itr )
{
types.push_back( (*itr) );
if ((*sitr)->supportsReadWrite())
{
properties.push_back( (*sitr)->getName() );
types.push_back( (*titr) );
}
++sitr;
++titr;
}
}