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".)

include/osg/CopyOp

@@ -24,12 +24,15 @@ class Image;
 class Texture;
 class StateSet;
 class StateAttribute;
+class StateAttributeCallback;
 class Uniform;
 class Node;
 class Drawable;
 class Array;
 class PrimitiveSet;
 class Shape;
+class NodeCallback;
+
 
 /** Copy Op(erator) used to control whether shallow or deep copy is used
   * during copy construction and clone operation.*/
@@ -52,6 +55,7 @@ class OSG_EXPORT CopyOp
             DEEP_COPY_PRIMITIVES        = 1<<8,
             DEEP_COPY_SHAPES            = 1<<9,
             DEEP_COPY_UNIFORMS          = 1<<10,
+            DEEP_COPY_CALLBACKS         = 1<<11,
             DEEP_COPY_ALL               = 0x7FFFFFFF
         };
 
@@ -72,6 +76,8 @@ class OSG_EXPORT CopyOp
         virtual PrimitiveSet*   operator() (const PrimitiveSet* primitives) const;
         virtual Shape*          operator() (const Shape* shape) const;
         virtual Uniform*        operator() (const Uniform* shape) const;
+        virtual NodeCallback*   operator() (const NodeCallback* nodecallback) const;
+        virtual StateAttributeCallback* operator() (const StateAttributeCallback* stateattributecallback) const;
 
     protected:
     

include/osg/ImageSequence

@@ -105,7 +105,7 @@ class OSG_EXPORT ImageSequence : public ImageStream
 
         virtual void update(NodeVisitor* nv);
 
-        struct OSG_EXPORT UpdateCallback : public osg::StateAttribute::Callback
+        struct OSG_EXPORT UpdateCallback : public osg::StateAttributeCallback
         {
             virtual void operator () (osg::StateAttribute* attr, osg::NodeVisitor* nv);
         };

include/osg/StateAttribute

@@ -16,6 +16,7 @@
 
 #include <osg/Export>
 #include <osg/Object>
+#include <osg/StateAttributeCallback>
 #include <osg/GL>
 
 #include <typeinfo>
@@ -190,7 +191,9 @@ class OSG_EXPORT StateAttribute : public Object
         StateAttribute();
         
         StateAttribute(const StateAttribute& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): 
-            Object(sa,copyop) {}
+            Object(sa,copyop),
+            _updateCallback(copyop(sa._updateCallback.get()))
+            {}
         
 
         /** Clone the type of an attribute, with Object* return type.
@@ -281,37 +284,28 @@ class OSG_EXPORT StateAttribute : public Object
             // default to no black listed GLMode's associated with use of the StateAttribute.
             return true;
         }
-        
-        struct Callback : public virtual osg::Object
-        {
-            Callback() {}
 
-            Callback(const Callback&,const CopyOp&) {}
-
-            META_Object(osg,Callback);
-
-            /** do customized update code.*/
-            virtual void operator () (StateAttribute*, NodeVisitor*) {}
-        };
+        // provide callback for backwards compatibility.
+        typedef osg::StateAttributeCallback Callback;
 
         /** Set the UpdateCallback which allows users to attach customize the updating of an object during the update traversal.*/
-        void setUpdateCallback(Callback* uc);
+        void setUpdateCallback(StateAttributeCallback* uc);
 
         /** Get the non const UpdateCallback.*/
-        Callback* getUpdateCallback() { return _updateCallback.get(); }
+        StateAttributeCallback* getUpdateCallback() { return _updateCallback.get(); }
 
         /** Get the const UpdateCallback.*/
-        const Callback* getUpdateCallback() const { return _updateCallback.get(); }
+        const StateAttributeCallback* getUpdateCallback() const { return _updateCallback.get(); }
 
 
         /** Set the EventCallback which allows users to attach customize the updating of an object during the Event traversal.*/
-        void setEventCallback(Callback* ec);
+        void setEventCallback(StateAttributeCallback* ec);
 
         /** Get the non const EventCallback.*/
-        Callback* getEventCallback() { return _eventCallback.get(); }
+        StateAttributeCallback* getEventCallback() { return _eventCallback.get(); }
 
         /** Get the const EventCallback.*/
-        const Callback* getEventCallback() const { return _eventCallback.get(); }
+        const StateAttributeCallback* getEventCallback() const { return _eventCallback.get(); }
 
     
         /** apply the OpenGL state attributes. 
@@ -343,8 +337,8 @@ class OSG_EXPORT StateAttribute : public Object
         ParentList _parents;
         friend class osg::StateSet;
 
-        ref_ptr<Callback>   _updateCallback;
-        ref_ptr<Callback>   _eventCallback;
+        ref_ptr<StateAttributeCallback>   _updateCallback;
+        ref_ptr<StateAttributeCallback>   _eventCallback;
 };
 
 }

include/osg/StateAttributeCallback

@@ -0,0 +1,39 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+#ifndef OSG_STATEATTRIBUTECALLBACK
+#define OSG_STATEATTRIBUTECALLBACK 1
+
+#include <osg/Export>
+#include <osg/Object>
+
+namespace osg {
+
+class StateAttribute;
+class NodeVisitor;
+
+class OSG_EXPORT StateAttributeCallback : public virtual osg::Object
+{
+    public:
+        StateAttributeCallback() {}
+
+        StateAttributeCallback(const StateAttributeCallback&,const CopyOp&) {}
+
+        META_Object(osg,StateAttributeCallback);
+
+        /** do customized update code.*/
+        virtual void operator () (StateAttribute*, NodeVisitor*) {}
+};
+
+}
+
+#endif