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

Replaced usage of depreacted IntersectVisitor with IntersectionVisitor

Browse Source
This commit is contained in:
Robert Osfield
2008-10-07 14:01:14 +00:00
parent ed2bbbf23b
commit 907a51b198
5 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/osgspheresegment/osgspheresegment.cpp
View File

@@ -27,7 +27,6 @@
#include <osg/Geometry>
#include <osgUtil/SmoothingVisitor>
#include <osgUtil/IntersectVisitor>
#include <osgDB/ReadFile>
@@ -317,26 +316,20 @@ osg::Group* createOverlay(const osg::Vec3& center, float radius)
osg::Vec3 computeTerrainIntersection(osg::Node* subgraph,float x,float y)
{
osgUtil::IntersectVisitor iv;
osg::ref_ptr<osg::LineSegment> segDown = new osg::LineSegment;
const osg::BoundingSphere& bs = subgraph->getBound();
float zMax = bs.center().z()+bs.radius();
float zMin = bs.center().z()-bs.radius();
segDown->set(osg::Vec3(x,y,zMin),osg::Vec3(x,y,zMax));
iv.addLineSegment(segDown.get());
osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector =
new osgUtil::LineSegmentIntersector(osg::Vec3(x,y,zMin),osg::Vec3(x,y,zMax));
osgUtil::IntersectionVisitor iv(intersector.get());
subgraph->accept(iv);
if (iv.hits())
if (intersector->containsIntersections())
{
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segDown.get());
if (!hitList.empty())
{
osg::Vec3 ip = hitList.front().getWorldIntersectPoint();
return ip;
}
return intersector->getFirstIntersection().getWorldIntersectPoint();
}
return osg::Vec3(x,y,0.0f);