Changeset 407 for experimental/distortionNG/DistortionManipulator.cpp

Timestamp:

Aug 5, 2012, 11:09:39 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionManipulator.cpp (modified) (3 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -308 +308 @@
                 return;
 
-        OSG_ALWAYS<<"ToDo: resetDistortion()"<<std::endl;
+        
+        _distortionSet->setDistortionMeshDimensions(2, 2, true);        // Reset dimensions and coordinates/texcoords & rebuild mesh data
+        updateDistortionMesh(); // Rebuild OSG Mesh (drawable)
+        // Restore ProjectionMatrix
+        
+        // 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(_distortionSet->intensityMap()->width) / double(_distortionSet->intensityMap()->height);
+        double aspectRatioChange = newAspectRatio / aspectRatio;
+        if (aspectRatioChange != 1.0)
+        {
+                _camera->getProjectionMatrix() *= osg::Matrix::scale(1.0/aspectRatioChange,1.0,1.0);
+        }
+
+
 }
 
@@ -599 +615 @@
                                                                                 0.0     );
                 vertices->push_back( tmpVec );
-                //OSG_ALWAYS<<"Transfering mesh vertex : X:"<<tmpVec.x()<<" Y:"<<tmpVec.y()<<" Z:"<<tmpVec.z()<<std::endl;
+                OSG_ALWAYS<<"Transfering mesh vertex : X:"<<tmpVec.x()<<" Y:"<<tmpVec.y()<<" Z:"<<tmpVec.z()<<std::endl;
 
                 // Note texCoords
@@ -606 +622 @@
 
                 texCoords->push_back(tmpTexCoords);
-                //OSG_ALWAYS<<"Transfering texcoord vertex : X:"<<tmpTexCoords.x()<<" Y:"<<tmpTexCoords.y()<<std::endl;
+                OSG_ALWAYS<<"Transfering texcoord vertex : X:"<<tmpTexCoords.x()<<" Y:"<<tmpTexCoords.y()<<std::endl;
 
                 colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));