Changeset 391 for experimental/distortionNG/DistortionManipulator.cpp

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/DistortionManipulator.cpp

@@ -289 +289 @@
         OSG_ALWAYS<<"Reseting IntensityMap Blending."<<std::endl;
 
-        if (!image->isDataContiguous())
+        //isDataContiguous is unknown to MSVS2010 and GCC
+        /*if (!image->isDataContiguous())
         {
                 OSG_WARN<<"Warning: DistortionManipulator does not support working with non contiguous imagery as blendmaps!"<<std::endl;
                 return;
-        }
+        }*/
 
         // Fill intensity map with 255 
@@ -531 +532 @@
         if(_viewer.valid())
         {
+                // 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());
         }
         else
@@ -554 +569 @@
                                                                                 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