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

Added support for new osg::Object user objects.

Browse Source
This commit is contained in:
Robert Osfield 2011-06-02 22:05:10 +00:00
parent c703f39459
commit b5d00a1450
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/osgWrappers/serializers/osg/Object.cpp
View File

@ -2,6 +2,8 @@
#include <osgDB/ObjectWrapper> #include <osgDB/ObjectWrapper>
#include <osgDB/InputStream> #include <osgDB/InputStream>
#include <osgDB/OutputStream> #include <osgDB/OutputStream>
#include <osg/Notify>
#include <string.h>
static bool checkUserData( const osg::Object& obj ) static bool checkUserData( const osg::Object& obj )
{ {
@ -25,6 +27,34 @@ static bool writeUserData( osgDB::OutputStream& os, const osg::Object& obj )
return true; return true;
} }
static bool checkUserObjects( const osg::Object& obj )
{
return obj.getNumUserObjects()>0;
}
static bool readUserObjects( osgDB::InputStream& is, osg::Object& obj )
{
unsigned int size = is.readSize(); is >> osgDB::BEGIN_BRACKET;
for( unsigned int i=0; i<size; ++i )
{
osg::Object* read_object = is.readObject();
if (read_object) obj.addUserObject( read_object );
}
is >> osgDB::END_BRACKET;
return true;
}
static bool writeUserObjects( osgDB::OutputStream& os, const osg::Object& obj )
{
unsigned int numObjects = obj.getNumUserObjects();
os.writeSize(numObjects); os << osgDB::BEGIN_BRACKET << std::endl;
for ( unsigned int i=0; i<numObjects; ++i )
{
os << obj.getUserObject(i);
}
os << osgDB::END_BRACKET << std::endl;
return true;
}
REGISTER_OBJECT_WRAPPER( Object, REGISTER_OBJECT_WRAPPER( Object,
/*new osg::Object*/NULL, /*new osg::Object*/NULL,
@ -40,4 +70,9 @@ REGISTER_OBJECT_WRAPPER( Object,
END_ENUM_SERIALIZER(); // _dataVariance END_ENUM_SERIALIZER(); // _dataVariance
ADD_USER_SERIALIZER( UserData ); // _userData ADD_USER_SERIALIZER( UserData ); // _userData
UPDATE_TO_VERSION( 77 )
{
ADD_USER_SERIALIZER( UserObjects ); // _userData
}
} }

45
src/osgWrappers/serializers/osg/ValueObject.cpp Normal file
View File

@ -0,0 +1,45 @@
#include <osg/ValueObject>
#include <osgDB/ObjectWrapper>
#include <osgDB/InputStream>
#include <osgDB/OutputStream>
#include <osg/Notify>
#include <string.h>
#define WRAPVALUEOBJECT( TYPE, INHERITANCE_STRING, SERIALIZER_TYPE, DEFAULT) \
namespace Wrap##TYPE \
{ \
REGISTER_OBJECT_WRAPPER( TYPE, \
new osg::TYPE, \
osg::TYPE, \
INHERITANCE_STRING ) \
{ \
SERIALIZER_TYPE( Value, DEFAULT ); \
} \
} \
WRAPVALUEOBJECT( BoolValueObject, "osg::Object osg::BoolValueObject", ADD_REF_BOOL_SERIALIZER, 0)
WRAPVALUEOBJECT( CharValueObject, "osg::Object osg::CharValueObject", ADD_REF_CHAR_SERIALIZER, 0)
WRAPVALUEOBJECT( UCharValueObject, "osg::Object osg::UCharValueObject", ADD_REF_UCHAR_SERIALIZER, 0u)
WRAPVALUEOBJECT( ShortValueObject, "osg::Object osg::ShortValueObject", ADD_REF_SHORT_SERIALIZER, 0)
WRAPVALUEOBJECT( UShortValueObject, "osg::Object osg::UShortValueObject", ADD_REF_USHORT_SERIALIZER, 0u)
WRAPVALUEOBJECT( IntValueObject, "osg::Object osg::IntValueObject", ADD_REF_INT_SERIALIZER, 0)
WRAPVALUEOBJECT( UIntValueObject, "osg::Object osg::UIntValueObject", ADD_REF_UINT_SERIALIZER, 0u)
WRAPVALUEOBJECT( FloatValueObject, "osg::Object osg::FloatValueObject", ADD_REF_FLOAT_SERIALIZER, 0.0f)
WRAPVALUEOBJECT( DoubleValueObject, "osg::Object osg::DoubleValueObject", ADD_REF_DOUBLE_SERIALIZER, 0.0)
WRAPVALUEOBJECT( StringValueObject, "osg::Object osg::StringValueObject", ADD_STRING_SERIALIZER, std::string())
WRAPVALUEOBJECT( Vec2fValueObject, "osg::Object osg::Vec2fValueObject", ADD_VEC2F_SERIALIZER, osg::Vec2f())
WRAPVALUEOBJECT( Vec3fValueObject, "osg::Object osg::Vec3fValueObject", ADD_VEC3F_SERIALIZER, osg::Vec3f())
WRAPVALUEOBJECT( Vec4fValueObject, "osg::Object osg::Vec4fValueObject", ADD_VEC4F_SERIALIZER, osg::Vec4f())
WRAPVALUEOBJECT( Vec2dValueObject, "osg::Object osg::Vec2dValueObject", ADD_VEC2D_SERIALIZER, osg::Vec2d())
WRAPVALUEOBJECT( Vec3dValueObject, "osg::Object osg::Vec3dValueObject", ADD_VEC3D_SERIALIZER, osg::Vec3d())
WRAPVALUEOBJECT( Vec4dValueObject, "osg::Object osg::Vec4dValueObject", ADD_VEC4D_SERIALIZER, osg::Vec4d())
WRAPVALUEOBJECT( PlaneValueObject, "osg::Object osg::PlaneValueObject", ADD_PLANE_SERIALIZER, osg::Plane())
WRAPVALUEOBJECT( QuatValueObject, "osg::Object osg::QuatValueObject", ADD_QUAT_SERIALIZER, osg::Quat())
WRAPVALUEOBJECT( MatrixfValueObject, "osg::Object osg::MatrixfValueObject", ADD_MATRIXF_SERIALIZER, osg::Matrixf())
WRAPVALUEOBJECT( MatrixdValueObject, "osg::Object osg::MatrixdValueObject", ADD_MATRIXD_SERIALIZER, osg::Matrixd())