From 8d3790d594810b3fe70ffaa71d3e5503704f917e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 6 Mar 2012 10:06:00 +0000
Subject: [PATCH] Added RotateCylinderDragger and RotateSphereDragger to list
 of manipulators for testing purposes

---
 examples/osgmanipulator/osgmanipulator.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/examples/osgmanipulator/osgmanipulator.cpp b/examples/osgmanipulator/osgmanipulator.cpp
index 52038b40f..b62ba294f 100644
--- a/examples/osgmanipulator/osgmanipulator.cpp
+++ b/examples/osgmanipulator/osgmanipulator.cpp
@@ -33,6 +33,7 @@
 #include <osgManipulator/Translate2DDragger>
 #include <osgManipulator/TranslateAxisDragger>
 #include <osgManipulator/TranslatePlaneDragger>
+#include <osgManipulator/RotateCylinderDragger>
 
 #include <osg/ShapeDrawable>
 #include <osg/MatrixTransform>
@@ -143,6 +144,18 @@ osgManipulator::Dragger* createDragger(const std::string& name)
         d->setupDefaultGeometry();
         dragger = d;
     }
+    else if ("RotateCylinderDragger" == name)
+    {
+        osgManipulator::RotateCylinderDragger* d = new osgManipulator::RotateCylinderDragger();
+        d->setupDefaultGeometry();
+        dragger = d;
+    }
+    else if ("RotateSphereDragger" == name)
+    {
+        osgManipulator::RotateSphereDragger* d = new osgManipulator::RotateSphereDragger();
+        d->setupDefaultGeometry();
+        dragger = d;
+    }
     else
     {
         osgManipulator::TabBoxDragger* d = new osgManipulator::TabBoxDragger();
@@ -372,7 +385,7 @@ int main( int argc, char **argv )
     arguments.getApplicationUsage()->addCommandLineOption("--help-keys","Display keyboard & mouse bindings available");
     arguments.getApplicationUsage()->addCommandLineOption("--help-all","Display all command line, env vars and keyboard & mouse bindings.");
 
-    arguments.getApplicationUsage()->addCommandLineOption("--dragger <draggername>","Use the specified dragger for manipulation [TabPlaneDragger, TabPlaneTrackballDragger, TrackballDragger, Translate1DDragger, Translate2DDragger, TranslateAxisDragger, TabBoxDragger, TranslatePlaneDragger, Scale1DDragger, Scale2DDragger]");
+    arguments.getApplicationUsage()->addCommandLineOption("--dragger <draggername>","Use the specified dragger for manipulation [TabPlaneDragger, TabPlaneTrackballDragger, TrackballDragger, Translate1DDragger, Translate2DDragger, TranslateAxisDragger, TabBoxDragger, TranslatePlaneDragger, Scale1DDragger, Scale2DDragger, RotateCylinderDragger, RotateSphereDragger]");
     arguments.getApplicationUsage()->addCommandLineOption("--fixedDraggerSize","Fix the size of the dragger geometry in the screen space");
     
     bool fixedSizeInScreen = false;