Changeset 386

Timestamp:

Jun 15, 2012, 10:29:26 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/DistortionManipulator.cpp

@@ -543 +543 @@
         osg::Vec3Array* vertices = new osg::Vec3Array;
         osg::Vec2Array* texCoords = new osg::Vec2Array;
+        osg::Vec4Array* colors = new osg::Vec4Array;
 
         for(unsigned int i=0;i<_distortionSet->getDistortionMesh()->size();i++)
@@ -551 +552 @@
                                                                                 0.0     );
                 vertices->push_back( tmpVec );
-                OSG_ALWAYS<<"X:"<<tmpVec.x()<<" Y:"<<tmpVec.y()<<" Z:"<<tmpVec.z()<<std::endl;
+                OSG_ALWAYS<<"Transfering mesh vertex : X:"<<tmpVec.x()<<" Y:"<<tmpVec.y()<<" Z:"<<tmpVec.z()<<std::endl;
 
                 // Note texCoords
@@ -557 +558 @@
                                                                                         _distortionSet->getDistortionMesh()->at(i).w()*_screenPixHeight );
                 texCoords->push_back(tmpTexCoords);
+
+                colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
         }
 
         // Apply arrays
-        _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setVertexArray(vertices);
-        _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setTexCoordArray(0, texCoords);    // todo: 0 ist hardcoded und müsste durch getTexUnitScene() ersetzt werden
-        _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->dirtyDisplayList();
-}
+        osg::Geometry* geom = _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry();
+
+        geom->removePrimitiveSet(0);
+        geom->setVertexArray(vertices);
+        geom->setTexCoordArray(0, texCoords);   // todo: 0 ist hardcoded und müsste durch getTexUnitScene() ersetzt werden
+        geom->setColorArray(colors);
+        
+        // Quads grid
+        unsigned int rows = _distortionSet->getDistortionMeshRows();
+        unsigned int columns = _distortionSet->getDistortionMeshColumns();
+        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(osg::PrimitiveSet::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() );
+        }
+        
+        //geom->dirtyDisplayList();
+}