Changeset 380 for experimental/distortionNG/DistortionManipulator.cpp

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

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

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;