Changeset 318 for experimental/distortionNG

Timestamp:

Sep 8, 2011, 6:56:02 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/extViewer.cpp

@@ -175 +175 @@
     yAxis /= height;
 
-        osg::Vec3 dx = xAxis*(width/((float)(columns)));
-    osg::Vec3 dy = yAxis*(height/((float)(rows)));
+        osg::Vec3 dx = xAxis*(width/((float)(columns-1)));
+    osg::Vec3 dy = yAxis*(height/((float)(rows-1)));
 
 
@@ -187 +187 @@
         geom->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 
-        for ( unsigned int i=0; i<rows; ++i )
+        for ( unsigned int row=0; row<rows; ++row )
         {
-                for ( unsigned int j=0; j<columns; ++j )
+                for ( unsigned int col=0; col<columns; ++col )
                 {
-                        vertices->push_back( origin+dy*i+dx*j );
-                        texcoords0->push_back( osg::Vec2((float)j/(float)columns, (float)i/(float)rows) );
+                        vertices->push_back( origin+dy*row+dx*col );
+                        texcoords0->push_back( osg::Vec2((float)col/(float)columns, (float)row/(float)rows) );
 
 //      if (intensityMap)
@@ -223 +223 @@
  //   geometry->addPrimitiveSet(elements);
 
-        for ( unsigned int i=0; i<rows-1; ++i )
+        for ( unsigned int row=0; row<rows; ++row )
         {
                 osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);
-                for ( unsigned int j=0; j<columns; ++j )
+                for ( unsigned int col=0; col<columns; ++col )
                 {
-                        (*de)[j*2 + 0] = i*columns + j;
-                        (*de)[j*2 + 1] = (i+1)*columns + j;
+                        (*de)[col*2 + 0] = row*columns + col;
+                        (*de)[col*2 + 1] = (row+1)*columns + col;
                 }
                 geom->addPrimitiveSet( de.get() );