Changeset 393 for experimental/distortionNG

Timestamp:

Jun 30, 2012, 7:44:12 PM (12 years ago)

Author:

Torben Dannhauer

Message:

ProjectSyntropy? Distortion works! It a alpha version, some bugs are still not hunted down.

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (2 diffs)
• DistortionSetupStrategyProjectSyntropy.cpp (modified) (2 diffs)
• main.cpp (modified) (2 diffs)
• shader.vert (modified) (2 diffs)
• shaderIntensityMap.frag (modified) (2 diffs)
• shaderIntensityMapVis.frag (modified) (1 diff)

experimental/distortionNG/DistortionManipulator.cpp

@@ -517 +517 @@
 void DistortionManipulator::updateDistortionSetup()
 {
-        updateDistortionViewProjectionMatrix();
+        //updateDistortionViewProjectionMatrix();
         updateDistortionMesh();
         _distortionSet->clearDirtyStatus();
@@ -574 +574 @@
                 osg::Vec2 tmpTexCoords = osg::Vec2(     tmpSrc.z()*_screenPixWidth,
                                                                                         tmpSrc.w()*_screenPixHeight );
+
                 texCoords->push_back(tmpTexCoords);
                 //OSG_ALWAYS<<"Transfering texcoord vertex : X:"<<tmpTexCoords.x()<<" Y:"<<tmpTexCoords.y()<<std::endl;

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -412 +412 @@
                         }
 
-#if 0
+#if 1
                         for (osg::Vec4Array::iterator it = distortionMesh->begin(); it != distortionMesh->end(); ++it)
                         {
@@ -421 +421 @@
 
                         distortionSet->setDistortionMesh(distortionMesh);
-                        distortionSet->setDistortionMeshColumns(distortionMeshColumns);
-                        distortionSet->setDistortionMeshRows(distortionMeshRows);
+                        //distortionSet->setDistortionMeshColumns(distortionMeshColumns);
+                        //distortionSet->setDistortionMeshRows(distortionMeshRows);
+                        distortionSet->setDistortionMeshDimensions(distortionMeshRows, distortionMeshColumns);
                 }
         }

experimental/distortionNG/main.cpp

@@ -99 +99 @@
                                                                                 "./resources/ProjectSyntropy/blending_1.bmp",
                                                                                 "./resources/ProjectSyntropy/Vertices/frustum_1.csv",
-                                                                                DistortionSetupStrategy::VERTEXDISTORTION );
+                                                                                DistortionSetupStrategy::TEXCOORDDISTORTION );
         distortionManip->setDistortionSetupStrategy( psStrategy );
         viewer.addEventHandler(distortionManip);
@@ -129 +129 @@
     // load the nodes from the commandline arguments.
     osg::Node* rootnode = osgDB::readNodeFiles(arguments);
+        osgDB::Registry::instance()->getDataFilePathList().push_front("H:/AllInOnDB");
 
     if (!rootnode)
     {
-                //osgDB::Registry::instance()->getDataFilePathList().push_front("H:/AllInOnDB");
-                rootnode = osgDB::readNodeFile("resources/TestSphere/sphere_500.obj");
+                rootnode = osgDB::readNodeFile("D:/osgVisual/experimental/distortionNG/resources/TestSphere/sphere_500.obj");
                 if(!rootnode)
                 {

experimental/distortionNG/shader.vert

@@ -1 @@
-varying vec2 texcoord_scene;
-varying vec2 texcoord_intensityMap;
-
 varying vec2 texCoord;
 
@@ -7 +4 @@
 {
         gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-        texcoord_scene = vec2(gl_MultiTexCoord0.xy);
-        texcoord_intensityMap = vec2(gl_MultiTexCoord1.xy);
         texCoord = gl_MultiTexCoord0.xy;
 }

experimental/distortionNG/shaderIntensityMap.frag

@@ -1 +1 @@
 uniform sampler2DRect sceneTexture;
 uniform sampler2DRect intensityMapTexture;
-varying vec2 texcoord_scene;
-varying vec2 texcoord_intensityMap;
 
 varying vec2 texCoord;
@@ -8 +6 @@
 void main(void)
 {
-        vec4 sceneColor;
-        vec4 blendColor;
-
-        //sceneColor = texture2DRect(sceneTexture, gl_FragCoord);
-        blendColor = texture2DRect(intensityMapTexture, gl_FragCoord);
+        vec4 blendColor = texture2DRect(intensityMapTexture, gl_FragCoord);
         
-        //gl_FragColor = blendColor * texture2DRect( sceneTexture, texCoord*vec2(1920, 1200)) ;
-        gl_FragColor = texture2DRect( sceneTexture, texCoord*vec2(1920, 1200)) ;
+        gl_FragColor = blendColor * texture2DRect( sceneTexture, texCoord) ;
 }

experimental/distortionNG/shaderIntensityMapVis.frag

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