Changeset 11902

Timestamp:

11/09/10 13:41:55 (3 years ago)

Author:

robert

Message:

From Wang Rui, "I'd like to submit my latest modification of the serialization IO
functionalities. It includes two main parts: a version checking macro
for handling backward-compatiblity since 3.0, and enhencement of
current schema mechanism. I also change the option handling process to
use getPluginStringData(), and add new USE_SERIALIZER_WRAPPER macro in
the Registry header to allow for static-link usage as well.

The enhencement of schema machanism just tells the type of each
serializer while outputting them, such as:
osg::Group = Children:1

The meaning of the number can be found in the osgDB/Serializer header,
BaseSerializer::Type enum. It may help 3rdparty utilities understand
the structure of the wrapper and do some reflection work in the
future.

The new macro UPDATE_TO_VERSION can help indicate the InputStream? (no
affect on the writer) that a serializer is added/removed since certain
OSG version. An example wrapper file is also attached. The
Geode_modified.cpp is based on the serializers/osg/Geode.cpp file
(hey, don't merge it :-), but assumes that a new user serializer
'Test' is added since version 65 (that is, the OSG_SOVERSION):

REGISTER_OBJECT_WRAPPER( Geode, ... )
{

ADD_USER_SERIALIZER( Drawables ); // origin ones

UPDATE_TO_VERSION( 65 )
{

ADD_USER_SERIALIZER( Test ); // a serializer added from version 65

}

}

All kinds of ADD_... macros following UPDATE_TO_VERSION will
automatically apply the updated version. The braces here are only for
typesetting!
While reading an osgt/osgb/osgx file, OSG will now check if the file
version (recorded as the writer's soversion, instead of previous
meaningless "#Version 2") is equal or greater than Test's version, and
try reading it, or just ignore it if file version is lesser.

And we also have the REMOVE_SERIALIZER macro will mark a named
serializer as removed in some version, with which all files generated
by further versions will just ignore it:

UPDATE_TO_VERSION( 70 )
{

REMOVE_SERIALIZER( Test );

}

This means that from version 70, the serializer Test is removed (but
not actually erased from the list) and should not be read anymore. If
the read file version is less than 70 (and equal or greater than 65),
Test will still be handled when reading; otherwise it will be ignored
to keep compatiblity on different OSG versions.
"

Location:

OpenSceneGraph/trunk

Files:

• include/osgDB/InputStream (modified) (2 diffs)
• include/osgDB/ObjectWrapper (modified) (5 diffs)
• include/osgDB/Registry (modified) (1 diff)
• include/osgDB/Serializer (modified) (7 diffs)
• src/osgDB/InputStream.cpp (modified) (4 diffs)
• src/osgDB/ObjectWrapper.cpp (modified) (5 diffs)
• src/osgDB/OutputStream.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/include/osgDB/InputStream

@@ -70 +70 @@
     
     bool isBinary() const { return _in->isBinary(); }
+    int getFileVersion() const { return _fileVersion; }
     const osgDB::Options* getOptions() const { return _options.get(); }
     
@@ -160 +161 @@
     IdentifierMap _identifierMap;
     
+    int _fileVersion;
     int _byteSwap;
     bool _useSchemaData;

OpenSceneGraph/trunk/include/osgDB/ObjectWrapper

@@ -51 +51 @@
     ObjectWrapper( osg::Object* proto, const std::string& name,
                    const std::string& associates );
+    void setUpdatedVersion( int ver ) { _version = ver; }
     
     const osg::Object* getProto() const { return _proto.get(); }
     const std::string& getName() const { return _name; }
     const StringList& getAssociates() const { return _associates; }
-    
-    void addSerializer( BaseSerializer* s ) { _serializers.push_back(s); }
+
+    void addSerializer( BaseSerializer* s, BaseSerializer::Type t=BaseSerializer::RW_UNDEFINED )
+    { s->_version = _version; _serializers.push_back(s); _typeList.push_back(static_cast<int>(t)); }
+
+    void markSerializerAsRemoved( const std::string& name );
+    BaseSerializer* getSerializer( const std::string& name );
     void addFinishedObjectReadCallback ( FinishedObjectReadCallback* forc) { _finishedObjectReadCallbacks.push_back(forc); }
 
-    
     bool read( InputStream&, osg::Object& );
     bool write( OutputStream&, const osg::Object& );
-    
-    bool readSchema( const StringList& properties );
-    void writeSchema( StringList& properties );
+
+    bool readSchema( const StringList& properties, const std::vector<int>& types );
+    void writeSchema( StringList& properties, std::vector<int>& types );
     void resetSchema()
     { if ( _backupSerializers.size()>0 ) _serializers = _backupSerializers; }
     
 protected:
-    ObjectWrapper() {}
+    ObjectWrapper() : _version(0) {}
     virtual ~ObjectWrapper() {}
-    
+
     osg::ref_ptr<osg::Object> _proto;
     std::string _name;
@@ -77 +81 @@
     SerializerList _serializers;
     SerializerList _backupSerializers;
+    std::vector<int> _typeList;
     FinishedObjectReadCallbackList _finishedObjectReadCallbacks;
+    int _version;  // Last updated version of the wrapper
 };
 
