FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Node::asDrawable() and Node::asGeometry() methods to provide a low cost way of casting a node to Drawable and Geoemtry.

Browse Source 
Changed the Group::computeBound() method so that it takes account of the a Drawable's BoundingBox.
This commit is contained in:
Robert Osfield
2014-05-15 09:26:59 +00:00
parent afcf54b108
commit 20b9f3ff88
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osg/Group.cpp
View File

@@ -15,6 +15,7 @@
#include <osg/BoundingBox>
#include <osg/Transform>
#include <osg/OccluderNode>
#include <osg/Drawable>
#include <osg/Notify>
#include <stdio.h>
@@ -366,11 +367,20 @@ BoundingSphere Group::computeBound() const
itr!=_children.end();
++itr)
{
const osg::Transform* transform = (*itr)->asTransform();
osg::Node* child = itr->get();
const osg::Transform* transform = child->asTransform();
if (!transform || transform->getReferenceFrame()==osg::Transform::RELATIVE_RF)
{
const osg::BoundingSphere& bs = (*itr)->getBound();
bb.expandBy(bs);
osg::Drawable* drawable = child->asDrawable();
if (drawable)
{
bb.expandBy(drawable->getBoundingBox());
}
else
{
const osg::BoundingSphere& bs = child->getBound();
bb.expandBy(bs);
}
}
}
@@ -385,10 +395,11 @@ BoundingSphere Group::computeBound() const
itr!=_children.end();
++itr)
{
const osg::Transform* transform = (*itr)->asTransform();
osg::Node* child = itr->get();
const osg::Transform* transform = child->asTransform();
if (!transform || transform->getReferenceFrame()==osg::Transform::RELATIVE_RF)
{
const BoundingSphere& bs = (*itr)->getBound();
const BoundingSphere& bs = child->getBound();
bsphere.expandRadiusBy(bs);
}
}