Introduced TabBoxTrackballDragger

examples/osgmanipulator/osgmanipulator.cpp

@@ -23,6 +23,7 @@
 #include <osgText/Text>
 
 #include <osgManipulator/TabBoxDragger>
+#include <osgManipulator/TabBoxTrackballDragger>
 #include <osgManipulator/TabPlaneDragger>
 #include <osgManipulator/TabPlaneTrackballDragger>
 #include <osgManipulator/TrackballDragger>
@@ -52,6 +53,12 @@ osgManipulator::Dragger* createDragger(const std::string& name)
         d->setupDefaultGeometry();
         dragger = d;
     }
+    else if ("TabBoxTrackballDragger" == name)
+    {
+        osgManipulator::TabBoxTrackballDragger* d = new osgManipulator::TabBoxTrackballDragger();
+        d->setupDefaultGeometry();
+        dragger = d;
+    }
     else if ("TrackballDragger" == name)
     {
         osgManipulator::TrackballDragger* d = new osgManipulator::TrackballDragger();
@@ -201,7 +208,7 @@ osg::Node* createDemoScene() {
 
       transform_1.get()->addChild(addDraggerToScene(geode_1.get(),"TabBoxDragger"));
     transform_2.get()->addChild(addDraggerToScene(geode_2.get(),"TabPlaneDragger"));
-    transform_3.get()->addChild(addDraggerToScene(geode_3.get(),"TabPlaneTrackballDragger"));
+    transform_3.get()->addChild(addDraggerToScene(geode_3.get(),"TabBoxTrackballDragger"));
     transform_4.get()->addChild(addDraggerToScene(geode_4.get(),"TrackballDragger"));
     transform_5.get()->addChild(addDraggerToScene(geode_5.get(),"Translate1DDragger"));
     transform_6.get()->addChild(addDraggerToScene(geode_6.get(),"Translate2DDragger"));

include/osgManipulator/TabBoxTrackballDragger

@@ -0,0 +1,48 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 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.
+*/
+//osgManipulator - Copyright (C) 2007 Fugro-Jason B.V.
+
+#ifndef OSGMANIPULATOR_TABBOXTRACKBALLDRAGGER
+#define OSGMANIPULATOR_TABBOXTRACKBALLDRAGGER 1
+
+#include <osgManipulator/TrackballDragger>
+#include <osgManipulator/TabBoxDragger>
+
+namespace osgManipulator {
+
+/**
+ * Dragger for performing rotation in all axes.
+ */
+class OSGMANIPULATOR_EXPORT TabBoxTrackballDragger : public CompositeDragger
+{
+    public:
+
+        TabBoxTrackballDragger();
+
+        META_OSGMANIPULATOR_Object(osgManipulator,TabBoxTrackballDragger)
+
+        /** Setup default geometry for dragger. */
+        void setupDefaultGeometry();
+
+    protected:
+
+        virtual ~TabBoxTrackballDragger();
+
+        osg::ref_ptr<TrackballDragger>  _trackballDragger;
+        osg::ref_ptr<TabBoxDragger>     _tabBoxDragger;
+};
+
+
+}
+
+#endif

src/osgManipulator/CMakeLists.txt

@@ -22,6 +22,7 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/ScaleAxisDragger
     ${HEADER_PATH}/Selection
     ${HEADER_PATH}/TabBoxDragger
+    ${HEADER_PATH}/TabBoxTrackballDragger
     ${HEADER_PATH}/TabPlaneDragger
     ${HEADER_PATH}/TabPlaneTrackballDragger
     ${HEADER_PATH}/TrackballDragger
@@ -47,6 +48,7 @@ ADD_LIBRARY(${LIB_NAME}
     Scale2DDragger.cpp
     ScaleAxisDragger.cpp
     TabBoxDragger.cpp
+    TabBoxTrackballDragger.cpp
     TabPlaneDragger.cpp
     TabPlaneTrackballDragger.cpp
     TrackballDragger.cpp

src/osgManipulator/TabBoxTrackballDragger.cpp

@@ -0,0 +1,48 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 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.
+*/
+//osgManipulator - Copyright (C) 2007 Fugro-Jason B.V.
+
+#include <osgManipulator/TabBoxTrackballDragger>
+
+#include <osg/ShapeDrawable>
+#include <osg/Geometry>
+#include <osg/LineWidth>
+#include <osg/PolygonMode>
+#include <osg/CullFace>
+#include <osg/Quat>
+#include <osg/AutoTransform>
+
+using namespace osgManipulator;
+
+TabBoxTrackballDragger::TabBoxTrackballDragger()
+{
+    _trackballDragger = new TrackballDragger(true);
+    addChild(_trackballDragger.get());
+    addDragger(_trackballDragger.get());
+    
+    _tabBoxDragger = new TabBoxDragger();
+    addChild(_tabBoxDragger.get());
+    addDragger(_tabBoxDragger.get());
+
+    setParentDragger(getParentDragger());
+}
+
+TabBoxTrackballDragger::~TabBoxTrackballDragger()
+{
+}
+
+void TabBoxTrackballDragger::setupDefaultGeometry()
+{
+    _trackballDragger->setupDefaultGeometry();
+    _tabBoxDragger->setupDefaultGeometry();
+}