Changeset 339

Timestamp:

Mar 23, 2012, 10:56:17 PM (13 years ago)

Author:

Torben Dannhauer

Message:

Mesh can now be triangle_strip or quad_strip

-> important to fix vertex selector working :)

Location:

experimental/distortionNG

Files:

• distortionNG.cpp (modified) (1 diff)
• extViewer.cpp (modified) (2 diffs)

experimental/distortionNG/distortionNG.cpp

@@ -112 +112 @@
                                 closestVertexIndex = result.indexList[i];
                         }
-                        OSG_NOTIFY(osg::ALWAYS)<<"maxRatio="<<maxRatio<<std::endl;
-                        OSG_NOTIFY(osg::ALWAYS)<<"closestVertexIndex="<<closestVertexIndex<<std::endl;
+                //      OSG_NOTIFY(osg::ALWAYS)<<"maxRatio="<<maxRatio<<std::endl;
+                //      OSG_NOTIFY(osg::ALWAYS)<<"closestVertexIndex="<<closestVertexIndex<<std::endl;
                 }
                 OSG_NOTIFY(osg::ALWAYS)<<"nearest vertex: X="<<(*vertices)[closestVertexIndex].x()<<" Y="<<(*vertices)[closestVertexIndex].y()<<" Z="<<(*vertices)[closestVertexIndex].z()<<std::endl;

experimental/distortionNG/extViewer.cpp

@@ -44 +44 @@
                         osg::Texture2D* texture = new osg::Texture2D;
             texture->setImage(image);
-            //texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
-            //texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
-            //texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::CLAMP_TO_EDGE);
-            //texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::CLAMP_TO_EDGE);
                         texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
                         texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
@@ -152 +148 @@
                 geom->setTexCoordArray(1,texcoords1);
 
-
+        //// Quads grid
+        //for ( unsigned int row=0; row<rows-1; row++ ) // each strip consists of two affected vertex rows, so we need only row-1 strips.
+        //{
+        //      osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);   // columns*2 = number of involved vertices for this strip.
+        //      for ( unsigned int col=0; col<columns; col++ )
+        //      {
+        //              (*de)[col*2 + 0] = row*columns + col;
+        //              (*de)[col*2 + 1] = (row+1)*columns + col;
+        //      }
+        //      geom->addPrimitiveSet( de.get() );
+        //}
+
+        // Triangle grid
         for ( unsigned int row=0; row<rows-1; row++ )   // each strip consists of two affected vertex rows, so we need only row-1 strips.
         {
-                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);   // columns*2 = number of involved vertices for this strip.
+                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP, columns * 2 );    
                 for ( unsigned int col=0; col<columns; col++ )
                 {