Changeset 314 for experimental

Timestamp:

Sep 4, 2011, 7:20:19 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/extViewer.cpp

@@ -12 +12 @@
 extViewer::extViewer() : Viewer()
 {
-
 }
 
 extViewer::extViewer(osg::ArgumentParser& arguments) : Viewer(arguments)
 {
-
+//      setUpViewForManualDistortion(0);
 }
 
@@ -163 +162 @@
 osg::Geometry* extViewer::createMesh( unsigned int column, unsigned int row )
 {
-        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(column * row);
-        osg::ref_ptr<osg::Vec2Array> texcoords = new osg::Vec2Array(column * row);
+        // Create Quad to render on
+        osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
+
+        geom->setUseDisplayList( false );
+
+
+        // Create vertices and coordinates
+        osg::Vec3Array* vertices = new osg::Vec3Array;
+    osg::Vec2Array* texcoords0 = new osg::Vec2Array;
+    //osg::Vec2Array* texcoords1 = intensityMap==0 ? new osg::Vec2Array : 0;
+    osg::Vec4Array* colors = new osg::Vec4Array;
+
+        geom->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+
         for ( unsigned int i=0; i<row; ++i )
         {
                 for ( unsigned int j=0; j<column; ++j )
                 {
-                        (*vertices)[i*column + j].set( (float)i, (float)j, 0.0f );
-                        (*texcoords)[i*column + j].set( (float)i/(float)row, (float)j/(float)column );
+                        vertices->push_back( osg::Vec3((float)i, (float)j, 0.0f) );
+                        texcoords0->push_back( osg::Vec2((float)i/(float)row, (float)j/(float)column) );
+
+//      if (intensityMap)
+//    {
+//        colors->push_back(intensityMap->getColor(texcoord1));
+//    }
+//    else
+//    {
+        colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
+//        if (texcoords1) texcoords1->push_back( texcoord1 );
+//    }
+
                 }
         }
 
-        osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-        geom->setUseDisplayList( false );
+
+        // Pass the created vertex array to the points geometry object.
         geom->setUseVertexBufferObjects( true );
-        geom->setVertexArray( vertices.get() );
-        geom->setTexCoordArray( 0, texcoords.get() );
+        geom->setVertexArray(vertices);
+
+        geom->setColorArray(colors);
+    geom->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
+
+    geom->setTexCoordArray(0,texcoords0);
+    //if (texcoords1) geometry->setTexCoordArray(1,texcoords1);
+
+
+
+ //   osg::DrawElementsUShort* elements = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES);
+ //   geometry->addPrimitiveSet(elements);
+
         for ( unsigned int i=0; i<row-1; ++i )
         {