Replaced dynamic_cast<*Callback> with as*Callback() implementation/usage.

src/osg/Callback.cpp

@@ -13,6 +13,8 @@
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/ScriptEngine>
+#include <osg/RenderInfo>
+#include <osg/Drawable>
 
 using namespace osg;
 
@@ -122,3 +124,41 @@ bool UniformCallback::run(osg::Object* object, osg::Object* data)
         return traverse(object, data);
     }
 }
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//
+bool DrawableUpdateCallback::run(osg::Object* object, osg::Object* data)
+{
+    osg::Drawable* drawable = object->asDrawable();
+    osg::NodeVisitor* nv = data->asNodeVisitor();
+    if (drawable && nv)
+    {
+        update(nv, drawable);
+        return true;
+    }
+    else
+    {
+        return traverse(object, data);
+    }
+}
+
+bool DrawableEventCallback::run(osg::Object* object, osg::Object* data)
+{
+    osg::Drawable* drawable = object->asDrawable();
+    osg::NodeVisitor* nv = data->asNodeVisitor();
+    if (drawable && nv)
+    {
+        event(nv, drawable);
+        return true;
+    }
+    else
+    {
+        return traverse(object, data);
+    }
+}
+
+bool DrawableCullCallback::cull(osg::NodeVisitor* nv, osg::Drawable* drawable, osg::RenderInfo* renderInfo) const
+{
+    return cull(nv, drawable, renderInfo? renderInfo->getState():0);
+}

src/osg/Drawable.cpp

@@ -239,36 +239,6 @@ void Drawable::deleteDisplayList(unsigned int contextID,GLuint globj, unsigned i
 }
 
 
-bool Drawable::UpdateCallback::run(osg::Object* object, osg::Object* data)
-{
-    osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(object);
-    osg::NodeVisitor* nv = dynamic_cast<osg::NodeVisitor*>(data);
-    if (drawable && nv)
-    {
-        update(nv, drawable);
-        return true;
-    }
-    else
-    {
-        return traverse(object, data);
-    }
-}
-
-bool Drawable::EventCallback::run(osg::Object* object, osg::Object* data)
-{
-    osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(object);
-    osg::NodeVisitor* nv = dynamic_cast<osg::NodeVisitor*>(data);
-    if (drawable && nv)
-    {
-        event(nv, drawable);
-        return true;
-    }
-    else
-    {
-        return traverse(object, data);
-    }
-}
-
 Drawable::Drawable()
 {
     _boundingBoxComputed = false;
@@ -302,9 +272,6 @@ Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
     _useDisplayList(drawable._useDisplayList),
     _supportsVertexBufferObjects(drawable._supportsVertexBufferObjects),
     _useVertexBufferObjects(drawable._useVertexBufferObjects),
-    _drawableUpdateCallback(drawable._drawableUpdateCallback),
-    _drawableEventCallback(drawable._drawableEventCallback),
-    _drawableCullCallback(drawable._drawableCullCallback),
     _drawCallback(drawable._drawCallback)
 {
     setStateSet(copyop(drawable._stateset.get()));
@@ -381,9 +348,6 @@ void Drawable::setThreadSafeRefUnref(bool threadSafe)
     Object::setThreadSafeRefUnref(threadSafe);
 
     if (_stateset.valid()) _stateset->setThreadSafeRefUnref(threadSafe);
-    if (_drawableUpdateCallback.valid()) _drawableUpdateCallback->setThreadSafeRefUnref(threadSafe);
-    if (_drawableEventCallback.valid()) _drawableEventCallback->setThreadSafeRefUnref(threadSafe);
-    if (_drawableCullCallback.valid()) _drawableCullCallback->setThreadSafeRefUnref(threadSafe);
     if (_drawCallback.valid()) _drawCallback->setThreadSafeRefUnref(threadSafe);
 }
 

src/osgWrappers/serializers/osg/UpdateCallback.cpp

@@ -7,8 +7,8 @@
 #include <osgDB/OutputStream>
 
 REGISTER_OBJECT_WRAPPER2(UpdateCallback,
-                         new osg::Drawable::UpdateCallback,
-                         osg::Drawable::UpdateCallback,
+                         new osg::DrawableUpdateCallback,
+                         osg::DrawableUpdateCallback,
                          "osg::UpdateCallback",
                          "osg::Object osg::Callback osg::UpdateCallback") {}