Changeset 316

Timestamp:

Sep 7, 2011, 10:16:11 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• extViewer.cpp (modified) (5 diffs)
• extViewer.h (modified) (1 diff)

experimental/distortionNG/extViewer.cpp

@@ -118 +118 @@
         osg::Geode* geode = new osg::Geode();
                 //geode->addDrawable(createParoramicSphericalDisplayDistortionMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 1, 0.45, 0, projectorMatrix));
-                geode->addDrawable(createMesh(160, 190));
+                geode->addDrawable(createMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 160, 190));
 
         // new we need to add the texture to the mesh, we do so by creating a
@@ -160 +160 @@
 }
 
-osg::Geometry* extViewer::createMesh( unsigned int column, unsigned int row )
+osg::Geometry* extViewer::createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows )
 {
         // Create Quad to render on
@@ -166 +166 @@
 
         geom->setUseDisplayList( false );
+
+        osg::Vec3 xAxis(widthVector);
+    float width = widthVector.length();
+    xAxis /= width;
+
+    osg::Vec3 yAxis(heightVector);
+    float height = heightVector.length();
+    yAxis /= height;
+
+        osg::Vec3 dx = xAxis*(width/((float)(columns)));
+    osg::Vec3 dy = yAxis*(height/((float)(rows)));
 
 
@@ -176 +187 @@
         geom->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 
-        for ( unsigned int i=0; i<row; ++i )
+        for ( unsigned int i=0; i<rows; ++i )
         {
-                for ( unsigned int j=0; j<column; ++j )
+                for ( unsigned int j=0; j<columns; ++j )
                 {
-                        vertices->push_back( osg::Vec3((float)i, (float)j, 0.0f) );
-                        texcoords0->push_back( osg::Vec2((float)i/(float)row, (float)j/(float)column) );
+                        vertices->push_back( origin+dy*i+dx*j );
+                        texcoords0->push_back( osg::Vec2((float)j/(float)columns, (float)i/(float)rows) );
 
 //      if (intensityMap)
@@ -212 +223 @@
  //   geometry->addPrimitiveSet(elements);
 
-        for ( unsigned int i=0; i<row-1; ++i )
+        for ( unsigned int i=0; i<rows-1; ++i )
         {
-                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, column*2);
-                for ( unsigned int j=0; j<column; ++j )
+                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);
+                for ( unsigned int j=0; j<columns; ++j )
                 {
-                        (*de)[j*2 + 0] = i*column + j;
-                        (*de)[j*2 + 1] = (i+1)*column + j;
+                        (*de)[j*2 + 0] = i*columns + j;
+                        (*de)[j*2 + 1] = (i+1)*columns + j;
                 }
                 geom->addPrimitiveSet( de.get() );

experimental/distortionNG/extViewer.h

@@ -16 +16 @@
         void setUpViewForManualDistortion(unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
 
-                static osg::Geometry* createMesh(unsigned int column, unsigned int row);
+                static osg::Geometry* createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows);
 };