Changeset 380 for experimental

Timestamp:

Jun 14, 2012, 10:21:52 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

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

experimental/distortionNG/DistortionManipulator.cpp

@@ -18 +18 @@
 
 #include "DistortionManipulator.h"
+#include "extViewer.h"
 
 #include <osgViewer/Viewer>
@@ -33 +34 @@
 
 
-DistortionManipulator::DistortionManipulator(DistortionSet* ds)
- : _highlightColor( osg::Vec4(1.0f, 1.0f, 0.0f, 1.0f) ), _distortionSet( ds )
+DistortionManipulator::DistortionManipulator(extViewer* viewer, DistortionSet* ds)
+ : _highlightColor( osg::Vec4(1.0f, 1.0f, 0.0f, 1.0f) ), _distortionSet( ds ), _viewer(viewer)
 {
         activeSetupMode = DISABLED;
@@ -258 +259 @@
                                 //OSG_ALWAYS<<"Calling delegated class.."<<std::endl;
                                 _delegatedDistortionSetupStrategy->delegateDistortionSetup(_distortionSet);
-                                if( _distortionSet->isDirty() )
+                                if( _distortionSet->isDirty() && _viewer.valid())
                                 {
-                                        // todo: transfer matrixes into viewer camera.
+                                        _viewer->updateDistortion();
                                 }
                                 //OSG_ALWAYS<<"..done"<<std::endl;

experimental/distortionNG/DistortionManipulator.h

@@ -31 +31 @@
 #include "DistortionSet.h"
 
+class extViewer;
 
 namespace osgViewer {
@@ -58 +59 @@
 
 
-        DistortionManipulator(DistortionSet* ds);
+        DistortionManipulator(extViewer* viewer, DistortionSet* ds);
         virtual ~DistortionManipulator();
 
@@ -89 +90 @@
         osg::ref_ptr<osg::Geometry> _highlighter;
     osg::observer_ptr<osg::Camera> _camera;
+         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;}
                 void setDistortionSet(osgViewer::DistortionSet* ds) {_distortionSet = ds;}

experimental/distortionNG/main.cpp

@@ -93 +93 @@
 
         // Add the distortion manipulator
-        osgViewer::DistortionManipulator* distortionManip = new osgViewer::DistortionManipulator(_distortionSet);
+        osgViewer::DistortionManipulator* distortionManip = new osgViewer::DistortionManipulator(&viewer, _distortionSet);
 
         DistortionSetupStrategyProjectSyntropy* psStrategy = new DistortionSetupStrategyProjectSyntropy();