Changeset 387 for experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

Timestamp:

Jun 16, 2012, 1:57:23 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp (modified) (2 diffs)

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -387 +387 @@
                                 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
-                                        if(_distortionType==VERTEXDISTORTION || _distortionType==COMBINEDDISTORTION)
+                                        float x=(float)col/(float)(distortionMeshColumns-1);    // Vertex X
+                                        float y=(float)row/(float)(distortionMeshRows-1);               // Vertex Y
+                                        float z=(float)col/(float)(distortionMeshColumns-1);    // TexCoord X
+                                        float w=(float)row/(float)(distortionMeshRows-1);               // TexCoord Y
+
+        /*                              if(_distortionType==VERTEXDISTORTION || _distortionType==COMBINEDDISTORTION)
                                         {
                                                 x = vertexMeshVec2->at(row*col).x();
@@ -400 +401 @@
                                                 z = texCoordMeshVec2->at(row*col).x();
                                                 w = texCoordMeshVec2->at(row*col).y();
-                                        }
+                                        }*/
 
                                         distortionMesh->at(row*distortionMeshColumns+col).set(x,y,z,w);
                                 }
                         }
+
+                        for (osg::Vec4Array::iterator it = distortionMesh->begin(); it != distortionMesh->end(); ++it)
+                        {
+                                OSG_ALWAYS<<"final vector: "<<(*it).x()<<" "<<(*it).y()<<" "<<(*it).z()<<" "<<(*it).w()<<std::endl;
+                        }
+
 
                         distortionSet->setDistortionMesh(distortionMesh);