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

Added support for NodeMask to osg::Drawable serializers

Browse Source
This commit is contained in:
Robert Osfield 2016-02-11 16:25:47 +00:00
parent 3e0435febd
commit 9bde2ef631
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -54,7 +54,7 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 3) SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 5) SET(OPENSCENEGRAPH_MINOR_VERSION 5)
SET(OPENSCENEGRAPH_PATCH_VERSION 1) SET(OPENSCENEGRAPH_PATCH_VERSION 1)
SET(OPENSCENEGRAPH_SOVERSION 141) SET(OPENSCENEGRAPH_SOVERSION 142)
# set to 0 when not a release candidate, non zero means that any generated # set to 0 when not a release candidate, non zero means that any generated
# svn tags will be treated as release candidates of given number # svn tags will be treated as release candidates of given number

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

@ -47,4 +47,9 @@ REGISTER_OBJECT_WRAPPER( Drawable,
ADD_OBJECT_SERIALIZER( EventCallback, osg::Callback, NULL ); // _eventCallback ADD_OBJECT_SERIALIZER( EventCallback, osg::Callback, NULL ); // _eventCallback
ADD_OBJECT_SERIALIZER( CullCallback, osg::Callback, NULL ); // _cullCallback ADD_OBJECT_SERIALIZER( CullCallback, osg::Callback, NULL ); // _cullCallback
ADD_OBJECT_SERIALIZER( DrawCallback, osg::Drawable::DrawCallback, NULL ); // _drawCallback ADD_OBJECT_SERIALIZER( DrawCallback, osg::Drawable::DrawCallback, NULL ); // _drawCallback
{
UPDATE_TO_VERSION_SCOPED( 142 )
ADD_HEXINT_SERIALIZER( NodeMask, 0xffffffff ); // _nodeMask
}
} }