Added beginnings of new TrackballManipulator

include/osg/NodeVisitor

@@ -184,13 +184,13 @@ class SG_EXPORT NodeVisitor : public virtual Referenced
           * from the top most node applied down the graph to the current node.
           * Note, the user does not typically call pushNodeOnPath() as it
           * will be called automatically by the Node::accept() method.*/
-        inline void pushOntoNodePath(Node* node) { _nodePath.push_back(node); }
+        inline void pushOntoNodePath(Node* node) { if (_traversalMode!=TRAVERSE_PARENTS) _nodePath.push_back(node); else _nodePath.insert(_nodePath.begin(),node); }
         
         /** Method callby osg::Node::accept() method after
           * a call the NodeVisitor::apply(..).
           * Note, the user does not typically call pushNodeOnPath() as it
           * will be called automatically by the Node::accept() method.*/
-        inline void popFromNodePath()            { _nodePath.pop_back(); }
+        inline void popFromNodePath()            { if (_traversalMode!=TRAVERSE_PARENTS) _nodePath.pop_back(); else _nodePath.erase(_nodePath.begin()); }
         
         /** Get the non const NodePath from the top most node applied down
           * to the current Node being visited.*/

include/osgGA/TrackerManipulator

@@ -0,0 +1,138 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGGA_TrackerMANIPULATOR
+#define OSGGA_TrackerMANIPULATOR 1
+
+#include <osgGA/MatrixManipulator>
+#include <osg/Quat>
+
+namespace osgGA{
+
+class OSGGA_EXPORT TrackerManipulator : public MatrixManipulator
+{
+    public:
+
+        TrackerManipulator();
+
+        virtual const char* className() const { return "Tracker"; }
+
+        void setTrackNode(osg::Node* node) { _trackNode = node; }
+        osg::Node* getTrackNode() { return _trackNode.get(); }
+        const osg::Node* getTrackNode() const { return _trackNode.get(); }
+
+
+        enum RotationMode 
+        {
+            ELEVATION_AZIM_ROLL,
+            ELEVATION_AZIM,
+        };
+        
+        void setRotationMode(RotationMode mode);
+        RotationMode getRotationMode() const { return _rotationMode; }
+
+
+        /** set the position of the matrix manipulator using a 4x4 Matrix.*/
+        virtual void setByMatrix(const osg::Matrixd& matrix);
+
+        /** set the position of the matrix manipulator using a 4x4 Matrix.*/
+        virtual void setByInverseMatrix(const osg::Matrixd& matrix) { setByMatrix(osg::Matrixd::inverse(matrix)); }
+
+        /** get the position of the manipulator as 4x4 Matrix.*/
+        virtual osg::Matrixd getMatrix() const;
+
+        /** get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix.*/
+        virtual osg::Matrixd getInverseMatrix() const;
+
+        /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/
+        virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; }
+
+        /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/
+        virtual float getFusionDistanceValue() const { return _distance; }
+
+        /** Attach a node to the manipulator. 
+            Automatically detaches previously attached node.
+            setNode(NULL) detaches previously nodes.
+            Is ignored by manipulators which do not require a reference model.*/
+        virtual void setNode(osg::Node*);
+
+        /** Return node if attached.*/
+        virtual const osg::Node* getNode() const;
+
+        /** Return node if attached.*/
+        virtual osg::Node* getNode();
+
+        /** Move the camera to the default position. 
+            May be ignored by manipulators if home functionality is not appropriate.*/
+        virtual void home(const GUIEventAdapter& ea,GUIActionAdapter& us);
+        
+        /** Start/restart the manipulator.*/
+        virtual void init(const GUIEventAdapter& ea,GUIActionAdapter& us);
+
+        /** handle events, return true if handled, false otherwise.*/
+        virtual bool handle(const GUIEventAdapter& ea,GUIActionAdapter& us);
+
+        /** Get the keyboard and mouse usage of this manipulator.*/
+        virtual void getUsage(osg::ApplicationUsage& usage) const;
+
+    protected:
+
+        virtual ~TrackerManipulator();
+
+        /** Reset the internal GUIEvent stack.*/
+        void flushMouseEventStack();
+        /** Add the current mouse GUIEvent to internal stack.*/
+        void addMouseEvent(const GUIEventAdapter& ea);
+
+        osg::Vec3d computeCenter() const;
+
+        void computePosition(const osg::Vec3d& eye,const osg::Vec3d& lv,const osg::Vec3d& up);
+
+        /** For the give mouse movement calculate the movement of the camera.
+            Return true is camera has moved and a redraw is required.*/
+        bool calcMovement();
+        
+        void trackball(osg::Vec3& axis,double& angle, double p1x, double p1y, double p2x, double p2y);
+        double tb_project_to_sphere(double r, double x, double y);
+
+
+        /** Check the speed at which the mouse is moving.
+            If speed is below a threshold then return false, otherwise return true.*/
+        bool isMouseMoving();
+
+
+        void clampOrientation();
+
+
+        // Internal event stack comprising last three mouse events.
+        osg::ref_ptr<const GUIEventAdapter> _ga_t1;
+        osg::ref_ptr<const GUIEventAdapter> _ga_t0;
+
+        osg::ref_ptr<osg::Node> _node;
+        osg::ref_ptr<osg::Node> _trackNode;
+
+        RotationMode            _rotationMode;
+
+        bool                    _thrown;
+        
+        osg::Vec3d              _center;
+        osg::Quat               _rotation;
+        float                   _distance;
+        osg::Vec3d              _previousUp;
+
+};
+
+}
+
+#endif
+

include/osgProducer/Viewer

@@ -54,12 +54,12 @@ class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIAction
             DRIVE_MANIPULATOR       = 2,
             FLIGHT_MANIPULATOR      = 4,
             TERRAIN_MANIPULATOR     = 8,
-            STATE_MANIPULATOR       = 16,
-            HEAD_LIGHT_SOURCE       = 32,
-            SKY_LIGHT_SOURCE        = 64,
-            STATS_MANIPULATOR       = 128,
-            VIEWER_MANIPULATOR      = 256,
-            ESCAPE_SETS_DONE        = 512,
+            STATE_MANIPULATOR       = 32,
+            HEAD_LIGHT_SOURCE       = 64,
+            SKY_LIGHT_SOURCE        = 128,
+            STATS_MANIPULATOR       = 256,
+            VIEWER_MANIPULATOR      = 512,
+            ESCAPE_SETS_DONE        = 1024,
             STANDARD_SETTINGS = TRACKBALL_MANIPULATOR|
                                 DRIVE_MANIPULATOR |
                                 FLIGHT_MANIPULATOR |