Changeset 391 for experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

Timestamp:

Jun 30, 2012, 1:09:04 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp (modified) (2 diffs)

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -294 +294 @@
                 readFrustumFromCSVFile(_frustumFilename, numFrustumValues, frustumValues);
                 
-                osg::Matrixd viewOffset=osg::Matrixd();
+                osg::Matrixd viewOffset=osg::Matrix::identity();
                 osg::Matrixd projectionOffset=osg::Matrixd();
 
@@ -300 +300 @@
                 // Translational Parameters are defines in millimeters (->Correction required?!)
                 // Coordinate System / Directions may be looked up in "Koordinatensystem.png", trans/rot order confirmed bei PS
-                viewOffset = osg::Matrixd::translate(frustumValues[0],frustumValues[1],frustumValues[2]);
-                viewOffset*= osg::Matrixd::rotate(osg::inDegrees(frustumValues[3]), 0.0,0.0,1.0); //Heading
-                viewOffset*= osg::Matrixd::rotate(osg::inDegrees(frustumValues[4]), 1.0,0.0,0.0); //Pitch
-                viewOffset*= osg::Matrixd::rotate(osg::inDegrees(frustumValues[5]), 0.0,1.0,0.0); //Bank
-
+                osg::Matrixd rotViewOffset=osg::Matrixd();
+                rotViewOffset.makeRotate(
+                        osg::DegreesToRadians(frustumValues[3]), osg::Vec3(0,1,0),      // heading
+                        osg::DegreesToRadians(-frustumValues[4]), osg::Vec3(1,0,0),     // pitch
+                        osg::DegreesToRadians(frustumValues[5]), osg::Vec3(0,0,1));     // roll
+
+                osg::Matrixd transViewOffset=osg::Matrixd();
+                transViewOffset.makeTranslate( frustumValues[0], frustumValues[1], frustumValues[2]);
+
+                viewOffset = viewOffset * rotViewOffset; // * transViewOffset;
+                
                 //Frustum Parameters: Left, Right, Bottom, Top, zNear, zFar
-                //Alternative: viewer->camera->setprojectionmatrixasfrustum?
                 projectionOffset.makeFrustum(osg::inDegrees(frustumValues[6]), osg::inDegrees(frustumValues[7]), osg::inDegrees(frustumValues[8]), osg::inDegrees(frustumValues[9]), zNear, zFar);