Changeset 383 for experimental/distortionNG/DistortionSet.h

Timestamp:

Jun 15, 2012, 9:14:07 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionSet.h (modified) (3 diffs)

experimental/distortionNG/DistortionSet.h

@@ -54 +54 @@
 
         // Working access
-        bool isDirty(){return(_dirty);}
-        void dirty(){_dirty=true;}
+        bool isDirty(){return(_meshDirty || _matrixDirty);}
+        void dirtyMesh(){_meshDirty = true;}
+        void dirtyMatrix(){_matrixDirty = true;}
+        void clearDirtyStatus() { _meshDirty = false; _matrixDirty = false;}
+        
+        void setDistortionMeshDimensions(int rows, int cols);
 
         osg::Image* getIntensityMap()  { return _intensityMap; }        // Also for manipulating the intensity map
@@ -79 +83 @@
         int getDistortionMeshColumns() const    { return _distortionMeshColumns; }
 
-        void setDistortionMesh(osg::Geometry*);
-        const osg::Geometry* getDistortionMesh() const;
+        void setDistortionMesh(osg::Vec4Array* distortionMesh)  { _distortionMesh = distortionMesh; }
+        const osg::Vec4Array* getDistortionMesh() const { return _distortionMesh; }
 
         void setMeshType(GLenum meshType) { _meshType = meshType; }
@@ -106 +110 @@
 
 private:
-        bool _dirty;
+        // Blendmap has no dirty flag because changes of the intensityMap is directly effective.
+        bool _meshDirty;
+        bool _matrixDirty;
+
         int _distortionMeshRows;
         int _distortionMeshColumns;
+        osg::ref_ptr<osg::Vec4Array> _distortionMesh;   // x,y = vertex coordinates, z,t=textureCoordinates
         GLenum _meshType;