Changeset 8998

Timestamp:

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

Author:

robert

Message:

Replaced usage of depreacted IntersectVisitor? with IntersectionVisitor?

Location:

OpenSceneGraph/trunk/examples

Files:

• osgforest/osgforest.cpp (modified) (2 diffs)
• osgoccluder/osgoccluder.cpp (modified) (2 diffs)
• osgparticleeffects/osgparticleeffects.cpp (modified) (2 diffs)
• osgshaderterrain/osgshaderterrain.cpp (modified) (1 diff)
• osgspheresegment/osgspheresegment.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgforest/osgforest.cpp

@@ -37 +37 @@
 #include <osgDB/FileUtils>
 
-#include <osgUtil/IntersectVisitor>
+#include <osgUtil/LineSegmentIntersector>
+#include <osgUtil/IntersectionVisitor>
 #include <osgUtil/SmoothingVisitor>
 
@@ -509 +510 @@
         if (terrain)
         {
-            osgUtil::IntersectVisitor iv;
-            osg::ref_ptr<osg::LineSegment> segDown = new osg::LineSegment;
-
-            segDown->set(tree->_position,tree->_position+osg::Vec3(0.0f,0.0f,size.z()));
-            iv.addLineSegment(segDown.get());
+            osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector = 
+                new osgUtil::LineSegmentIntersector(tree->_position,tree->_position+osg::Vec3(0.0f,0.0f,size.z()));
+
+            osgUtil::IntersectionVisitor iv(intersector.get());
             
             terrain->accept(iv);
 
-            if (iv.hits())
+            if (intersector->containsIntersections())
             {
-                osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segDown.get());
-                if (!hitList.empty())
+                osgUtil::LineSegmentIntersector::Intersections& intersections = intersector->getIntersections();
+                for(osgUtil::LineSegmentIntersector::Intersections::iterator itr = intersections.begin();
+                    itr != intersections.end();
+                    ++itr)
                 {
-                    osg::Vec3 ip = hitList.front().getWorldIntersectPoint();
-                    osg::Vec3 np = hitList.front().getWorldIntersectNormal();
-                    tree->_position = ip;
+                    const osgUtil::LineSegmentIntersector::Intersection& intersection = *itr;
+                    tree->_position = intersection.getWorldIntersectPoint();
                 }
             }

OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp

@@ -24 +24 @@
 #include <osg/Group>
 #include <osg/Notify>
-#include <osg/LineSegment>
 #include <osg/io_utils>
 
@@ -36 +35 @@
 
 #include <osgUtil/Optimizer>
-#include <osgUtil/IntersectVisitor>
 
 #include <osg/OccluderNode>

OpenSceneGraph/trunk/examples/osgparticleeffects/osgparticleeffects.cpp

@@ -29 +29 @@
 
 #include <osgUtil/Optimizer>
-#include <osgUtil/IntersectVisitor>
 
 #include <osgDB/ReadFile>
@@ -134 +133 @@
 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();
     }
 

OpenSceneGraph/trunk/examples/osgshaderterrain/osgshaderterrain.cpp

@@ -40 +40 @@
 #include <osgDB/FileUtils>
 
-#include <osgUtil/IntersectVisitor>
 #include <osgUtil/SmoothingVisitor>
 

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();
     }