Changeset 338

Timestamp:

Mar 16, 2012, 11:15:58 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• extViewer.cpp (modified) (2 diffs)
• shader.frag (modified) (1 diff)
• shader.vert (modified) (1 diff)

experimental/distortionNG/extViewer.cpp

@@ -313 +313 @@
                 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);
-                        //}
-                }
-
-
         osg::ref_ptr<osg::Camera> camera = new osg::Camera;
         camera->setGraphicsContext(gc.get());
@@ -350 +329 @@
         camera->setViewMatrix(osg::Matrix::identity());
 
-                //// selector
-                //geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
-                //geode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
-                //osg::ref_ptr<distortionHandler> selector = new distortionHandler( camera, distortionMesh );
+                // selector
+                geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
+                geode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
+                osg::ref_ptr<distortionHandler> selector = new distortionHandler( camera, distortionMesh );
                 osg::ref_ptr<osg::Group> root = new osg::Group;
                 root->addChild(geode);
-                //root->addChild(selector->createVertexHighlighter());
-                //addEventHandler( selector.get() );
+                root->addChild(selector->createVertexHighlighter());
+                addEventHandler( selector.get() );
                 camera->addChild(root);
-                //// Avoid that the highlighter is culled away
-                //osg::CullSettings::CullingMode mode = camera->getCullingMode();
-                //camera->setCullingMode( mode & (~osg::CullSettings::SMALL_FEATURE_CULLING) );
+                // Avoid that the highlighter is culled away
+                osg::CullSettings::CullingMode mode = camera->getCullingMode();
+                camera->setCullingMode( mode & (~osg::CullSettings::SMALL_FEATURE_CULLING) );
 
 

experimental/distortionNG/shader.frag

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

experimental/distortionNG/shader.vert

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