Changeset 351

Timestamp:

Apr 21, 2012, 4:59:57 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/extViewer.cpp

@@ -57 +57 @@
 }
 
-static osg::Geometry* createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows, osg::Image* intensityMap, bool applyIntensityMapAsColours, const osg::Matrix& projectorMatrix)
+static osg::Geometry* createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows, const osg::Matrix& projectorMatrix)
 {
         // Create Quad to render on
@@ -79 +79 @@
         osg::Vec3Array* vertices = new osg::Vec3Array;
     osg::Vec2Array* texcoords0 = new osg::Vec2Array;
-    osg::Vec2Array* texcoords1 = intensityMap==0 ? new osg::Vec2Array : 0;
     osg::Vec4Array* colors = new osg::Vec4Array;
 
@@ -98 +97 @@
 
                         // Set Color of the mesh node
-                        if (intensityMap && applyIntensityMapAsColours)
-                        {
-                                colors->push_back(intensityMap->getColor(texcoord));
-                        }
-                        else
-                        {
-                                colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
-                        }
-
-                        // Set coordinates for second texcoords array (if applyIntensityMapAsColours==true)
-                        if (texcoords1) 
-                                texcoords1->push_back( texcoord );
+                        colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
                 }
         }
@@ -121 +109 @@
 
     geom->setTexCoordArray(0,texcoords0);
-    if (texcoords1)
-                geom->setTexCoordArray(1,texcoords1);
 
         // Quads grid
@@ -271 +257 @@
                 setUpIntensityMapBlending(_distortionSet, stateset, screenNum);
 
-                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, _distortionSet->getIntensityMap(), false, 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), 20, 20, projectorMatrix);
                 geode->addDrawable(distortionMesh);
 
@@ -367 +353 @@
         {
                 distortProgram->addShader( fShader );
-                //stateset->addUniform( new osg::Uniform("sceneTexture", _distortionSet->getTexUnitScene()) );
-                //stateset->addUniform( new osg::Uniform("intensityMapTexture", _distortionSet->getTexUnitIntensityMap()) );
-                stateset->addUniform( new osg::Uniform("sceneTexture", 0 ) );
-                stateset->addUniform( new osg::Uniform("intensityMapTexture", 1 ) );
+                stateset->addUniform( new osg::Uniform("sceneTexture", (int)_distortionSet->getTexUnitScene()) );
+                stateset->addUniform( new osg::Uniform("intensityMapTexture", (int)_distortionSet->getTexUnitIntensityMap()) );
                 stateset->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
         }