Merge 10671-10672 to 2.8 branch. This is a continuration of the backport of osgAnimation. (Note prev rev log message should read "11206" not "11026".)

src/osg/CMakeLists.txt

@@ -137,6 +137,7 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/ShapeDrawable
     ${HEADER_PATH}/State
     ${HEADER_PATH}/StateAttribute
+    ${HEADER_PATH}/StateAttributeCallback
     ${HEADER_PATH}/StateSet
     ${HEADER_PATH}/Stats
     ${HEADER_PATH}/Stencil

src/osg/CopyOp.cpp

@@ -18,6 +18,7 @@
 #include <osg/Array>
 #include <osg/PrimitiveSet>
 #include <osg/Shape>
+#include <osg/StateAttribute>
 
 using namespace osg;
 
@@ -65,3 +66,37 @@ StateAttribute* CopyOp::operator() (const StateAttribute* attr) const
 }
 
 
+NodeCallback* CopyOp::operator() (const NodeCallback* nc) const
+{
+    if (nc && _flags&DEEP_COPY_CALLBACKS)
+    {
+        // deep copy the full chain of callback
+        osg::NodeCallback* first = dynamic_cast<osg::NodeCallback*>(nc->clone(*this));
+        first->setNestedCallback(0);
+        nc = nc->getNestedCallback();
+        while (nc) 
+        {
+            osg::NodeCallback* ucb = dynamic_cast<osg::NodeCallback*>(nc->clone(*this));
+            ucb->setNestedCallback(0);
+            first->addNestedCallback(ucb);
+            nc = nc->getNestedCallback();
+        }
+        return first;
+    }
+    else
+        return const_cast<NodeCallback*>(nc);
+}
+
+
+StateAttributeCallback* CopyOp::operator() (const StateAttributeCallback* sc) const
+{
+    if (sc && _flags&DEEP_COPY_CALLBACKS)
+    {
+        // deep copy the full chain of callback
+        StateAttributeCallback* cb = dynamic_cast<StateAttributeCallback*>(sc->clone(*this));
+        return cb;
+    }
+    else
+        return const_cast<StateAttributeCallback*>(sc);
+}
+

src/osg/StateAttribute.cpp

@@ -42,7 +42,7 @@ void StateAttribute::removeParent(osg::StateSet* object)
 }
 
 
-void StateAttribute::setUpdateCallback(Callback* uc)
+void StateAttribute::setUpdateCallback(StateAttributeCallback* uc)
 {
     osg::notify(osg::INFO)<<"StateAttribute::Setting Update callbacks"<<std::endl;
 
@@ -69,7 +69,7 @@ void StateAttribute::setUpdateCallback(Callback* uc)
     }
 }
 
-void StateAttribute::setEventCallback(Callback* ec)
+void StateAttribute::setEventCallback(StateAttributeCallback* ec)
 {
     osg::notify(osg::INFO)<<"StateAttribute::Setting Event callbacks"<<std::endl;
 

src/osg/StateSet.cpp

@@ -1671,7 +1671,7 @@ void StateSet::runUpdateCallbacks(osg::NodeVisitor* nv)
             itr!=_attributeList.end();
             ++itr)
         {
-            StateAttribute::Callback* callback = itr->second.first->getUpdateCallback();
+            StateAttributeCallback* callback = itr->second.first->getUpdateCallback();
             if (callback) (*callback)(itr->second.first.get(),nv);
         }
 
@@ -1684,7 +1684,7 @@ void StateSet::runUpdateCallbacks(osg::NodeVisitor* nv)
                 itr!=attributeList.end();
                 ++itr)
             {
-                StateAttribute::Callback* callback = itr->second.first->getUpdateCallback();
+                StateAttributeCallback* callback = itr->second.first->getUpdateCallback();
                 if (callback) (*callback)(itr->second.first.get(),nv);
             }
         }
@@ -1745,7 +1745,7 @@ void StateSet::runEventCallbacks(osg::NodeVisitor* nv)
             itr!=_attributeList.end();
             ++itr)
         {
-            StateAttribute::Callback* callback = itr->second.first->getEventCallback();
+            StateAttributeCallback* callback = itr->second.first->getEventCallback();
             if (callback) (*callback)(itr->second.first.get(),nv);
         }
 
@@ -1758,7 +1758,7 @@ void StateSet::runEventCallbacks(osg::NodeVisitor* nv)
                 itr!=attributeList.end();
                 ++itr)
             {
-                StateAttribute::Callback* callback = itr->second.first->getEventCallback();
+                StateAttributeCallback* callback = itr->second.first->getEventCallback();
                 if (callback) (*callback)(itr->second.first.get(),nv);
             }
         }

src/osgPlugins/osg/StateAttribute.cpp

@@ -29,12 +29,12 @@ bool StateAttribute_readLocalData(Object& obj, Input& fr)
     bool iteratorAdvanced = false;
     StateAttribute& stateAttribute = static_cast<StateAttribute&>(obj);
 
-    static ref_ptr<StateAttribute::Callback> s_callback = new osg::StateAttribute::Callback;
+    static ref_ptr<StateAttributeCallback> s_callback = new osg::StateAttributeCallback;
     while (fr.matchSequence("UpdateCallback {"))
     {
         //int entry = fr[0].getNoNestedBrackets();
         fr += 2;
-        StateAttribute::Callback* callback = dynamic_cast<StateAttribute::Callback*>(fr.readObjectOfType(*s_callback));
+        StateAttributeCallback* callback = dynamic_cast<StateAttributeCallback*>(fr.readObjectOfType(*s_callback));
         if (callback) {
             stateAttribute.setUpdateCallback(callback);
         }
@@ -45,7 +45,7 @@ bool StateAttribute_readLocalData(Object& obj, Input& fr)
     {
         //int entry = fr[0].getNoNestedBrackets();
         fr += 2;
-        StateAttribute::Callback* callback = dynamic_cast<StateAttribute::Callback*>(fr.readObjectOfType(*s_callback));
+        StateAttributeCallback* callback = dynamic_cast<StateAttributeCallback*>(fr.readObjectOfType(*s_callback));
         if (callback) {
             stateAttribute.setEventCallback(callback);
         }