Changeset 11903 for OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp

Timestamp:

11/09/10 14:23:43 (3 years ago)

Author:

robert

Message:

Refactored the versioning of serializers so it now uses a _firstVersion and _lastVersion make it possible
to specify what range of versions support each serializer.

Files:

• OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp

@@ -92 +92 @@
 }
 
+void ObjectWrapper::addSerializer( BaseSerializer* s, BaseSerializer::Type t )
+{
+    s->_firstVersion = _version;
+    _serializers.push_back(s);
+    _typeList.push_back(static_cast<int>(t));
+}
+
 void ObjectWrapper::markSerializerAsRemoved( const std::string& name )
 {
@@ -100 +107 @@
         // will thus ignore it according to the sign and value of the _version variable.
         if ( (*itr)->getName()==name )
-            (*itr)->_version = -_version;
+            (*itr)->_lastVersion = _version-1;
     }
 }
@@ -139 +146 @@
           itr!=_serializers.end(); ++itr )
     {
-        int serializerVersion = (*itr)->_version;
-        if ( serializerVersion!=0 )
-        {
-            if ( serializerVersion<0 )
+        BaseSerializer* serializer = itr->get();
+        if ( serializer->_firstVersion <= is.getFileVersion() &&
+             is.getFileVersion() <= serializer->_lastVersion)
+        {
+            if ( !serializer->read(is, obj) )
             {
-                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;
+                OSG_WARN << "ObjectWrapper::read(): Error reading property "
+                                    << _name << "::" << (*itr)->getName() << std::endl;
+                readOK = false;
             }
-            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 "
-                               << _name << "::" << (*itr)->getName() << std::endl;
-        readOK = false;
+        }
+        else
+        {
+            // OSG_NOTICE<<"Ignoring serializer due to version mismatch"<<std::endl;
+        }
     }