Changeset 10671 for OpenSceneGraph/trunk/include/osg/StateAttribute

Timestamp:

10/22/09 12:33:16 (4 years ago)

Author:

robert

Message:

From Cedric Pinson, "Here a patch to be able to clone stateattribute, in order to do that i
moved the StateAttribute::Callback structure to a file
StateAttributeCallback? with the same behavior as NodeCallback?.
"

Files:

• OpenSceneGraph/trunk/include/osg/StateAttribute (modified) (4 diffs)

OpenSceneGraph/trunk/include/osg/StateAttribute

@@ -17 +17 @@
 #include <osg/Export>
 #include <osg/Object>
+#include <osg/StateAttributeCallback>
 #include <osg/GL>
 
@@ -191 +192 @@
         
         StateAttribute(const StateAttribute& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): 
-            Object(sa,copyop) {}
+            Object(sa,copyop),
+            _updateCallback(copyop(sa._updateCallback.get()))
+            {}
         
 
@@ -282 +285 @@
             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(); }
 
     
@@ -344 +338 @@
         friend class osg::StateSet;
 
-        ref_ptr<Callback>   _updateCallback;
-        ref_ptr<Callback>   _eventCallback;
+        ref_ptr<StateAttributeCallback>   _updateCallback;
+        ref_ptr<StateAttributeCallback>   _eventCallback;
 };