Changeset 359

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• extViewer.cpp (modified) (4 diffs)
• extViewer.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

experimental/distortionNG/extViewer.cpp

@@ -240 +240 @@
     // distortion correction set up.
     {
-                osg::Geode* geode = new osg::Geode();
+                osg::ref_ptr<osg::Switch> root = _distortionSet->getDistortionInternals();
+                osg::Geode* meshGeode = new osg::Geode();
+                root->addChild(meshGeode, true);        // Child #0  (adds mesh,shader,.. so camera renders mesh (and  thus render the scene))
+                
 
                 // new we need to add the scene texture to the mesh, we do so by creating a
         // StateSet to contain the Texture StateAttribute.
-            osg::StateSet* stateset = geode->getOrCreateStateSet();
+            osg::StateSet* stateset = meshGeode->getOrCreateStateSet();
         stateset->setTextureAttributeAndModes(_distortionSet->getTexUnitScene(), sceneTexture,osg::StateAttribute::ON);
         stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
@@ -250 +253 @@
                 osg::TexMat* texmat = new osg::TexMat;
             texmat->setScaleByTextureRectangleSize(true);
-        stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
-
-                setUpIntensityMapBlending(_distortionSet, stateset, screenNum);
+        stateset->setTextureAttributeAndModes(_distortionSet->getTexUnitScene(), texmat, osg::StateAttribute::ON);
 
                 osg::Geometry* distortionMesh = createMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 20, 20, projectorMatrix);
-                geode->addDrawable(distortionMesh);
+                meshGeode->addDrawable(distortionMesh);
+
+                setUpIntensityMapBlending(_distortionSet, screenNum);
 
         osg::ref_ptr<osg::Camera> camera = new osg::Camera;
@@ -273 +276 @@
         camera->setViewMatrix(osg::Matrix::identity());
 
-                osg::ref_ptr<osg::Switch> root = _distortionSet->getDistortionInternals();
-                root->addChild(geode, true);    // Child #0  (adds mesh,shader,.. so camera renders mesh (and  thus render the scene))
                 camera->addChild(root);
-
                 _distortionSet->setDistortionCamera( camera );
 
                 // Ensure selector is visible:
-                geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
-                geode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
+                meshGeode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
+                meshGeode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
                 
         camera->setName("Dist Cam");
@@ -289 +289 @@
 }
 
-void extViewer::setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, osg::StateSet* stateset, unsigned int screenNum)
+void extViewer::setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, unsigned int screenNum)
 {
         osg::Image* intensityMap = _distortionSet->getIntensityMap();
+        osg::StateSet* stateset = _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->getOrCreateStateSet();
+
         if(intensityMap == NULL)        return;
 

experimental/distortionNG/extViewer.h

@@ -39 +39 @@
         void setUpViewForManualDistortion(osgViewer::DistortionSet* distSet, unsigned int screenNum=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
 
-                void setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, osg::StateSet* stateset, unsigned int screenNum=0);
+                void setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, unsigned int screenNum=0);
                 void setUpIntensityMapBlending(std::string intensityMap);
 

experimental/distortionNG/main.cpp

@@ -174 +174 @@
  * distortionManipulator                                abgeleitet von osgGA::GUIEventHandler
  *                                                                              Grundfunktionen:
- *                                                      [.]             - Key to Show Distortion Mesh / Intensity Map / none
+ *                                                      [done|.|.]      - Key to Show Distortion Mesh / Intensity Map / none
  *                                                                              - Key to Save distortion Container  - via plugin
  *                                                      [.]             - Key to toggle MANUAL mode between blending und distortion setup