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

Refactored the versioning of serializers so it now uses a _firstVersion and _lastVersion make it possible

Browse Source 
to specify what range of versions support each serializer.
This commit is contained in:
Robert Osfield
2010-11-09 13:23:43 +00:00
parent b8a94a6d4e
commit b7cccf6258
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgDB/ObjectWrapper
View File

@@ -56,9 +56,7 @@ public:
const std::string& getName() const { return _name; }
const StringList& getAssociates() const { return _associates; }
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 addSerializer( BaseSerializer* s, BaseSerializer::Type t=BaseSerializer::RW_UNDEFINED );
void markSerializerAsRemoved( const std::string& name );
BaseSerializer* getSerializer( const std::string& name );
void addFinishedObjectReadCallback ( FinishedObjectReadCallback* forc) { _finishedObjectReadCallbacks.push_back(forc); }

9
include/osgDB/Serializer
View File

@@ -20,9 +20,10 @@
#include <osg/Object>
#include <osgDB/InputStream>
#include <osgDB/OutputStream>
#include <string>
#include <sstream>
#include <limits.h>
namespace osgDB
{
@@ -126,13 +127,15 @@ public:
RW_MATRIXF, RW_MATRIXD, RW_MATRIX, RW_GLENUM, RW_STRING, RW_ENUM
};
BaseSerializer() : _version(0) {}
BaseSerializer() : _firstVersion(0), _lastVersion(INT_MAX) {}
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)
int _firstVersion; // Library version when the serializer is first introduced
int _lastVersion; // Library version when the serializer is last required.
};
template<typename C>