Changeset 4346 for OpenSceneGraph/trunk/examples/osgparametric/osgparametric.cpp

Timestamp:

06/21/05 14:12:50 (8 years ago)

Author:

robert

Message:

Tweaked the vertex program.

Files:

• OpenSceneGraph/trunk/examples/osgparametric/osgparametric.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgparametric/osgparametric.cpp

@@ -18 +18 @@
     "uniform vec2  xCoeff; \n"
     "uniform vec2  yCoeff; \n"
+    "//uniform sampler2D baseTexture; \n"
     "\n"
     "void main(void) \n"
@@ -25 +26 @@
     "    gl_Vertex.z = gl_Vertex.x*xCoeff[0] + gl_Vertex.x*gl_Vertex.x* xCoeff[1] + \n"
     "                  gl_Vertex.y*yCoeff[1] + gl_Vertex.y*gl_Vertex.y* yCoeff[1]; \n"
+    "    //gl_Vertex.z = texture2D( vertexTexture, gl_TexCoord[0].xy).r; \n"
     "    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
     "}\n";
@@ -115 +117 @@
     
     
-    stateset->setTextureAttributeAndModes(0,new osg::Texture2D(osgDB::readImageFile("lz.rgb")));
-
+    osg::Texture2D* texture = new osg::Texture2D(osgDB::readImageFile("lz.rgb"));
+    texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::NEAREST);
+    texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::NEAREST);
+    stateset->setTextureAttributeAndModes(0,texture);
+   
     osg::Uniform* baseTextureSampler = new osg::Uniform("baseTexture",0);
     stateset->addUniform(baseTextureSampler);
-    
+
+
     return geode;