Changeset 328 for experimental

Timestamp:

Mar 2, 2012, 10:41:12 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• extViewer.cpp (modified) (4 diffs)
• extViewer.h (modified) (1 diff)

experimental/distortionNG/extViewer.cpp

@@ -72 +72 @@
         return;
     }
+        
+        // Set up projection Matrix as it is done in View::setUpViewOnSingleScreen(
+        double fovy, aspectRatio, zNear, zFar;
+        _camera->getProjectionMatrixAsPerspective(fovy, aspectRatio, zNear, zFar);
+
+        double newAspectRatio = double(traits->width) / double(traits->height);
+        double aspectRatioChange = newAspectRatio / aspectRatio;
+        if (aspectRatioChange != 1.0)
+        {
+                _camera->getProjectionMatrix() *= osg::Matrix::scale(1.0/aspectRatioChange,1.0,1.0);
+        }
+
 
     int tex_width = width;
@@ -115 +127 @@
     }
 
-        //getCamera()->setProjectionMatrixAsPerspective(90.0f, (float)tex_width/(float)tex_height, 1, 1000.0);
-
     // distortion correction set up.
     {
         osg::Geode* geode = new osg::Geode();
                 //geode->addDrawable(createParoramicSphericalDisplayDistortionMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 1, 0.45, 0, projectorMatrix));
-                geode->addDrawable(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));
+                geode->addDrawable(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, projectorMatrix));
 
         // new we need to add the texture to the mesh, we do so by creating a
@@ -163 +173 @@
 }
 
-osg::Geometry* extViewer::createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows )
+osg::Geometry* extViewer::createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows, const osg::Matrix& projectorMatrix)
 {
         // Create Quad to render on
@@ -194 +204 @@
                 for ( unsigned int col=0; col<columns; col++ )
                 {
-                        vertices->push_back( origin+dy*row+dx*col );
+                        vertices->push_back( origin+dy*row+dx*col );    // geometry
                         osg::Vec2 texcoord = osg::Vec2((float)col/(float)(columns-1), (float)row/(float)(rows-1));
                         texcoords0->push_back( texcoord );

experimental/distortionNG/extViewer.h

@@ -16 +16 @@
         void setUpViewForManualDistortion(unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
 
-                static osg::Geometry* createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows);
+                static osg::Geometry* createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows, const osg::Matrix& projectorMatrix);
 };