Changeset 396 for experimental/distortionNG

Timestamp:

Jul 4, 2012, 11:02:56 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (2 diffs)
• shaderIntensityMap.frag (modified) (1 diff)

experimental/distortionNG/DistortionManipulator.cpp

@@ -517 +517 @@
 void DistortionManipulator::updateDistortionSetup()
 {
-        //updateDistortionViewProjectionMatrix();
+        updateDistortionViewProjectionMatrix();
         updateDistortionMesh();
         _distortionSet->clearDirtyStatus();
@@ -548 +548 @@
                 printf("Camera Direction: %.2lf, %.2lf, %.2lf\n",Focus.x()-Eye.x(),Focus.y()-Eye.y(),Focus.z()-Eye.z());
                 printf("Vertical after: %.2lf, %.2lf, %.2lf\n",Vertical.x()-Eye.x(),Vertical.y()-Eye.y(),Vertical.z()-Eye.z());
+
+                double fovy, aspectRatio, zNear, zFar;
+                _viewer->getCamera()->getProjectionMatrixAsPerspective(fovy, aspectRatio, zNear, zFar);
+                OSG_ALWAYS<<"aspect ratio: "<<aspectRatio<<std::endl;
+                //double newAspectRatio = double(_screenPixWidth) / double(_screenPixHeight);
+                //double aspectRatioChange = newAspectRatio / aspectRatio;
+                //if (aspectRatioChange != 1.0)
+                //{
+                //      _viewer->getCamera()->getProjectionMatrix() *= osg::Matrix::scale(1.0/aspectRatioChange,1.0,1.0);
+                //}
+
+
         }
         else

experimental/distortionNG/shaderIntensityMap.frag

@@ -6 +6 @@
 void main(void)
 {
-        //vec4 blendColor = texture2DRect(intensityMapTexture, gl_FragCoord);
-        vec4 blendColor = texture2DRect(intensityMapTexture, texCoord);
+        vec4 blendColor = texture2DRect(intensityMapTexture, gl_FragCoord);
+        //vec4 blendColor = texture2DRect(intensityMapTexture, texCoord);
         
         gl_FragColor = blendColor * texture2DRect( sceneTexture, texCoord) ;