Changeset 6277 for OpenSceneGraph/trunk/examples/osgmanipulator/osgmanipulator.cpp

Timestamp:

02/26/07 14:01:17 (6 years ago)

Author:

robert

Message:

Completed changes to osgManipulator to make it more flexible w.r.t viewer usage, and
ported osgmanipulator example across of osgViewer

Files:

• OpenSceneGraph/trunk/examples/osgmanipulator/osgmanipulator.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/examples/osgmanipulator/osgmanipulator.cpp

@@ +1 @@
+// --c++--
 #include <osgDB/ReadFile>
 #include <osgUtil/Optimizer>
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 #include <osg/CoordinateSystemNode>
 #include <osgText/Text>
@@ -14 +15 @@
 #include <osgManipulator/TranslateAxisDragger>
 
+#include <iostream>
+
 osgManipulator::Dragger* createDragger(const std::string& name)
 {
@@ -100 +103 @@
 }
 
-
+#if 0
 bool computePixelCoords(osgProducer::Viewer* viewer,float x,float y,unsigned int cameraNum,float& pixel_x,float& pixel_y)
 {
@@ -151 +154 @@
     return true;
 }
+#endif
 
 osg::Node* addDraggerToScene(osg::Node* scene, osgManipulator::CommandManager* cmdMgr, const std::string& name)
@@ -183 +187 @@
         };
 
-        PickModeHandler(osgProducer::Viewer *viewer) : osgGA::GUIEventHandler(),
-                                                       _viewer(viewer), _mode(VIEW), _activeDragger(0)
+        PickModeHandler():
+            _mode(VIEW), 
+            _activeDragger(0)
         {
         }        
