Changeset 388

Timestamp:

Jun 16, 2012, 2:14:35 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionSetupStrategyProjectSyntropy.cpp (modified) (4 diffs)
• main.cpp (modified) (2 diffs)

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -211 +211 @@
 
                                 // Store values into array
-                                tmpMesh->push_back(osg::Vec2(values[2], values[3]));
+                                tmpMesh->push_back(osg::Vec2(values[0], values[1]));
                         }
                 }
@@ -362 +362 @@
                                 if(distortionMeshRows!=texCoordRows || distortionMeshColumns!=texCoordColumns)
                                 {
-                                        OSG_ALWAYS<<"The mesh dimensions of the vertex- and textureCoordinate-distortion differ!"<<std::endl;
+                                        OSG_ALWAYS<<"The mesh dimensions of the vertex- and textureCoordinate-file differ!"<<std::endl;
                                         return;
                                 }
@@ -392 +392 @@
                                         float w=(float)row/(float)(distortionMeshRows-1);               // TexCoord Y
 
-        /*                              if(_distortionType==VERTEXDISTORTION || _distortionType==COMBINEDDISTORTION)
+                                        if(_distortionType==VERTEXDISTORTION || _distortionType==COMBINEDDISTORTION)
                                         {
-                                                x = vertexMeshVec2->at(row*col).x();
-                                                y = vertexMeshVec2->at(row*col).y();
+                                                x = vertexMeshVec2->at(row*distortionMeshColumns + col).x();
+                                                y = vertexMeshVec2->at(row*distortionMeshColumns + col).y();
                                         }
                                         if(_distortionType==TEXCOORDDISTORTION || _distortionType==COMBINEDDISTORTION)
                                         {
-                                                z = texCoordMeshVec2->at(row*col).x();
-                                                w = texCoordMeshVec2->at(row*col).y();
-                                        }*/
+                                                z = texCoordMeshVec2->at(row*distortionMeshColumns + col).x();
+                                                w = texCoordMeshVec2->at(row*distortionMeshColumns + col).y();
+                                        }
 
                                         distortionMesh->at(row*distortionMeshColumns+col).set(x,y,z,w);
@@ -407 +407 @@
                         }
 
+#if 0
                         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;
                         }
+#endif
 
 

experimental/distortionNG/main.cpp

@@ -95 +95 @@
 
         DistortionSetupStrategyProjectSyntropy* psStrategy = new DistortionSetupStrategyProjectSyntropy();
-        psStrategy->setDistortionInputFiles( "./resources/ProjectSyntropy/Vertices/warpmap_2.csv",
-                                                                                "./resources/ProjectSyntropy/TexCoords/warpmap_2.csv",
+        psStrategy->setDistortionInputFiles( "./resources/ProjectSyntropy/Vertices/warpmap_1.csv",
+                                                                                "./resources/ProjectSyntropy/TexCoords/warpmap_1.csv",
                                                                                 "./resources/ProjectSyntropy/blending_1.bmp",
                                                                                 "./resources/ProjectSyntropy/Vertices/frustum_1.csv",
@@ -132 +132 @@
     if (!rootnode)
     {
-                rootnode = osgDB::readNodeFile("cow.osgt");
+                rootnode = osgDB::readNodeFile("H:\\AllInOnDB\\terrain.osgb");
                 if(!rootnode)
                 {