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

Timestamp:

02/01/12 18:10:48 (16 months ago)

Author:

robert

Message:

Added example usage of teh new DraggerTransforCallback?'s HandleCommandMask? which is tied to the TabPlaneDragger? example.

Files:

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

OpenSceneGraph/trunk/examples/osgmanipulator/osgmanipulator.cpp

@@ -50 +50 @@
         virtual bool constrain(osgManipulator::TranslateInLineCommand& command) const
         {
-            OSG_NOTICE<<"TranslateInLineCommand "<<command.getTranslation()<<std::endl;
+            OSG_NOTICE<<"PlaneConstraint TranslateInLineCommand "<<command.getTranslation()<<std::endl;
             return true;            
         }
@@ -56 +56 @@
         {
             //command.setTranslation(osg::Vec3(0.0f,0.0f,0.0f));
-            OSG_NOTICE<<"TranslateInPlaneCommand "<<command.getTranslation()<<std::endl;
+            OSG_NOTICE<<"PlaneConstraint TranslateInPlaneCommand "<<command.getTranslation()<<std::endl;
             return true;
         }
@@ -62 +62 @@
         {
             //command.setScale(1.0f);
-            OSG_NOTICE<<"Scale1DCommand"<<command.getScale()<<std::endl;
+            OSG_NOTICE<<"PlaneConstraint Scale1DCommand"<<command.getScale()<<std::endl;
             return true;            
         }
@@ -68 +68 @@
         {
             //command.setScale(osg::Vec2d(1.0,1.0));
-            OSG_NOTICE<<"Scale2DCommand "<<command.getScale()<<std::endl;
+            OSG_NOTICE<<"PlaneConstraint Scale2DCommand "<<command.getScale()<<std::endl;
             return true;
         }
         virtual bool constrain(osgManipulator::ScaleUniformCommand& command) const
         {
-            OSG_NOTICE<<"ScaleUniformCommand"<<command.getScale()<<std::endl;
+            OSG_NOTICE<<"PlaneConstraint ScaleUniformCommand"<<command.getScale()<<std::endl;
             return true;            
         }
 };
+
+
 
 osgManipulator::Dragger* createDragger(const std::string& name)
@@ -235 +237 @@
                        osg::Matrix::translate(scene->getBound().center()));
 
-    dragger->addTransformUpdating(selection);
+    if (dynamic_cast<osgManipulator::TabPlaneDragger*>(dragger))
+    {
+        dragger->addTransformUpdating(selection, osgManipulator::DraggerTransformCallback::HANDLE_TRANSLATE_IN_LINE);
+    }
+    else
+    {
+        dragger->addTransformUpdating(selection);
+    }
 
     // we want the dragger to handle it's own events automatically