Changeset 401 for experimental/distortionNG

Timestamp:

Jul 20, 2012, 8:42:05 AM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/DistortionManipulator.cpp

@@ -532 +532 @@
         if(_viewer.valid())
         {
+                //Update LF: Manipulator and Main Camera set to Identity Matrices
+                _viewer->getCameraManipulator()->setByMatrix(osg::Matrix::identity());
+                _viewer->getCamera()->setViewMatrix(osg::Matrix::identity());                   // t.b.d: Set Main Cameras' viewMatrix to Aircraft position for use in OsgVisual
+                _viewer->getCamera()->setProjectionMatrix(osg::Matrix::identity());
+
                 // Get slave struct to update the offset matrixes.
+                //Slave Camera Settings
                 osgViewer::View::Slave* sceneSlave = _viewer->findSlaveForCamera( _distortionSet->getSceneCamera() );
-
                 sceneSlave->_projectionOffset = _distortionSet->getProjectionOffset();
                 sceneSlave->_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());
+#if 0
+                // 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());
+#endif
+
         }
         else