Changeset 407 for experimental/distortionNG/DistortionSet.cpp

Timestamp:

Aug 5, 2012, 11:09:39 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/DistortionSet.cpp

@@ -27 +27 @@
         _matrixDirty = false;
 
-        _distortionMeshRows = 2;
-        _distortionMeshColumns = 2;
-        _distortionMesh = new osg::Vec4Array();
+        setDistortionMeshDimensions(2, 2);
         
         _intensityMap = NULL;
@@ -52 +50 @@
 }
 
-void DistortionSet::setDistortionMeshDimensions(int rows, int cols)
+void DistortionSet::setDistortionMeshDimensions(int rows, int cols, bool enforceMeshRebuild)
 {
         _distortionMeshRows = rows;
         _distortionMeshColumns = cols;
 
-        if(_distortionMesh->size() != _distortionMeshRows * _distortionMeshColumns)     // If dimensions differ: discard current mesh and create a new one
+        if(!_distortionMesh.valid() || enforceMeshRebuild || _distortionMesh->size() != _distortionMeshRows * _distortionMeshColumns)   // If dimensions differ: discard current mesh and create a new one
         {
                 _distortionMesh = new osg::Vec4Array(_distortionMeshRows * _distortionMeshColumns);
@@ -64 +62 @@
                         for(int col=0;col<_distortionMeshColumns;col++)
                         {
-                                float x=col/_distortionMeshColumns;     // Vertex X
-                                float y=row/_distortionMeshRows;        // Vertex Y
-                                float z=col/_distortionMeshColumns;     // TexCoord X
-                                float w=row/_distortionMeshRows;        // TexCoord Y
+                                float x=col/(float)(_distortionMeshColumns-1);  // Vertex X
+                                float y=row/(float)(_distortionMeshRows-1);     // Vertex Y
+                                float z=col/(float)(_distortionMeshColumns-1);  // TexCoord X
+                                float w=row/(float)(_distortionMeshRows-1);     // TexCoord Y
 
                                 _distortionMesh->at(row*_distortionMeshColumns+col).set(x,y,z,w);