Changeset 355

Timestamp:

Apr 21, 2012, 9:59:19 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (1 diff)
• distortionNG.vcproj (modified) (2 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -64 +64 @@
         case(osgGA::GUIEventAdapter::DRAG):
                 {
-                        osg::notify(osg::ALWAYS)<<std::endl<<"Drag:"<<std::endl<<"ea.getGraphicsContext()="<<ea.getGraphicsContext()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getXnormalized()="<<ea.getXnormalized()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getYnormalized()="<<ea.getYnormalized()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getX()="<<ea.getX()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getXin()="<<ea.getXmin()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getXmax()="<<ea.getXmax()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getY()="<<ea.getY()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getYin()="<<ea.getYmin()<<std::endl;
-                        osg::notify(osg::ALWAYS)<<"ea.getYmax()="<<ea.getYmax()<<std::endl;
-
-                        return true;    // true means event handled: not forwarded to the camera manipulator;
+                        if ( activeSetupMode == MANUAL)
+                        {
+                                osg::notify(osg::ALWAYS)<<std::endl<<"Drag:"<<std::endl<<"ea.getGraphicsContext()="<<ea.getGraphicsContext()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getXnormalized()="<<ea.getXnormalized()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getYnormalized()="<<ea.getYnormalized()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getX()="<<ea.getX()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getXin()="<<ea.getXmin()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getXmax()="<<ea.getXmax()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getY()="<<ea.getY()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getYin()="<<ea.getYmin()<<std::endl;
+                                osg::notify(osg::ALWAYS)<<"ea.getYmax()="<<ea.getYmax()<<std::endl;
+
+                                return true;    // true means event handled: not forwarded to the camera manipulator;
+                        }
+                        break;
 
                 }

experimental/distortionNG/distortionNG.vcproj

@@ -338 +338 @@
                         </File>
                         <File
-                                RelativePath=".\distortionNG.cpp"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\DistortionSet.cpp"
                                 >
@@ -364 +360 @@
                         </File>
                         <File
-                                RelativePath=".\distortionNG.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\DistortionSet.h"
                                 >