Changeset 5951 for OpenSceneGraph/trunk/examples/osglauncher/osglauncher.cpp

Timestamp:

01/09/07 18:35:46 (6 years ago)

Author:

robert

Message:

Added View::computeIntersections methods

Files:

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

OpenSceneGraph/trunk/examples/osglauncher/osglauncher.cpp

@@ -93 +93 @@
 std::string PickHandler::pick(float x, float y)
 {
-#if 0
-    osgUtil::IntersectVisitor::HitList hlist;
-    if (_viewer->computeIntersections(x, y, hlist))
-    {
-        for(osgUtil::IntersectVisitor::HitList::iterator hitr=hlist.begin();
-            hitr!=hlist.end();
+    osgUtil::LineSegmentIntersector::Intersections intersections;
+    if (_viewer->computeIntersections(x, y, intersections))
+    {
+        for(osgUtil::LineSegmentIntersector::Intersections::iterator hitr = intersections.begin();
+            hitr != intersections.end();
             ++hitr)
         {
-            if (hitr->_geode.valid() && !hitr->_geode->getName().empty()) return hitr->_geode->getName();
-        }
-    }
-#else
-    osg::notify(osg::NOTICE)<<"Picking not implemented yet "<<x<<", "<<y<<std::endl;
-#endif    
+            osg::Node* node = hitr->nodePath.empty() ? 0 : hitr->nodePath.back();
+            if (node && !node->getName().empty()) return node->getName();
+        }
+    }
+
     return "";
 }
@@ -417 +415 @@
     viewer.setSceneData( root );
 
-    // create the windows and run the threads.
-    viewer.realize();
-    
     osg::Matrix lookAt;
     lookAt.makeLookAt(osg::Vec3(0.0f, -4.0f, 0.0f), centerScope, osg::Vec3(0.0f, 0.0f, 1.0f));