Changeset 515

Timestamp:

08/25/10 12:36:02 (18 months ago)

Author:

ddangelo

Message:

getAbsoluteTransform calculation function splitted into two functions. The old one always traverses up to the root node, and the added one stops at a given node. The default parameters introduced in commit 514 caused some problems with function overloading in boost::python.

Location:

trunk/avango-osg

Files:

• include/avango/osg/Node.h (modified) (1 diff)
• python/avango/osg/OSGNode.cpp (modified) (1 diff)
• src/avango/osg/Node.cpp (modified) (2 diffs)

trunk/avango-osg/include/avango/osg/Node.h

@@ -90 +90 @@
        * to call evaluate on all nodes on the traversal to the root node.
        */
-      ::osg::Matrix getAbsoluteTransform(av::FieldContainer* caller = 0, av::osg::Node * haltTraversalAtNode = 0) const;
+      ::osg::Matrix getAbsoluteTransform(av::FieldContainer* caller = 0) const;
+
+      ::osg::Matrix getAbsoluteTransformHaltAtNode(av::FieldContainer* caller = 0, av::osg::Node * haltTraversalAtNode = 0) const;
 
     protected:

trunk/avango-osg/python/avango/osg/OSGNode.cpp

@@ -72 +72 @@
   .def("get_bounding_sphere", &av::osg::Node::getBoundingSphere)
   .def("get_absolute_transform", &av::osg::Node::getAbsoluteTransform)
+  .def("get_absolute_transform_halt_at_node", &av::osg::Node::getAbsoluteTransformHaltAtNode)
   ;
 

trunk/avango-osg/src/avango/osg/Node.cpp

@@ -78 +78 @@
 
 ::osg::Matrix
-av::osg::Node::getAbsoluteTransform(av::FieldContainer* caller, av::osg::Node * haltTraversalAtNode) const
+av::osg::Node::getAbsoluteTransform(av::FieldContainer* caller) const
+{
+  ::osg::Node *osg_node = getOsgNode();
+
+  // traverse to the root node and trigger evaluate() if a caller was given
+  while(osg_node != 0)
+  {
+    ::osg::Node::ParentList parent_list = osg_node->getParents();
+
+    if (parent_list.size() > 0)
+    {
+      Link<av::osg::Node> av_node = av::osg::get_from_osg_object<av::osg::Node>(parent_list[0]);
+
+      if (av_node.isValid())
+      {
+        if (caller != 0)
+          caller->evaluateDependency(*av_node);
+        osg_node = av_node->getOsgNode();
+      }
+      else
+        break;
+    }
+    else
+      break;
+  }
+
+  ::osg::Matrix abs_mat;
+  ::osg::MatrixList abs_mat_list = getOsgNode()->getWorldMatrices(osg_node);
+  if (abs_mat_list.size() > 0u)
+    abs_mat = abs_mat_list[0];
+
+  return abs_mat;
+}
+
+
+::osg::Matrix
+av::osg::Node::getAbsoluteTransformHaltAtNode(av::FieldContainer* caller, av::osg::Node * haltTraversalAtNode) const
 {
   ::osg::Node *osg_node = getOsgNode();
@@ -117 +153 @@
 }
 
+
 /* virtual */ void
 av::osg::Node::getParentsCB(const av::osg::MFGroup::GetValueEvent& event)