Changeset 1902 for OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp

Timestamp:

04/18/03 17:59:34 (10 years ago)

Author:

robert

Message:

Updated NEWS for the release.

Fixed warnings.

Files:

• OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp

@@ -27 +27 @@
     public:
     
-        OccluderEventHandler(osgUtil::SceneView* sceneview,osg::Group* rootnode):_sceneview(sceneview),_rootnode(rootnode) {}
+        OccluderEventHandler(osgProducer::Viewer* viewer):_viewer(viewer) {}
     
         virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&);
@@ -40 +40 @@
         void endOccluder();
         
-        
-        osg::ref_ptr<osgUtil::SceneView>        _sceneview;
+        osg::Group* rootNode() { return dynamic_cast<osg::Group*>(_viewer->getSceneData()); }
+        
+        
+        osgProducer::Viewer*                    _viewer;
         osg::ref_ptr<osg::Group>                _rootnode;
         osg::ref_ptr<osg::Group>                _occluders;
@@ -56 +58 @@
             {
 
-                float x = ea.getX();
-                float y = ea.getY();
+                float x = ea.getXnormalized();
+                float y = ea.getYnormalized();
  
-                osg::Vec3 near_point,far_point;
-                if (!_sceneview->projectWindowXYIntoObject(x,ea.getYmax()-y,near_point,far_point))
+                osgUtil::IntersectVisitor::HitList hitList;
+                if (!_viewer->computeIntersections(x,y,hitList))
                 {
                      return true;
                 }
 
-                osg::ref_ptr<osg::LineSegment> lineSegment = new osg::LineSegment;
-                lineSegment->set(near_point,far_point);
-
-                osgUtil::IntersectVisitor iv;
-                iv.addLineSegment(lineSegment.get());
-
-                _rootnode->accept(iv);
-
-                if (iv.hits())
+                if (!hitList.empty())
                 {
-                
-                    osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(lineSegment.get());
-                    if (!hitList.empty())
-                    {
-                    
-                        osgUtil::Hit& hit = hitList.front();
-                        addPoint(hit.getWorldIntersectPoint());
-                    }
-
+
+                    osgUtil::Hit& hit = hitList.front();
+                    addPoint(hit.getWorldIntersectPoint());
                 }
 
@@ -97 +85 @@
                 if (_occluders.valid())
                 {
-                    std::cout<<"saving occluders to 'saved_occluders.osg'"<<std::endl;
-                    osgDB::writeNodeFile(*_occluders,"saved_occluders.osg");
+                    
+                    if (osgDB::writeNodeFile(*_occluders,"saved_occluders.osg"))
+                        std::cout<<"saved occluders to 'saved_occluders.osg'"<<std::endl;
                 }
                 else
@@ -137 +126 @@
             {
                 _occluders = new osg::Group;
-                _rootnode->addChild(_occluders.get());
+                if (rootNode()) rootNode()->addChild(_occluders.get());
             }
             _occluders->addChild(occluderNode);
@@ -298 +287 @@
     while (arguments.read("-m")) { manuallyCreateOccluders = true; }
 
+    if (manuallyCreateOccluders)
+    {
+        viewer.getEventHandlerList().push_front(new OccluderEventHandler(&viewer));
+    }
+
     // get details on keyboard and mouse bindings used by the viewer.
     viewer.getUsage(*arguments.getApplicationUsage());
@@ -350 +344 @@
     viewer.realize();
 
-    if (manuallyCreateOccluders)
-    {
-        osgUtil::SceneView* sceneview = viewer.getSceneHandlerList()[0].get();
-    
-        viewer.getEventHandlerList().push_front(new OccluderEventHandler(sceneview,rootnode.get()));
-    }
 
     while( !viewer.done() )