Changeset 10362

Timestamp:

06/18/09 12:01:39 (4 years ago)

Author:

robert

Message:

From Cedric Pinson and Robert Osfield, addition of NodeCallbacks? to osg::CopyOp? and osg::Node copy constructor.

Location:

OpenSceneGraph/trunk

Files:

• include/osg/CopyOp (modified) (3 diffs)
• src/osg/CopyOp.cpp (modified) (1 diff)
• src/osg/Node.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/CopyOp

@@ -31 +31 @@
 class PrimitiveSet;
 class Shape;
+class NodeCallback;
 
 /** Copy Op(erator) used to control whether shallow or deep copy is used
@@ -53 +54 @@
             DEEP_COPY_SHAPES            = 1<<9,
             DEEP_COPY_UNIFORMS          = 1<<10,
+            DEEP_COPY_NODECALLBACKS     = 1<<11,
             DEEP_COPY_ALL               = 0x7FFFFFFF
         };
@@ -73 +75 @@
         virtual Shape*          operator() (const Shape* shape) const;
         virtual Uniform*        operator() (const Uniform* shape) const;
+        virtual NodeCallback*   operator() (const NodeCallback* nodecallback) const;
 
     protected:

OpenSceneGraph/trunk/src/osg/CopyOp.cpp

@@ -66 +66 @@
 
 
+NodeCallback* CopyOp::operator() (const NodeCallback* nc) const
+{
+    if (nc && _flags&DEEP_COPY_NODECALLBACKS)
+    {
+        // 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);
+}

OpenSceneGraph/trunk/src/osg/Node.cpp

@@ -75 +75 @@
         _boundingSphereComputed(node._boundingSphereComputed),
         _parents(), // leave empty as parentList is managed by Group.
-        _updateCallback(node._updateCallback),
+        _updateCallback(copyop(node._updateCallback.get())),
         _numChildrenRequiringUpdateTraversal(0), // assume no children yet.
         _numChildrenRequiringEventTraversal(0), // assume no children yet.
-        _cullCallback(node._cullCallback),
+        _cullCallback(copyop(node._cullCallback.get())),
         _cullingActive(node._cullingActive),
         _numChildrenWithCullingDisabled(0), // assume no children yet.