Changeset 321 for experimental/distortionNG

Timestamp:

Sep 8, 2011, 10:29:38 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• extViewer.cpp (modified) (4 diffs)
• main.cpp (modified) (1 diff)

experimental/distortionNG/extViewer.cpp

@@ -5 +5 @@
 #include<osg/TexMat>
 #include<osg/ComputeBoundsVisitor>
+#include<osg/Vec2>
 
 #include<osgDB/ReadFile>
@@ -118 +119 @@
         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(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 3, 3));
+                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), 4, 4));
 
         // new we need to add the texture to the mesh, we do so by creating a
@@ -192 +193 @@
                 {
                         vertices->push_back( origin+dy*row+dx*col );
-                        texcoords0->push_back( osg::Vec2((float)col/(float)(columns-1), (float)row/(float)(rows-1)) );
+                        osg::Vec2 texcoord = osg::Vec2((float)col/(float)(columns-1), (float)row/(float)(rows-1));
+                        texcoords0->push_back( texcoord );
 
 //      if (intensityMap)
@@ -234 +236 @@
         }
 
-
-
-        /*osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
-        texture->setImage( osgDB::readImageFile("Images/osg256.png") );
-        texture->setFilter( osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR_MIPMAP_LINEAR );
-        texture->setFilter( osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR_MIPMAP_LINEAR );
-        geom->getOrCreateStateSet()->setTextureAttributeAndModes( 0, texture.get() );*/
-
-
         return geom.release();
 }

experimental/distortionNG/main.cpp

@@ -42 +42 @@
     extViewer viewer(arguments);
         viewer.setUpViewForManualDistortion();
-
 
     // set up the camera manipulators.