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

Removed serailizers that are now supplied by osg::Node

Browse Source
This commit is contained in:
Robert Osfield
2018-03-23 19:54:33 +00:00
parent 1d5ae1362a
commit 647b578ce6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgWrappers/serializers/osg/Drawable.cpp
View File

@@ -41,11 +41,6 @@ REGISTER_OBJECT_WRAPPER( Drawable,
}
ADD_OBJECT_SERIALIZER( StateSet, osg::StateSet, NULL ); // _stateset
{
UPDATE_TO_VERSION_SCOPED( 156 )
REMOVE_SERIALIZER( StateSet ) // now provided by Node's serialization of StateSet
}
ADD_USER_SERIALIZER( InitialBound ); // _initialBound
ADD_OBJECT_SERIALIZER( ComputeBoundingBoxCallback,
osg::Drawable::ComputeBoundingBoxCallback, NULL ); // _computeBoundCallback
@@ -57,6 +52,15 @@ REGISTER_OBJECT_WRAPPER( Drawable,
ADD_OBJECT_SERIALIZER( EventCallback, osg::Callback, NULL ); // _eventCallback
ADD_OBJECT_SERIALIZER( CullCallback, osg::Callback, NULL ); // _cullCallback
ADD_OBJECT_SERIALIZER( DrawCallback, osg::Drawable::DrawCallback, NULL ); // _drawCallback
{
//now provided by Node's serialization
UPDATE_TO_VERSION_SCOPED( 156 )
REMOVE_SERIALIZER( StateSet )
REMOVE_SERIALIZER( UpdateCallback )
REMOVE_SERIALIZER( EventCallback )
REMOVE_SERIALIZER( CullCallback )
REMOVE_SERIALIZER( DrawCallback )
}
{
UPDATE_TO_VERSION_SCOPED( 142 )