Changeset 7909 for OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp

Timestamp:

03/04/08 15:19:03 (5 years ago)

Author:

robert

Message:

From Jean-Sebastien Guay and Robert Osfield, added optional --CompositeViewer? path into osgpick to illustrate how to do picking in both viewers and as unit test for picking.

Files:

• OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp

@@ -25 +25 @@
 #include <osgDB/ReadFile>
 #include <osgViewer/Viewer>
+#include <osgViewer/CompositeViewer>
 
 #include <osg/Material>
@@ -50 +51 @@
     bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa);
 
-    virtual void pick(osgViewer::Viewer* viewer, const osgGA::GUIEventAdapter& ea);
+    virtual void pick(osgViewer::View* view, const osgGA::GUIEventAdapter& ea);
 
     void setLabel(const std::string& name)
@@ -66 +67 @@
     switch(ea.getEventType())
     {
-        case(osgGA::GUIEventAdapter::FRAME):
+        case(osgGA::GUIEventAdapter::PUSH):
         {
-            osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&aa);
-            if (viewer) pick(viewer,ea);
+            osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
+            if (view) pick(view,ea);
             return false;
         }    
@@ -77 +78 @@
 }
 
-void PickHandler::pick(osgViewer::Viewer* viewer, const osgGA::GUIEventAdapter& ea)
+void PickHandler::pick(osgViewer::View* view, const osgGA::GUIEventAdapter& ea)
 {
     osgUtil::LineSegmentIntersector::Intersections intersections;
 
     std::string gdlist="";
-    if (viewer->computeIntersections(ea.getX(),ea.getY(),intersections))
+    float x = ea.getX();
+    float y = ea.getY();
+    if (view->computeIntersections(x,y,intersections))
     {
         for(osgUtil::LineSegmentIntersector::Intersections::iterator hitr = intersections.begin();
@@ -211 +214 @@
 int main( int argc, char **argv )
 {
-
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
-
-    // construct the viewer.
-    osgViewer::Viewer viewer;
 
     // read the scene from the list of file specified commandline args.
@@ -236 +235 @@
     group->addChild(createHUD(updateText.get()));
 
-    // add the handler for doing the picking
-    viewer.addEventHandler(new PickHandler(updateText.get()));
-
-    // set the scene to render
-    viewer.setSceneData(group.get());
-
-    return viewer.run();
-}
+    if (arguments.read("--CompositeViewer"))
+    {
+        osg::ref_ptr<osgViewer::View> view = new osgViewer::View;
+        // add the handler for doing the picking
+        view->addEventHandler(new PickHandler(updateText.get()));
+
+        // set the scene to render
+        view->setSceneData(group.get());
+
+        view->setUpViewAcrossAllScreens();
+
+        osgViewer::CompositeViewer viewer;
+        viewer.addView(view.get());
+
+        return viewer.run();
+
+    }
+    else
+    {
+        osgViewer::Viewer viewer;
+
+        // add the handler for doing the picking
+        viewer.addEventHandler(new PickHandler(updateText.get()));
+
+        // set the scene to render
+        viewer.setSceneData(group.get());
+
+        return viewer.run();
+    }
+
+}