Changeset 357 for experimental/distortionNG/DistortionManipulator.cpp

Timestamp:

Apr 22, 2012, 9:01:45 AM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionManipulator.cpp (modified) (5 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -68 +68 @@
                         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;
+                                OSG_ALWAYS<<std::endl<<"Drag:"<<std::endl<<"ea.getGraphicsContext()="<<ea.getGraphicsContext()<<std::endl;
+                                OSG_ALWAYS<<"ea.getXnormalized()="<<ea.getXnormalized()<<std::endl;
+                                OSG_ALWAYS<<"ea.getYnormalized()="<<ea.getYnormalized()<<std::endl;
+                                OSG_ALWAYS<<"ea.getX()="<<ea.getX()<<std::endl;
+                                OSG_ALWAYS<<"ea.getXin()="<<ea.getXmin()<<std::endl;
+                                OSG_ALWAYS<<"ea.getXmax()="<<ea.getXmax()<<std::endl;
+                                OSG_ALWAYS<<"ea.getY()="<<ea.getY()<<std::endl;
+                                OSG_ALWAYS<<"ea.getYin()="<<ea.getYmin()<<std::endl;
+                                OSG_ALWAYS<<"ea.getYmax()="<<ea.getYmax()<<std::endl;
+
+                                if(activeDistortionMode == MESH)
+                                {
+                                        OSG_ALWAYS<<"MESH!"<<std::endl;
+                                }
+                                else if (activeDistortionMode == TEXCOORDINATES)
+                                {
+                                        OSG_ALWAYS<<"TEXCOORDINATES!"<<std::endl;
+                                }
 
                                 return true;    // true means event handled: not forwarded to the camera manipulator;
@@ -109 +118 @@
         case(osgGA::GUIEventAdapter::KEYDOWN):
                 {
-                        if (ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Insert) // KP 0: Show/Hide HUD   // definition: child #0 = mesh, #1 = highlighter, #2 HUD
-                        {
-                                bool oldValue = _distortionSet->getDistortionInternals()->getValue(2);
-                                _distortionSet->getDistortionInternals()->setValue(2, !oldValue);
+                        if (ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Insert) // KP 0: Show/Hide HUD
+                        {
+                                bool oldValue = _distortionSet->getDistortionInternals()->getValue(DistortionSet::HUD);
+                                _distortionSet->getDistortionInternals()->setValue(DistortionSet::HUD, !oldValue);
                                 return(true);
                         }
@@ -133 +142 @@
                                                 activeSetupMode = MANUAL;
                                                 OSG_NOTICE<<"SetupMode MANUAL activated"<<std::endl;
-                                                _distortionSet->getDistortionInternals()->setValue(1, true); // definition: child #0 = mesh, #1 = highlighter, #2 HUD
+                                                _distortionSet->getDistortionInternals()->setValue(DistortionSet::HIGHLIGHTER, true);
                                                 break;
                                         }
@@ -139 +148 @@
                                         {
                                                 activeSetupMode = DELEGATED;
-                                                _distortionSet->getDistortionInternals()->setValue(1, false); // definition: child #0 = mesh, #1 = highlighter, #2 HUD
+                                                _distortionSet->getDistortionInternals()->setValue(DistortionSet::HIGHLIGHTER, false);
                                                 OSG_NOTICE<<"SetupMode DELEGATED activated"<<std::endl;
                                                 break;
@@ -146 +155 @@
                                         {
                                                 activeSetupMode = DISABLED;
-                                                _distortionSet->getDistortionInternals()->setValue(1, false); // definition: child #0 = mesh, #1 = highlighter, #2 HUD
+                                                _distortionSet->getDistortionInternals()->setValue(DistortionSet::HIGHLIGHTER, false); 
                                                 OSG_NOTICE<<"SetupMode DISABLED activated"<<std::endl;
                                                 break;