@@ -144 +150 @@
 
 #define REGISTER_OBJECT_WRAPPER(NAME, PROTO, CLASS, ASSOCIATES) \
+    extern "C" void wrapper_serializer_##NAME(void) {} \
     extern void wrapper_propfunc_##NAME(osgDB::ObjectWrapper*); \
     static osgDB::RegisterWrapperProxy wrapper_proxy_##NAME( \
@@ -151 +158 @@
 
 #define REGISTER_OBJECT_WRAPPER2(NAME, PROTO, CLASS, CLASSNAME, ASSOCIATES) \
+    extern "C" void wrapper_serializer_##NAME(void) {} \
     extern void wrapper_propfunc_##NAME(osgDB::ObjectWrapper*); \
     static osgDB::RegisterWrapperProxy wrapper_proxy_##NAME( \
@@ -168 +176 @@
 
 #define REGISTER_COMPRESSOR(NAME, CLASS) \
+    extern "C" void wrapper_compressor_##CLASS(void) {} \
     static osgDB::RegisterCompressorProxy compressor_proxy_##CLASS(NAME, new CLASS);
 

OpenSceneGraph/trunk/include/osgDB/Registry

@@ -638 +638 @@
     static osgDB::PluginFunctionProxy proxy_dotosgwrapper_##classname(dotosgwrapper_##classname);
 
+#define USE_SERIALIZER_WRAPPER(classname) \
+    extern "C" void wrapper_serializer_##classname(void); \
+    static osgDB::PluginFunctionProxy proxy_serializer_##classname(wrapper_serializer_##classname);
+
+#define USE_COMPRESSOR_WRAPPER(classname) \
+    extern "C" void wrapper_serializer_##classname(void); \
+    static osgDB::PluginFunctionProxy proxy_compressor_##classname(wrapper_compressor_##classname);
+
 #define REGISTER_OSGPLUGIN(ext, classname) \
     extern "C" void osgdb_##ext(void) {} \

OpenSceneGraph/trunk/include/osgDB/Serializer

@@ -117 +117 @@
 class BaseSerializer : public osg::Referenced
 {
-public:
-    BaseSerializer() {}
+    friend class ObjectWrapper;
+public:
+    enum Type
+    {
+        RW_UNDEFINED = 0, RW_USER, RW_OBJECT, RW_IMAGE, RW_LIST,
+        RW_BOOL, RW_SHORT, RW_USHORT, RW_INT, RW_UINT, RW_FLOAT, RW_DOUBLE,
+        RW_VEC2F, RW_VEC2D, RW_VEC3F, RW_VEC3D, RW_VEC4F, RW_VEC4D, RW_QUAT, RW_PLANE,
+        RW_MATRIXF, RW_MATRIXD, RW_MATRIX, RW_GLENUM, RW_STRING, RW_ENUM
+    };
+
+    BaseSerializer() : _version(0) {}
     virtual bool read( InputStream&, osg::Object& ) = 0;
     virtual bool write( OutputStream&, const osg::Object& ) = 0;
     virtual const std::string& getName() const = 0;
+
+protected:
+    int _version;  // Library version when the serializer is added, or removed (neg value)
 };
 
