diff --git a/src/osgWrappers/serializers/osg/ComputeBoundingBoxCallback.cpp b/src/osgWrappers/serializers/osg/ComputeBoundingBoxCallback.cpp index f07bb1a1f..ec5d7c2ba 100644 --- a/src/osgWrappers/serializers/osg/ComputeBoundingBoxCallback.cpp +++ b/src/osgWrappers/serializers/osg/ComputeBoundingBoxCallback.cpp @@ -6,11 +6,11 @@ #include #include -REGISTER_OBJECT_WRAPPER2(osg_ComputeBoundingBoxCallback, - new osg::Drawable::ComputeBoundingBoxCallback, - osg::Drawable::ComputeBoundingBoxCallback, - "osg::ComputeBoundingBoxCallback", - "osg::Object osg::ComputeBoundingBoxCallback") { +REGISTER_OBJECT_WRAPPER2(ComputeBoundingBoxCallback, + new osg::Drawable::ComputeBoundingBoxCallback, + osg::Drawable::ComputeBoundingBoxCallback, + "osg::ComputeBoundingBoxCallback", + "osg::Object osg::ComputeBoundingBoxCallback") { } #undef OBJECT_CAST diff --git a/src/osgWrappers/serializers/osg/ComputeBoundingSphereCallback.cpp b/src/osgWrappers/serializers/osg/ComputeBoundingSphereCallback.cpp new file mode 100644 index 000000000..9af99a2a1 --- /dev/null +++ b/src/osgWrappers/serializers/osg/ComputeBoundingSphereCallback.cpp @@ -0,0 +1,17 @@ +#undef OBJECT_CAST +#define OBJECT_CAST dynamic_cast + +#include +#include +#include +#include + +REGISTER_OBJECT_WRAPPER2(ComputeBoundingSphereCallback, + new osg::Node::ComputeBoundingSphereCallback, + osg::Node::ComputeBoundingSphereCallback, + "osg::ComputeBoundingSphereCallback", + "osg::Object osg::ComputeBoundingSphereCallback") { +} + +#undef OBJECT_CAST +#define OBJECT_CAST static_cast diff --git a/src/osgWrappers/serializers/osg/LibraryWrapper.cpp b/src/osgWrappers/serializers/osg/LibraryWrapper.cpp index 8d7a84533..1cd56deda 100644 --- a/src/osgWrappers/serializers/osg/LibraryWrapper.cpp +++ b/src/osgWrappers/serializers/osg/LibraryWrapper.cpp @@ -24,6 +24,8 @@ USE_SERIALIZER_WRAPPER(ClusterCullingCallback) USE_SERIALIZER_WRAPPER(ColorMask) USE_SERIALIZER_WRAPPER(ColorMatrix) USE_SERIALIZER_WRAPPER(CompositeShape) +USE_SERIALIZER_WRAPPER(ComputeBoundingBoxCallback) +USE_SERIALIZER_WRAPPER(ComputeBoundingSphereCallback) USE_SERIALIZER_WRAPPER(Cone) USE_SERIALIZER_WRAPPER(ConvexHull) USE_SERIALIZER_WRAPPER(ConvexPlanarOccluder) @@ -32,8 +34,6 @@ USE_SERIALIZER_WRAPPER(CullFace) USE_SERIALIZER_WRAPPER(Cylinder) USE_SERIALIZER_WRAPPER(Depth) USE_SERIALIZER_WRAPPER(Drawable) -USE_SERIALIZER_WRAPPER(osg_Drawable_UpdateCallback) -USE_SERIALIZER_WRAPPER(osg_ComputeBoundingBoxCallback) USE_SERIALIZER_WRAPPER(DrawPixels) USE_SERIALIZER_WRAPPER(EllipsoidModel) USE_SERIALIZER_WRAPPER(Fog) @@ -108,6 +108,7 @@ USE_SERIALIZER_WRAPPER(TransferFunction1D) USE_SERIALIZER_WRAPPER(Transform) USE_SERIALIZER_WRAPPER(TriangleMesh) USE_SERIALIZER_WRAPPER(Uniform) +USE_SERIALIZER_WRAPPER(UpdateCallback) USE_SERIALIZER_WRAPPER(UserDataContainer) USE_SERIALIZER_WRAPPER(VertexProgram) USE_SERIALIZER_WRAPPER(Viewport) diff --git a/src/osgWrappers/serializers/osg/UpdateCallback.cpp b/src/osgWrappers/serializers/osg/UpdateCallback.cpp index aaaa803ff..b04164fe3 100644 --- a/src/osgWrappers/serializers/osg/UpdateCallback.cpp +++ b/src/osgWrappers/serializers/osg/UpdateCallback.cpp @@ -6,11 +6,11 @@ #include #include -REGISTER_OBJECT_WRAPPER2(osg_Drawable_UpdateCallback, +REGISTER_OBJECT_WRAPPER2(UpdateCallback, new osg::Drawable::UpdateCallback, osg::Drawable::UpdateCallback, "osg::UpdateCallback", - "osg::Object osg::UpdateCallback") {} + "osg::Object osg::Callback osg::UpdateCallback") {} #undef OBJECT_CAST #define OBJECT_CAST static_cast