Changeset 360 for experimental/distortionNG/extViewer.cpp

Timestamp:

Apr 22, 2012, 12:47:07 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/extViewer.cpp (modified) (4 diffs)

experimental/distortionNG/extViewer.cpp

@@ -255 +255 @@
         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);
+                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), _distortionSet->getDistortionMeshColumns(), _distortionSet->getDistortionMeshColumns(), projectorMatrix);
                 meshGeode->addDrawable(distortionMesh);
 
@@ -333 +333 @@
 
         // create shaders for blending
-        osg::Program* distortProgram = new osg::Program;
-        distortProgram->setName( "intensityMapBlending" );
+        osg::Program* IntensityMapProgram = new osg::Program;
+        IntensityMapProgram->setName( "intensityMapBlending" );
         osg::Shader* fShader = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shader.frag" ); 
         fShader->setName("intensityMapFragShader");
@@ -340 +340 @@
         if ( fShader )
         {
-                distortProgram->addShader( fShader );
+                IntensityMapProgram->addShader( fShader );
                 stateset->addUniform( new osg::Uniform("sceneTexture", (int)_distortionSet->getTexUnitScene()) );
                 stateset->addUniform( new osg::Uniform("intensityMapTexture", (int)_distortionSet->getTexUnitIntensityMap()) );
-                stateset->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(IntensityMapProgram, osg::StateAttribute::ON);
         }
 }
@@ -358 +358 @@
 
         // Create DistortionSet
-        _distortionSet = new osgViewer::DistortionSet();
-        _distortionSet->setIntensityMap( intMap );
-        _distortionSet->setDistortionMeshRows( 1 );
-        _distortionSet->setDistortionMeshColumns( 1 );
-        _distortionSet->setTexUnitScene( 0 );
-        _distortionSet->setTexUnitIntensityMap( 1 );
-
-        // Todo: call setupDistortion/Blendung to perform the blending
-}
+        osgViewer::DistortionSet* ds = new osgViewer::DistortionSet();
+        ds->setIntensityMap( intMap );
+        ds->setDistortionMeshRows( 2 );
+        ds->setDistortionMeshColumns( 2 );
+        ds->setTexUnitScene( 0 );
+        ds->setTexUnitIntensityMap( 1 );
+
+        setUpViewForManualDistortion(ds);
+}