Changeset 8998 for OpenSceneGraph/trunk/examples/osgspheresegment/osgspheresegment.cpp

Timestamp:

10/07/08 16:01:14 (5 years ago)

Author:

robert

Message:

Replaced usage of depreacted IntersectVisitor? with IntersectionVisitor?

Files:

• OpenSceneGraph/trunk/examples/osgspheresegment/osgspheresegment.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgspheresegment/osgspheresegment.cpp

@@ -28 +28 @@
 
 #include <osgUtil/SmoothingVisitor>
-#include <osgUtil/IntersectVisitor>
 
 #include <osgDB/ReadFile>
@@ -318 +317 @@
 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())
-    {
-        osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segDown.get());
-        if (!hitList.empty())
-        {
-            osg::Vec3 ip = hitList.front().getWorldIntersectPoint();
-            return  ip;
-        }
+    if (intersector->containsIntersections())
+    {
+        return intersector->getFirstIntersection().getWorldIntersectPoint();
     }