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

Replaced osgUtil::IntersectVisitor usage with osgUtil::InteresectionVisitor

Browse Source
This commit is contained in:
Robert Osfield
2018-04-20 14:32:34 +01:00
parent 8de8af6850
commit 709194c88c
15 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/osgSim/VisibilityGroup.cpp
View File

@@ -14,7 +14,7 @@
#include <osgSim/VisibilityGroup>
#include <osgUtil/CullVisitor>
#include <osgUtil/IntersectVisitor>
#include <osgUtil/LineSegmentIntersector>
using namespace osgSim;
using namespace osg;
@@ -55,26 +55,21 @@ void VisibilityGroup::traverse(osg::NodeVisitor& nv)
osg::Vec3 seg = center - eye;
// perform the intersection using the given mask
osgUtil::IntersectVisitor iv;
osg::ref_ptr<osg::LineSegment> lineseg = new osg::LineSegment;
lineseg->set(eye, center);
iv.addLineSegment(lineseg.get());
osg::ref_ptr<osgUtil::LineSegmentIntersector> lineseg = new osgUtil::LineSegmentIntersector(eye, center);
osgUtil::IntersectionVisitor iv(lineseg.get());
iv.setTraversalMask(_volumeIntersectionMask);
if(_visibilityVolume.valid())
_visibilityVolume->accept(iv);
// now examine the hit record
if(iv.hits())
if(lineseg->containsIntersections())
{
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(lineseg.get());
if(!hitList.empty()) // we actually hit something
{
// OSG_INFO << "Hit obstruction"<< std::endl;
osg::Vec3 normal = hitList.front().getWorldIntersectNormal();
if((normal*seg) > 0.f ) // we are inside
Group::traverse(nv);
}
osgUtil::LineSegmentIntersector::Intersection intersection = lineseg->getFirstIntersection();
osg::Vec3 normal = intersection.getWorldIntersectNormal();
if((normal*seg) > 0.f ) // we are inside
Group::traverse(nv);
}
}
else