Changeset 335

Timestamp:

Mar 12, 2012, 10:55:32 AM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• extViewer.cpp (modified) (5 diffs)
• intensitymap.png (modified) (previous)
• shader.frag (modified) (1 diff)
• shader.vert (modified) (1 diff)
• test.jpg (added)

experimental/distortionNG/extViewer.cpp

@@ -31 +31 @@
 {
 
+}
+
+static osg::Texture* loadTexture( const std::string& fileName )
+{
+    std::string foundFileName = osgDB::findDataFile(fileName);
+    if (foundFileName.length() != 0 )
+    {
+        // load distortion map texture file
+        osg::Image* image = osgDB::readImageFile(foundFileName);
+        if (image)
+        {
+                        osg::Texture2D* texture = new osg::Texture2D;
+            texture->setImage(image);
+            texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
+            texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
+            texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::CLAMP_TO_EDGE);
+            texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::CLAMP_TO_EDGE);
+            return texture;
+        }
+    }
+
+    OSG_NOTIFY(osg::WARN) << "File \"" << fileName << "\" not found." << std::endl;
+
+    return NULL;
 }
 
@@ -100 +124 @@
                 geom->setTexCoordArray(1,texcoords1);
 
- //   osg::DrawElementsUShort* elements = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES);
- //   geometry->addPrimitiveSet(elements);
 
         for ( unsigned int row=0; row<rows-1; row++ )   // each strip consists of two affected vertex rows, so we need only row-1 strips.
@@ -114 +136 @@
         }
 
-        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 );
-                        geom->getOrCreateStateSet()->addUniform( new osg::Uniform("sceneTexture", 0) );
-                        geom->getOrCreateStateSet()->addUniform( new osg::Uniform("intensityMapTexture", 1) );
-                        geom->getOrCreateStateSet()->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
-                }
-        }
+        //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 );
+        //              geom->getOrCreateStateSet()->addUniform( new osg::Uniform("sceneTexture", 0) );
+        //              geom->getOrCreateStateSet()->addUniform( new osg::Uniform("intensityMapTexture", 1) );
+        //              geom->getOrCreateStateSet()->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
+        //      }
+        //}
 
         return geom.release();
@@ -240 +262 @@
         // StateSet to contain the Texture StateAttribute.
         osg::StateSet* stateset = geode->getOrCreateStateSet();
-        stateset->setTextureAttributeAndModes(0, sceneTexture,osg::StateAttribute::ON);
-        stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
-
-                osg::TexMat* texmat = new osg::TexMat;
-        texmat->setScaleByTextureRectangleSize(true);
-        stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
+        //stateset->setTextureAttributeAndModes(0, sceneTexture,osg::StateAttribute::ON);
+        //stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
+
+                //osg::TexMat* texmat = new osg::TexMat;
+  //      texmat->setScaleByTextureRectangleSize(true);
+  //      stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
 
                 // If the intensityMap is used but not applyIntensityMapAsColours: Apply intensityMap as intensityMapTexture on unit 1
@@ -257 +279 @@
 
             stateset->setTextureAttributeAndModes(1, intensityMapTexture, osg::StateAttribute::ON);
+
+                        osg::Texture* tmp = loadTexture( "test.jpg" );
+                        if(tmp)
+                        {
+                                stateset->setTextureAttributeAndModes(0, tmp,osg::StateAttribute::ON);
+
+                                osg::TexMat* texmat = new osg::TexMat;
+                                texmat->setScaleByTextureRectangleSize(true);
+                                stateset->setTextureAttributeAndModes(0, 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, 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);
+                        }
+                }
 
 

experimental/distortionNG/shader.frag

@@ -1 +1 @@
 uniform sampler2D sceneTexture;
 uniform sampler2D intensityMapTexture;
-varying vec2 texcoord_scene;
-varying vec2 texcoord_intensityMap;
+in varying vec2 texcoord_scene;
+in varying vec2 texcoord_intensityMap;
 
 void main(void)

experimental/distortionNG/shader.vert

@@ -1 @@
-varying vec2 texcoord_scene;
-varying vec2 texcoord_intensityMap;
+out varying vec2 texcoord_scene;
+out varying vec2 texcoord_intensityMap;
 
 void main()
 {
         gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-        gl_FrontColor = gl_Color;
         texcoord_scene = vec2(gl_MultiTexCoord0);
         texcoord_intensityMap = vec2(gl_MultiTexCoord1);