Changeset 337

Timestamp:

Mar 16, 2012, 10:44:23 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/extViewer.cpp

@@ -274 +274 @@
 
                 osg::TexMat* texmat = new osg::TexMat;
-        texmat->setScaleByTextureRectangleSize(true);
+            texmat->setScaleByTextureRectangleSize(true);
         stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
 
@@ -280 +280 @@
                 if (!applyIntensityMapAsColours && intensityMap)
         {
+                        // Resize intensityMap if the dimensions are wrong
+                        if(intensityMap->s()!=tex_width || intensityMap->t()!=tex_height)
+                                intensityMap->scaleImage(tex_width, tex_height, intensityMap->r());
+
                         osg::TextureRectangle* intensityMapTexture = new osg::TextureRectangle(intensityMap);
-                        intensityMapTexture->setTextureSize(tex_width, tex_height);
-                        //intensityMapTexture->setInternalFormat(GL_RGB);
-                 //   intensityMapTexture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
-                        //intensityMapTexture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
+                        intensityMapTexture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
+                        intensityMapTexture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
                         intensityMapTexture->setWrap(osg::Texture::WRAP_S,osg::Texture::CLAMP_TO_EDGE);
                         intensityMapTexture->setWrap(osg::Texture::WRAP_T,osg::Texture::CLAMP_TO_EDGE);
@@ -290 +292 @@
             stateset->setTextureAttributeAndModes(1, intensityMapTexture, osg::StateAttribute::ON);
 
-                        //osg::TexMat* texmat1 = new osg::TexMat;
-                        //texmat1->setScaleByTextureRectangleSize(true);
-                        //stateset->setTextureAttributeAndModes(1, texmat1, 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, intensityMap, applyIntensityMapAsColours, projectorMatrix);
-                geode->addDrawable(distortionMesh);
-
-                if (intensityMap && !applyIntensityMapAsColours)
-                {
                         // create shaders for distortion
                         osg::Program* distortProgram = new osg::Program;
@@ -316 +308 @@
                                 stateset->setAttributeAndModes(distortProgram, 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, intensityMap, applyIntensityMapAsColours, projectorMatrix);
+                geode->addDrawable(distortionMesh);
+
+                if (intensityMap && !applyIntensityMapAsColours)
+                {
+                        //// create shaders for distortion
+                        //osg::Program* distortProgram = new osg::Program;
+                        //distortProgram->setName( "distortion" );
+                        //osg::Shader* vShader = osg::Shader::readShaderFile( osg::Shader::VERTEX, "shader.vert" ); 
+                        //vShader->setName("intensityMapVertShader");
+                        //osg::Shader* fShader = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shader.frag" ); 
+                        //fShader->setName("intensityMapFragShader");
+
+                        //if ( vShader && fShader )
+                        //{
+                        //      //distortProgram->addShader( vShader );
+                        //      distortProgram->addShader( fShader );
+                        //      stateset->addUniform( new osg::Uniform("sceneTexture", 0) );
+                        //      stateset->addUniform( new osg::Uniform("intensityMapTexture", 1) );
+                        //      stateset->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
+                        //}
                 }