Removed the deprecated NodeVisitor::getLocalToWorld/WorldToLocal methods as
this are replaced by the osg::computeLocalToWorld/WorldToLocal() functions found in osg/Transform. Made the ReleaseTextureAndDisplayListsVisitor a public nested class of osgDB::DatabasePager to allow it to be used in the TXP plugin, and added usage of this visitor to the TXP plugin to make sure that textures and display lists are released during the update thread.
This commit is contained in:
@@ -27,7 +27,6 @@ class PickIntersectVisitor : public osgUtil::IntersectVisitor
|
||||
public:
|
||||
PickIntersectVisitor()
|
||||
{
|
||||
setNodeMaskOverride(0xffffffff); // need to make the visitor override the nodemask to visit invisible actions
|
||||
}
|
||||
virtual ~PickIntersectVisitor() {}
|
||||
|
||||
@@ -59,11 +58,17 @@ public:
|
||||
PickVisitor()
|
||||
{
|
||||
xp=yp=0;
|
||||
setNodeMaskOverride(0xffffffff); // need to make the visitor override the nodemask to visit invisible actions
|
||||
setTraversalMode(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN);
|
||||
}
|
||||
~PickVisitor() {}
|
||||
|
||||
// Aug 2003 added to pass the nodemaskOverride to the PickIntersectVisitor
|
||||
// may be used make the visitor override the nodemask to visit invisible actions
|
||||
inline void setNodeMaskOverride(osg::Node::NodeMask mask) {
|
||||
_piv.setNodeMaskOverride(mask);
|
||||
_nodeMaskOverride = mask; }
|
||||
|
||||
|
||||
virtual void apply(osg::Projection& pr)
|
||||
{ // stack the intersect rays, transform to new projection, traverse
|
||||
// Assumes that the Projection is an absolute projection
|
||||
|
||||
Reference in New Issue
Block a user