Changeset 397

Timestamp:

Jul 5, 2012, 3:44:40 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionManipulator.cpp (modified) (1 diff)

experimental/distortionNG/DistortionManipulator.cpp

@@ -532 +532 @@
         if(_viewer.valid())
         {
+                // Get slave struct to update the offset matrixes.
+                int slaveIndex = _viewer->findSlaveIndexForCamera( _viewer->getCamera() );
+
+                _viewer->getSlave( slaveIndex )._projectionOffset = _distortionSet->getProjectionOffset();
+                _viewer->getSlave( slaveIndex )._viewOffset = _distortionSet->getViewOffset();
+
+
                 // LF CameraMainupulators override ViewMatrix, so they have to go...
-                // alternatively, _viewer->getCameraManipulator()->setByMatrix(_distortionSet->getViewOffset()) could be set
-                // but this complicates exact camera positioning and rotating
-
-                _viewer->setCameraManipulator(0);
-
-                _viewer->getCamera()->setViewMatrix(_distortionSet->getViewOffset());
-                _viewer->getCamera()->setProjectionMatrix(_distortionSet->getProjectionOffset());
-
-                // Print viewMatrixAsLookAt for Debug Purposes
-                osg::Vec3 Eye,Focus,Vertical;
-                _viewer->getCamera()->getViewMatrixAsLookAt(Eye,Focus,Vertical);
-                OSG_ALWAYS<<"Camera Eyepoint: X:"<<Eye.x()<<" Y:"<<Eye.y()<<" Z:"<<Eye.z()<<std::endl;
-                printf("Camera Eyepoint: %.2lf, %.2lf, %.2lf\n",Eye.x(),Eye.y(),Eye.z());
-                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);
-                //}
-
-
+                //// alternatively, _viewer->getCameraManipulator()->setByMatrix(_distortionSet->getViewOffset()) could be set
+                //// but this complicates exact camera positioning and rotating
+
+                //_viewer->setCameraManipulator(0);
+
+                //_viewer->getCamera()->setViewMatrix(_distortionSet->getViewOffset());
+                //_viewer->getCamera()->setProjectionMatrix(_distortionSet->getProjectionOffset());
+
+                //// Print viewMatrixAsLookAt for Debug Purposes
+                //osg::Vec3 Eye,Focus,Vertical;
+                //_viewer->getCamera()->getViewMatrixAsLookAt(Eye,Focus,Vertical);
+                //OSG_ALWAYS<<"Camera Eyepoint: X:"<<Eye.x()<<" Y:"<<Eye.y()<<" Z:"<<Eye.z()<<std::endl;
+                //printf("Camera Eyepoint: %.2lf, %.2lf, %.2lf\n",Eye.x(),Eye.y(),Eye.z());
+                //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());
         }
         else