@@ -191 +196 @@
                     osg::Object*, osg::NodeVisitor*)
         {
+            osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
+            if (!view) return false;
+
             if (ea.getKey() == osgGA::GUIEventAdapter::KEY_Tab &&
                 ea.getEventType() == osgGA::GUIEventAdapter::KEYDOWN &&
@@ -200 +208 @@
             if (VIEW == _mode) return false;
 
-            for(unsigned int i=0;i<_viewer->getNumberOfCameras();++i)
+            switch (ea.getEventType())
             {
-                
-                if ((ea.getEventType() == osgGA::GUIEventAdapter::PUSH) &&
-                    _viewer->computeIntersections(ea.getX(), ea.getY(), i, _pointer.hitList))
+                case osgGA::GUIEventAdapter::PUSH:
                 {
-                    float pixel_x,pixel_y;
-                    if (computePixelCoords(_viewer,ea.getX(),ea.getY(),i,pixel_x,pixel_y))
+                    osgUtil::LineSegmentIntersector::Intersections intersections;
+
+                    _pointer.reset();
+
+                    if (view->computeIntersections(ea.getX(),ea.getY(),intersections))
                     {
-                        Producer::Camera* camera=_viewer->getCamera(i);
-
-                        osgProducer::OsgSceneHandler* sh = dynamic_cast<osgProducer::OsgSceneHandler*>(camera->getSceneHandler());
-                        osgUtil::SceneView* sv = sh ? sh->getSceneView() : 0;
-                        if (! sv) continue;
-                        
-                        _pointer.pixel_x = int(pixel_x+0.5);
-                        _pointer.pixel_y = int(pixel_y+0.5);
-                        _pointer.sv = sv;
-                        _pointer.hitIter = _pointer.hitList.begin();
-
-                        for (osg::NodePath::iterator itr = _pointer.hitList.front().getNodePath().begin();
-                             itr != _pointer.hitList.front().getNodePath().end();
+                        _pointer.setCamera(view->getCamera());
+                        _pointer.setMousePosition(ea.getX(), ea.getY());
+
+                        for(osgUtil::LineSegmentIntersector::Intersections::iterator hitr = intersections.begin();
+                            hitr != intersections.end();
+                            ++hitr)
+                        {
+                            _pointer.addIntersection(hitr->nodePath, hitr->getLocalIntersectPoint());
+                        }
+                        for (osg::NodePath::iterator itr = _pointer._hitList.front().first.begin();
+                             itr != _pointer._hitList.front().first.end();
                              ++itr)
                         {
@@ -235 +242 @@
                     }
                 }
-                
-                switch (ea.getEventType())
+                case osgGA::GUIEventAdapter::DRAG:
+                case osgGA::GUIEventAdapter::RELEASE:
                 {
-                    case osgGA::GUIEventAdapter::DRAG:
-                    case osgGA::GUIEventAdapter::RELEASE:
-                        if (_activeDragger)
-                        {
-                            float pixel_x,pixel_y;
-                            if (computePixelCoords(_viewer,ea.getX(),ea.getY(),i,pixel_x,pixel_y))
-                            {
-                                Producer::Camera* camera=_viewer->getCamera(i);
-
-                                osgProducer::OsgSceneHandler* sh = dynamic_cast<osgProducer::OsgSceneHandler*>(camera->getSceneHandler());
-                                osgUtil::SceneView* sv = sh ? sh->getSceneView() : 0;
-                                if (_activeDragger && sv)
-                                {
-                                    _pointer.pixel_x = int(pixel_x+0.5);
-                                    _pointer.pixel_y = int(pixel_y+0.5);
-                                    _pointer.sv = sv;
-                                    _pointer.hitIter = _pointer.hitList.begin();
-
-                                    _activeDragger->handle(_pointer, ea, aa);
-                                }
-                            }
-                        }
-                        break;
-
-                    default:
-                        break;
+                    if (_activeDragger)
+                    {
+                        _pointer._hitIter = _pointer._hitList.begin();
+                        _pointer.setCamera(view->getCamera());
+                        _pointer.setMousePosition(ea.getX(), ea.getY());
+
+                        _activeDragger->handle(_pointer, ea, aa);
+                    }
+                    break;
                 }
-                if (ea.getEventType() == osgGA::GUIEventAdapter::RELEASE)
-                {
-                    _activeDragger = 0;
-                    _pointer.hitList.clear();
-                }
+                default:
+                    break;
             }
+
+            if (ea.getEventType() == osgGA::GUIEventAdapter::RELEASE)
+            {
+                _activeDragger = 0;
+                _pointer.reset();
+            }
+
             return true;
         }
         
     private:
-        osgProducer::Viewer* _viewer;
         unsigned int _mode;
         osgManipulator::Dragger* _activeDragger;
-        osgManipulator::Dragger::PointerInfo _pointer;
+        osgManipulator::PointerInfo _pointer;
 };
 
@@ -302 +295 @@
 
     // construct the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
+    osgViewer::Viewer viewer;
 
     // get details on keyboard and mouse bindings used by the viewer.
@@ -372 +362 @@
     viewer.setSceneData(addDraggerToScene(loadedModel.get(), cmdMgr.get(), dragger_name));
 
-    viewer.getEventHandlerList().push_front(new PickModeHandler(&viewer));
-
-    // create the windows and run the threads.
-    viewer.realize();
-
-    while( !viewer.done() )
-    {
-        // wait for all cull and draw threads to complete.
-        viewer.sync();
-
-        // update the scene by traversing it with the the update visitor which will
-        // call all node update callbacks and animations.
-        viewer.update();
-         
-        // fire off the cull and draw traversals of the scene.
-        viewer.frame();
-        
-    }
-    
-    // wait for all cull and draw threads to complete.
-    viewer.sync();
-
-    // run a clean up frame to delete all OpenGL objects.
-    viewer.cleanup_frame();
-
-    // wait for all the clean up frame to complete.
-    viewer.sync();
-
-    return 0;
-}
-
+    viewer.addEventHandler(new PickModeHandler());
+
+    return viewer.run();
+}
+