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

Timestamp:

02/11/07 22:12:34 (6 years ago)

Author:

robert

Message:

Changed osgManipulator::Dragger::handle(..) method to use a nested PointerInfo?
class to encapsulate the pixel coords, SceneView? and picking operations in prep for
making the code more general purpose, and less reliant on classes like osgUtil::SceneView? and osgUtil::IntersectVisitor?.

Files:

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

OpenSceneGraph/trunk/examples/osgmanipulator/osgmanipulator.cpp

@@ -202 +202 @@
             for(unsigned int i=0;i<_viewer->getNumberOfCameras();++i)
             {
+                
                 if ((ea.getEventType() == osgGA::GUIEventAdapter::PUSH) &&
-                    _viewer->computeIntersections(ea.getX(), ea.getY(), i, hitList))
+                    _viewer->computeIntersections(ea.getX(), ea.getY(), i, _pointer.hitList))
                 {
                     float pixel_x,pixel_y;
@@ -213 +214 @@
                         osgUtil::SceneView* sv = sh ? sh->getSceneView() : 0;
                         if (! sv) continue;
-
-                        for (osg::NodePath::iterator itr = hitList.front().getNodePath().begin();
-                             itr != hitList.front().getNodePath().end();
+                        
+                        _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();
                              ++itr)
                         {
@@ -221 +227 @@
                             if (dragger)
                             {
-                                dragger->handle(int(pixel_x+0.5), int(pixel_y+0.5), *sv,
-                                                hitList, hitList.begin(),
-                                                ea, aa);
+
+                                dragger->handle(_pointer, ea, aa);
                                 _activeDragger = dragger;
                                 break;
@@ -245 +250 @@
                                 osgUtil::SceneView* sv = sh ? sh->getSceneView() : 0;
                                 if (_activeDragger && sv)
-                                    _activeDragger->handle(int(pixel_x+0.5), int(pixel_y+0.5), *sv,
-                                                           hitList, hitList.begin(),
-                                                           ea, aa);
+                                {
+                                    _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);
+                                }
                             }
                         }
@@ -258 +268 @@
                 {
                     _activeDragger = 0;
-                    hitList.clear();
+                    _pointer.hitList.clear();
                 }
             }
@@ -268 +278 @@
         unsigned int _mode;
         osgManipulator::Dragger* _activeDragger;
-        osgUtil::IntersectVisitor::HitList hitList;
+        osgManipulator::Dragger::PointerInfo _pointer;
 };