Changeset 379

Timestamp:

Jun 14, 2012, 9:34:49 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (1 diff)
• DistortionSet.cpp (modified) (1 diff)
• DistortionSet.h (modified) (2 diffs)
• DistortionSetupStrategyProjectSyntropy.cpp (modified) (4 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -256 +256 @@
                         if ( activeSetupMode == DELEGATED && _delegatedDistortionSetupStrategy.valid())
                         {
-                                OSG_ALWAYS<<"Calling delegated class.."<<std::endl;
+                                //OSG_ALWAYS<<"Calling delegated class.."<<std::endl;
                                 _delegatedDistortionSetupStrategy->delegateDistortionSetup(_distortionSet);
-                                // ToDo :: nach dem der distortioncontainer von der strategy aktualisiert wurde muss nun noch der container noch angewendet werden.
-                                OSG_ALWAYS<<"..done"<<std::endl;
+                                if( _distortionSet->isDirty() )
+                                {
+                                        // todo: transfer matrixes into viewer camera.
+                                }
+                                //OSG_ALWAYS<<"..done"<<std::endl;
                         }
                         break;

experimental/distortionNG/DistortionSet.cpp

@@ -24 +24 @@
 DistortionSet::DistortionSet()
 {
+        _dirty = false;
+
         _distortionMeshRows = 2;
         _distortionMeshColumns = 2;

experimental/distortionNG/DistortionSet.h

@@ -54 +54 @@
 
         // Working access
+        bool isDirty(){return(_dirty);}
+        void dirty(){_dirty=true;}
+
         osg::Image* getIntensityMap()  { return _intensityMap; }        // Also for manipulating the intensity map
         bool& getShowIntensityMapOnlyAsRef()    { return _showIntesityMapMapOnly;}
@@ -103 +106 @@
 
 private:
+        bool _dirty;
         int _distortionMeshRows;
         int _distortionMeshColumns;

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -261 +261 @@
         if (_distortionInitialized==false )
         {
+                _distortionInitialized=true;
+                distortionSet->dirty();
 
                 // ******************** //
@@ -292 +294 @@
                 distortionSet->getIntensityMap()->dirty();
 
-                return;
                 // ******************************* //
                 // *** Frustum and View Offset *** //
@@ -321 +322 @@
                 distortionSet->setViewOffset(viewOffset);
                 distortionSet->setProjectionOffset(projectionOffset);
-
+return;
                 // ******************************* //
                 // ******* Distortion Mesh ******* //
@@ -383 +384 @@
                 }
 
-                _distortionInitialized=true;
-
-
-        }
-
-}
+        }
+
+}