Changeset 392

Timestamp:

Jun 30, 2012, 5:25:38 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (1 diff)
• DistortionSet.cpp (modified) (1 diff)
• distortionNG.vcproj (modified) (1 diff)
• extViewer.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• shader.vert (modified) (2 diffs)
• shaderIntensityMap.frag (modified) (2 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -53 +53 @@
         //_distortionMesh(distortionMesh)
 
-        // Create Shader to vizualize intensitymap during blending setup.
+        // Create Shader to visualize intensitymap during blending setup.
         osg::Shader* sh = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shaderIntensityMapVis.frag" ); 
         sh->setName("shaderIntensityMapVis");

experimental/distortionNG/DistortionSet.cpp

@@ -56 +56 @@
         _distortionMeshColumns = cols;
 
-        if(_distortionMesh->size() != _distortionMeshRows * _distortionMeshRows)        // If dimensions differ: discard current mesh and createa new one
+        if(_distortionMesh->size() != _distortionMeshRows * _distortionMeshColumns)     // If dimensions differ: discard current mesh and create a new one
         {
-                _distortionMesh = new osg::Vec4Array(_distortionMeshRows * _distortionMeshRows);
+                _distortionMesh = new osg::Vec4Array(_distortionMeshRows * _distortionMeshColumns);
                 for(int row=0;row<_distortionMeshRows;row++)
                 {

experimental/distortionNG/distortionNG.vcproj

@@ -391 +391 @@
                 </Filter>
                 <File
+                        RelativePath=".\shader.vert"
+                        >
+                </File>
+                <File
                         RelativePath=".\shaderIntensityMap.frag"
                         >

experimental/distortionNG/extViewer.cpp

@@ -364 +364 @@
         osg::Program* IntensityMapProgram = new osg::Program;
         IntensityMapProgram->setName( "intensityMapBlending" );
+        osg::Shader* shaderVert = osg::Shader::readShaderFile( osg::Shader::VERTEX, "shader.vert" ); 
+        shaderVert->setName("shaderVert");
         osg::Shader* shaderIntensityMap = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shaderIntensityMap.frag" ); 
         shaderIntensityMap->setName("shaderIntensityMap");
+
         _distortionSet->setShaderIntensityMap( shaderIntensityMap );
 
-        if ( shaderIntensityMap )
-        {
+        if ( shaderVert && shaderIntensityMap )
+        {
+                IntensityMapProgram->addShader( shaderVert );
                 IntensityMapProgram->addShader( shaderIntensityMap );
                 stateset->addUniform( new osg::Uniform("sceneTexture", (int)_distortionSet->getTexUnitScene()) );

experimental/distortionNG/main.cpp

@@ -53 +53 @@
         osg::ref_ptr<osgViewer::DistortionSet> _distortionSet = new osgViewer::DistortionSet();
         _distortionSet->setIntensityMap( intMap );
-        _distortionSet->setDistortionMeshDimensions(20, 20);
+        _distortionSet->setDistortionMeshDimensions(20, 30);
         
 

experimental/distortionNG/shader.vert

@@ -1 +1 @@
 varying vec2 texcoord_scene;
 varying vec2 texcoord_intensityMap;
+
+varying vec2 texCoord;
 
 void main()
@@ -7 +9 @@
         texcoord_scene = vec2(gl_MultiTexCoord0.xy);
         texcoord_intensityMap = vec2(gl_MultiTexCoord1.xy);
+        texCoord = gl_MultiTexCoord0.xy;
 }

experimental/distortionNG/shaderIntensityMap.frag

@@ -3 +3 @@
 varying vec2 texcoord_scene;
 varying vec2 texcoord_intensityMap;
+
+varying vec2 texCoord;
 
 void main(void)
@@ -9 +11 @@
         vec4 blendColor;
 
-        sceneColor = texture2DRect(sceneTexture, gl_FragCoord);
+        //sceneColor = texture2DRect(sceneTexture, gl_FragCoord);
         blendColor = texture2DRect(intensityMapTexture, gl_FragCoord);
-        gl_FragColor = sceneColor * blendColor;
+        
+        //gl_FragColor = blendColor * texture2DRect( sceneTexture, texCoord*vec2(1920, 1200)) ;
+        gl_FragColor = texture2DRect( sceneTexture, texCoord*vec2(1920, 1200)) ;
 }