Changeset 358

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/DistortionManipulator.cpp

@@ -19 +19 @@
 #include "DistortionManipulator.h"
 
-#include<osgViewer/Viewer>
-#include<osg/Point>
+#include <osgViewer/Viewer>
+#include <osg/Point>
+#include <osg/PolygonMode>
 
 using namespace osg;
@@ -183 +184 @@
                                         {
                                                 activeVisualizationMode = INTENSITY_MAP;
-                                                showDistortionMesh(true);
-                                                showIntensityMap(false);
+                                                showDistortionMesh(false);
+                                                showIntensityMap(true);
                                                 break;
                                         }
@@ -191 +192 @@
                                                 activeVisualizationMode = NONE;
                                                 showDistortionMesh(false);
-                                                showIntensityMap(true);
+                                                showIntensityMap(false);
                                                 break;
                                         }
@@ -197 +198 @@
                                         {
                                                 activeVisualizationMode = DISTORTION_MESH;
-                                                showDistortionMesh(false);
+                                                showDistortionMesh(true);
                                                 showIntensityMap(false);
                                                 break;
@@ -269 +270 @@
 void DistortionManipulator::showDistortionMesh(bool show)
 {
-        OSG_ALWAYS<<"ToDo: showDistortionMesh(bool) is now "<<show<<std::endl;
-
-        // Todo: Stateset muss das von der MeshGeode sein.
-
-   /* osg::PolygonMode* polyModeObj = dynamic_cast<osg::PolygonMode*>(_stateset->getAttribute(osg::StateAttribute::POLYGONMODE));
+        osg::StateSet* stateset = _distortionSet->getDistortionInternals()->getChild(DistortionSet::MESH)->getOrCreateStateSet();
+
+        // Append a PolygonMode stateset if required
+    osg::PolygonMode* polyModeObj = dynamic_cast<osg::PolygonMode*>(stateset->getAttribute(osg::StateAttribute::POLYGONMODE));
     if (!polyModeObj)
     {
         polyModeObj = new osg::PolygonMode;
-        _stateset->setAttribute(polyModeObj);
+        stateset->setAttribute(polyModeObj);
     }
  
+        // Set Polygonmode
         if(show)
                 polyModeObj->setMode(osg::PolygonMode::FRONT_AND_BACK,osg::PolygonMode::LINE);
         else
-                polyModeObj->setMode(osg::PolygonMode::FRONT_AND_BACK,osg::PolygonMode::FILL);*/
+                polyModeObj->setMode(osg::PolygonMode::FRONT_AND_BACK,osg::PolygonMode::FILL);
 }