Changeset 514

Timestamp:

08/24/10 14:51:47 (21 months ago)

Author:

ddangelo

Message:

getAbsoluteTransform function now accepts a second parameter which is the node to stop the traversal. This is useful in case you do not want to traverse the scenegraph up to its root node. Also added a function to query the maximal texture size.

Location:

trunk/avango-osg

Files:

• include/avango/osg/Node.h (modified) (1 diff)
• python/avango/osg/_osg.cpp (modified) (2 diffs)
• 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) const;
+      ::osg::Matrix getAbsoluteTransform(av::FieldContainer* caller = 0, av::osg::Node * haltTraversalAtNode = 0) const;
 
     protected:

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

@@ -113 +113 @@
  }
 
+namespace
+{
+  GLint GetMaximumTextureSize()
+  {
+    GLint maxTextureSize;
+    glGetIntegerv( GL_MAX_TEXTURE_SIZE, &maxTextureSize);
+    return maxTextureSize;
+  }
+}
+
+
 BOOST_PYTHON_MODULE(_osg)
 {
@@ -132 +143 @@
 
   def("line_intersect", av::osg::lineIntersect);
+
+  def("get_maximum_texture_size",GetMaximumTextureSize);
+
 
   register_field<av::osg::SFDrawable>("SFDrawable");

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

@@ -78 +78 @@
 
 ::osg::Matrix
-av::osg::Node::getAbsoluteTransform(av::FieldContainer* caller) const
+av::osg::Node::getAbsoluteTransform(av::FieldContainer* caller, av::osg::Node * haltTraversalAtNode) const
 {
   ::osg::Node *osg_node = getOsgNode();
@@ -105 +105 @@
 
   ::osg::Matrix abs_mat;
-  ::osg::MatrixList abs_mat_list = getOsgNode()->getWorldMatrices(osg_node);
+  ::osg::MatrixList abs_mat_list;
+  if(haltTraversalAtNode == 0)
+    abs_mat_list = getOsgNode()->getWorldMatrices(osg_node);
+  else
+    abs_mat_list = getOsgNode()->getWorldMatrices(haltTraversalAtNode->getOsgNode());
+
   if (abs_mat_list.size() > 0u)
     abs_mat = abs_mat_list[0];