@@ -768 +780 @@
 #define ADD_USER_SERIALIZER(PROP) \
     wrapper->addSerializer( new osgDB::UserSerializer<MyClass>( \
-        #PROP, &check##PROP, &read##PROP, &write##PROP) )
+        #PROP, &check##PROP, &read##PROP, &write##PROP), osgDB::BaseSerializer::RW_USER )
 
 #define ADD_BOOL_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, bool >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_BOOL )
 
 #define ADD_SHORT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, short >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_SHORT )
 
 #define ADD_USHORT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned short >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_USHORT )
 
 #define ADD_HEXSHORT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned short >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP, true) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP, true), osgDB::BaseSerializer::RW_USHORT )
 
 #define ADD_INT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, int >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_INT )
 
 #define ADD_UINT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned int >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_UINT )
         
 #define ADD_GLINT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, GLint >( \
-        #PROP, ((int)(DEF)), &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, ((int)(DEF)), &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_INT )
 
 #define ADD_HEXINT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned int >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP, true) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP, true), osgDB::BaseSerializer::RW_UINT )
 
 #define ADD_FLOAT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, float >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_FLOAT )
 
 #define ADD_DOUBLE_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, double >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_DOUBLE )
 
 #define ADD_VEC2F_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Vec2f >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_VEC2F )
 
 #define ADD_VEC2D_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Vec2d >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_VEC2D )
 
 #define ADD_VEC2_SERIALIZER(PROP, DEF) ADD_VEC2F_SERIALIZER(PROP, DEF)
@@ -822 +834 @@
 #define ADD_VEC3F_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Vec3f >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_VEC3F )
 
 #define ADD_VEC3D_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Vec3d >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_VEC3D )
 
 #define ADD_VEC3_SERIALIZER(PROP, DEF) ADD_VEC3F_SERIALIZER(PROP, DEF)
@@ -832 +844 @@
 #define ADD_VEC4F_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Vec4f >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_VEC4F )
 
 #define ADD_VEC4D_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Vec4d >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_VEC4D )
 
 #define ADD_VEC4_SERIALIZER(PROP, DEF) ADD_VEC4F_SERIALIZER(PROP, DEF)
@@ -842 +854 @@
 #define ADD_QUAT_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Quat >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_QUAT )
 
 #define ADD_PLANE_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Plane >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_PLANE )
 
 #define ADD_MATRIXF_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Matrixf >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_MATRIXF )
 
 #define ADD_MATRIXD_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::PropByRefSerializer< MyClass, osg::Matrixd >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_MATRIXD )
 
 #define ADD_MATRIX_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::MatrixSerializer< MyClass >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_MATRIX )
 
 #define ADD_GLENUM_SERIALIZER(PROP, TYPE, DEF) \
     wrapper->addSerializer( new osgDB::GLenumSerializer< MyClass, TYPE >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_GLENUM )
 
 #define ADD_STRING_SERIALIZER(PROP, DEF) \
     wrapper->addSerializer( new osgDB::StringSerializer< MyClass >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_STRING )
 
 #define ADD_OBJECT_SERIALIZER(PROP, TYPE, DEF) \
     wrapper->addSerializer( new osgDB::ObjectSerializer< MyClass, TYPE >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_OBJECT )
 
 #define ADD_IMAGE_SERIALIZER(PROP, TYPE, DEF) \
     wrapper->addSerializer( new osgDB::ImageSerializer< MyClass, TYPE >( \
-        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_IMAGE )
 
 #define ADD_LIST_SERIALIZER(PROP, TYPE) \
     wrapper->addSerializer( new osgDB::ListSerializer< MyClass, TYPE >( \
-        #PROP, &MyClass::get##PROP, &MyClass::set##PROP) )
+        #PROP, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_LIST )
 
 #define BEGIN_ENUM_SERIALIZER(PROP, DEF) \
@@ -900 +912 @@
         #PROP, PROPERTIES_CLASS::DEF, &MyClass::get##PROP, &MyClass::set##PROP)
 
-
 #define ADD_ENUM_VALUE(VALUE) \
     serializer->add(#VALUE, MyClass::VALUE)
@@ -908 +919 @@
 
 #define END_ENUM_SERIALIZER() \
-    wrapper->addSerializer(serializer.get()); }
+    wrapper->addSerializer(serializer.get(), osgDB::BaseSerializer::RW_ENUM); }
+
+// VERSION CONTROL OPERATORS
+#define UPDATE_TO_VERSION(VER) \
+    wrapper->setUpdatedVersion( (VER) );
+
+#define REMOVE_SERIALIZER(PROP) \
+    wrapper->markSerializerAsRemoved( #PROP );
 
 }

OpenSceneGraph/trunk/src/osgDB/InputStream.cpp

@@ -25 +25 @@
 
 InputStream::InputStream( const osgDB::Options* options )
-    :   _byteSwap(0), _useSchemaData(false), _forceReadingImage(false), _dataDecompress(0)
+    :   _fileVersion(0), _byteSwap(0), _useSchemaData(false), _forceReadingImage(false), _dataDecompress(0)
 {
     if ( !options ) return;
@@ -31 +31 @@
     
     std::string schema;
-    StringList optionList;
-    split( options->getOptionString(), optionList );
-    for ( StringList::iterator itr=optionList.begin(); itr!=optionList.end(); ++itr )
-    {
-        const std::string& option = *itr;
-        if ( option=="Ascii" )
-        {
-            // Omit this
-        }
-        else if ( option=="ForceReadingImage" )
-        {
-            _forceReadingImage = true;
-        }
-        else
-        {
-            StringList keyAndValues;
-            split( option, keyAndValues, '=' );
-            if ( keyAndValues.size()<2 ) continue;
-            
-            if ( keyAndValues[0]=="SchemaFile" )
-            {
-                schema = keyAndValues[1];
-                if ( s_lastSchema!=schema )
-                {
-                    osgDB::ifstream schemaStream( schema.c_str(), std::ios::in );
-                    if ( !schemaStream.fail() ) readSchema( schemaStream );
-                    schemaStream.close();
-                    s_lastSchema = schema;
-                }
-            }
-            else
-                OSG_WARN << "InputStream: Unknown option " << option << std::endl;
-        }
-    }
+    if ( options->getPluginStringData("ForceReadingImage")=="true" )
+        _forceReadingImage = true;
+    if ( !options->getPluginStringData("SchemaFile").empty() )
+    {
+        schema = options->getPluginStringData("SchemaFile");
+        if ( s_lastSchema!=schema )
+        {
+            osgDB::ifstream schemaStream( schema.c_str(), std::ios::in );
+            if ( !schemaStream.fail() ) readSchema( schemaStream );
+            schemaStream.close();
+            s_lastSchema = schema;
+        }
+    }
+    
     if ( schema.empty() )
     {
@@ -734 +714 @@
     }
     
-    // Check file version
-    if ( version!=PLUGIN_VERSION )
-    {
-        OSG_WARN << "InputStream: Input data version " << version
-                               << " may be incompatible with current reader version "
-                               << PLUGIN_VERSION << std::endl;
-    }
+    // Record file version for back-compatibility checking of wrappers
+    _fileVersion = version;
     _fields.pop_back();
     return type;
@@ -794 +769 @@
     }
     
-    StringList schema;
+    StringList schema, methods, keyAndValue;
+    std::vector<int> types;
     split( properties, schema );
-    wrapper->readSchema( schema );
+    for ( StringList::iterator itr=schema.begin(); itr!=schema.end(); ++itr )
+    {
+        split( *itr, keyAndValue, ':' );
+        if ( keyAndValue.size()>1 )
+        {
+            methods.push_back( keyAndValue.front() );
+            types.push_back( atoi(keyAndValue.back().c_str()) );
+        }
+        else
+        {
+            methods.push_back( *itr );
+            types.push_back( 0 );
+        }
+        keyAndValue.clear();
+    }
+    wrapper->readSchema( methods, types );
 }
 

OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp

@@ -87 +87 @@
                               const std::string& associates )
 :   osg::Referenced(),
-    _proto(proto), _name(name)
+    _proto(proto), _name(name), _version(0)
 {
     split( associates, _associates );
+}
+
+void ObjectWrapper::markSerializerAsRemoved( const std::string& name )
+{
+    for ( SerializerList::iterator itr=_serializers.begin(); itr!=_serializers.end(); ++itr )
+    {
+        // When a serializer is marked as 'removed', it means that this serializer won't be used any more
+        // from specified OSG version (by macro UPDATE_TO_VERSION). The read() functions of higher versions
+        // will thus ignore it according to the sign and value of the _version variable.
+        if ( (*itr)->getName()==name )
+            (*itr)->_version = -_version;
+    }
+}
+
+BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
+{
+    for ( SerializerList::iterator itr=_serializers.begin(); itr!=_serializers.end(); ++itr )
+    {
+        if ( (*itr)->getName()==name )
+            return *itr;
+    }
+    
+    for ( StringList::const_iterator itr=_associates.begin(); itr!=_associates.end(); ++itr )
+    {
+        const std::string& assocName = *itr;
+        ObjectWrapper* assocWrapper = Registry::instance()->getObjectWrapperManager()->findWrapper(assocName);
+        if ( !assocWrapper )
+        {
+            osg::notify(osg::WARN) << "ObjectWrapper::getSerializer(): Unsupported associated class "
+                                   << assocName << std::endl;
+            continue;
+        }
+        
+        for ( SerializerList::iterator aitr=assocWrapper->_serializers.begin();
+              aitr!=assocWrapper->_serializers.end(); ++aitr )
+        {
+            if ( (*aitr)->getName()==name )
+                return *aitr;
+        }
+    }
+    return NULL;
 }
 
@@ -98 +139 @@
           itr!=_serializers.end(); ++itr )
     {
+        int serializerVersion = (*itr)->_version;
+        if ( serializerVersion!=0 )
+        {
+            if ( serializerVersion<0 )
+            {
+                serializerVersion = -serializerVersion;
+                
+                // The serializer is removed from a specified version,
+                // and the file in reading is at the same or higher version, ignore it.
+                if ( is.getFileVersion()>=serializerVersion ) continue;
+            }
+            else
+            {
+                // The serializer is added at a specified version,
+                // but the file in reading is at a lower version, ignore it.
+                if ( is.getFileVersion()<serializerVersion ) continue;
+            }
+        }
+        
         if ( (*itr)->read(is, obj) ) continue;
         OSG_WARN << "ObjectWrapper::read(): Error reading property "
@@ -128 +188 @@
 }
 
-bool ObjectWrapper::readSchema( const StringList& properties )
-{
+bool ObjectWrapper::readSchema( const StringList& properties, const std::vector<int>& )
+{
+    // FIXME: At present, I didn't do anything to determine serializers from their types...
     if ( !_backupSerializers.size() )
         _backupSerializers = _serializers;
@@ -170 +231 @@
 }
 
-void ObjectWrapper::writeSchema( StringList& properties )
+void ObjectWrapper::writeSchema( StringList& properties, std::vector<int>& types )
 {
     for ( SerializerList::iterator itr=_serializers.begin();
@@ -176 +237 @@
     {
         properties.push_back( (*itr)->getName() );
+    }
+    
+    for ( std::vector<int>::iterator itr=_typeList.begin();
+          itr!=_typeList.end(); ++itr )
+    {
+        types.push_back( (*itr) );
     }
 }

OpenSceneGraph/trunk/src/osgDB/OutputStream.cpp

@@ -19 +19 @@
 #include <osgDB/ObjectWrapper>
 #include <fstream>
+#include <sstream>
 
 using namespace osgDB;
@@ -28 +29 @@
     _options = options;
     
-    StringList optionList;
-    split( options->getOptionString(), optionList );
-    for ( StringList::iterator itr=optionList.begin(); itr!=optionList.end(); ++itr )
-    {
-        const std::string& option = *itr;
-        if ( option=="Ascii" )
-        {
-            // Omit this
-        }
-        else if ( option=="SchemaData" )
-        {
-            _useSchemaData = true;
-        }
-        else
-        {
-            StringList keyAndValues;
-            split( option, keyAndValues, '=' );
-            if ( keyAndValues.size()<2 ) continue;
-            
-            if ( keyAndValues[0]=="SchemaFile" )
-                _schemaName = keyAndValues[1];
-            else if ( keyAndValues[0]=="Compressor" )
-                _compressorName = keyAndValues[1];
-            else if ( keyAndValues[0]=="WriteImageHint" )
-            {
-                if ( keyAndValues[1]=="IncludeData" ) _writeImageHint = WRITE_INLINE_DATA;
-                else if ( keyAndValues[1]=="IncludeFile" ) _writeImageHint = WRITE_INLINE_FILE;
-                else if ( keyAndValues[1]=="UseExternal" ) _writeImageHint = WRITE_USE_EXTERNAL;
-                else if ( keyAndValues[1]=="WriteOut" ) _writeImageHint = WRITE_EXTERNAL_FILE;
-            }
-            else
-                OSG_WARN << "OutputStream: Unknown option " << option << std::endl;
-        }
+    if ( options->getPluginStringData("SchemaData")=="true" )
+        _useSchemaData = true;
+    if ( !options->getPluginStringData("SchemaFile").empty() )
+        _schemaName = options->getPluginStringData("SchemaFile");
+    if ( !options->getPluginStringData("Compressor").empty() )
+        _compressorName = options->getPluginStringData("Compressor");
+    if ( !options->getPluginStringData("WriteImageHint").empty() )
+    {
+        std::string hintString = options->getPluginStringData("WriteImageHint");
+        if ( hintString=="IncludeData" ) _writeImageHint = WRITE_INLINE_DATA;
+        else if ( hintString=="IncludeFile" ) _writeImageHint = WRITE_INLINE_FILE;
+        else if ( hintString=="UseExternal" ) _writeImageHint = WRITE_USE_EXTERNAL;
+        else if ( hintString=="WriteOut" ) _writeImageHint = WRITE_EXTERNAL_FILE;
     }
 }
@@ -491 +472 @@
             {
                 StringList properties;
-                assocWrapper->writeSchema( properties );
-                if ( properties.size()>0 )
+                std::vector<int> types;
+                assocWrapper->writeSchema( properties, types );
+                
+                unsigned int size = osg::minimum( properties.size(), types.size() );
+                if ( size>0 )
                 {
-                    std::string propertiesString;
-                    for ( StringList::iterator sitr=properties.begin(); sitr!=properties.end(); ++sitr )
+                    std::stringstream propertiesStream;
+                    for ( unsigned int i=0; i<size; ++i )
                     {
-                        propertiesString += *sitr;
-                        propertiesString += ' ';
+                        propertiesStream << properties[i] << ":" << types[i] << " ";
                     }
-                    _inbuiltSchemaMap[assocName] = propertiesString;
+                    _inbuiltSchemaMap[assocName] = propertiesStream.str();
                 }
             }
@@ -527 +510 @@
     if ( isBinary() )
     {
-        *this << (unsigned int)type << (unsigned int)PLUGIN_VERSION;
+        *this << (unsigned int)type << (unsigned int)OPENSCENEGRAPH_SOVERSION;
         
         bool useCompressSource = false;
@@ -575 +558 @@
         
         *this << typeString << std::endl;
-        *this << PROPERTY("#Version") << (unsigned int)PLUGIN_VERSION << std::endl;
+        *this << PROPERTY("#Version") << (unsigned int)OPENSCENEGRAPH_SOVERSION << std::endl;
         *this << PROPERTY("#Generator") << std::string("OpenSceneGraph")
               << std::string(osgGetVersion()) << std::endl;
@@ -643 +626 @@
         
         StringList properties;
-        wrapper->writeSchema( properties );
-        if ( properties.size()>0 )
-        {
-            for ( StringList::iterator sitr=properties.begin(); sitr!=properties.end(); ++sitr )
-            {
-                fout << ' ' << *sitr;
-            }
+        std::vector<int> types;
+        wrapper->writeSchema( properties, types );
+        
+        std::string propertiesString;
+        unsigned int size = osg::minimum( properties.size(), types.size() );
+        for ( unsigned int i=0; i<size; ++i )
+        {
+            fout << " " << properties[i] << ":" << types[i];
         }
         fout << std::endl;