Changeset 381

Timestamp:

Jun 15, 2012, 7:22:30 AM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (3 diffs)
• DistortionManipulator.h (modified) (2 diffs)
• extViewer.cpp (modified) (1 diff)
• extViewer.h (modified) (1 diff)

experimental/distortionNG/DistortionManipulator.cpp

@@ -23 +23 @@
 #include <osg/Point>
 #include <osg/PolygonMode>
+#include <osg/TextureRectangle>
 
 #include <osgDB/Registry>
@@ -261 +262 @@
                                 if( _distortionSet->isDirty() && _viewer.valid())
                                 {
-                                        _viewer->updateDistortion();
+                                        updateDistortionSetup();
                                 }
                                 //OSG_ALWAYS<<"..done"<<std::endl;
@@ -512 +513 @@
         _highlighter->dirtyBound(); 
 }
+
+void DistortionManipulator::updateDistortionSetup()
+{
+        updateDistortionViewProjectionMatrix();
+        updateDistortionMesh();
+}
+
+void DistortionManipulator::updateDistortionViewProjectionMatrix()
+{
+        if(!_distortionSet.valid())
+        {
+                osg::notify(osg::WARN) << "You cannot update the distortion without distortion set up." << std::endl;
+                return;
+        }
+
+        if(_viewer.valid())
+        {
+                _viewer->getCamera()->setViewMatrix(_distortionSet->getViewOffset());
+                _viewer->getCamera()->setProjectionMatrix(_distortionSet->getProjectionOffset());
+        }
+        else
+                OSG_NOTIFY(osg::ALWAYS)<<"Invalid viewer!"<<std::endl;
+}
+
+void DistortionManipulator::updateDistortionMesh()
+{
+
+}

experimental/distortionNG/DistortionManipulator.h

@@ -80 +80 @@
         void updateHUD();
 
+        void updateDistortionSetup();
+        void updateDistortionViewProjectionMatrix();
+        void updateDistortionMesh();
+
+
         SetupMode activeSetupMode;
         DistortionMode activeDistortionMode;
@@ -90 +95 @@
         osg::ref_ptr<osg::Geometry> _highlighter;
     osg::observer_ptr<osg::Camera> _camera;
-         osg::observer_ptr<extViewer> _viewer;
+        osg::observer_ptr<extViewer> _viewer;
         osg::Geometry* _distortionMesh;
         const osg::Vec4 _highlightColor;

experimental/distortionNG/extViewer.cpp

@@ -397 +397 @@
         setUpViewForManualDistortion(ds);
 }
-
-void extViewer::updateDistortion()
-{
-        if(!_distortionSet.valid())
-        {
-                osg::notify(osg::WARN) << "You cannot update the distortion without distortion set up." << std::endl;
-                return;
-        }
-
-        this->getCamera()->setViewMatrix(_distortionSet->getViewOffset());
-        this->getCamera()->setProjectionMatrix(_distortionSet->getProjectionOffset());
-}

experimental/distortionNG/extViewer.h

@@ -51 +51 @@
                 void setUpIntensityMapBlending(std::string intensityMap);
 
-                /**
-                 * \brief This functions updates the distortion setup by applying the distortionSet values to the viewers distortion setup.
-                 * 
-                 */ 
-                void updateDistortion();
 
                 osgViewer::DistortionSet* getDistortionSet()    {return _distortionSet;}