Changeset 10731 for OpenSceneGraph/trunk/examples/osgshape/osgshape.cpp

Timestamp:

11/10/09 13:01:28 (4 years ago)

Author:

robert

Message:

Added enabling of lighting, and disabling of mipmapping to help out testing of GLES2 target

Files:

• OpenSceneGraph/trunk/examples/osgshape/osgshape.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgshape/osgshape.cpp

@@ -21 +21 @@
 #include <osg/Material>
 #include <osg/Texture2D>
+#include <osgUtil/ShaderGen>
 
 #include <osgViewer/Viewer>
 
 #include <osgDB/ReadFile>
+#include <osgDB/WriteFile>
 
 #include <osg/Math>
@@ -35 +37 @@
     osg::Geode* geode = new osg::Geode();
 
+    
     // ---------------------------------------
     // Set up a StateSet to texture the objects
@@ -41 +44 @@
 
     osg::Image* image = osgDB::readImageFile( "Images/lz.rgb" );
-
     if (image)
     {
         osg::Texture2D* texture = new osg::Texture2D;
         texture->setImage(image);
-        stateset->setTextureAttributeAndModes(0,texture,osg::StateAttribute::ON);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        stateset->setTextureAttributeAndModes(0,texture, osg::StateAttribute::ON);
     }
     
+    stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
+    
     geode->setStateSet( stateset );
+
     
     float radius = 0.8f;
@@ -99 +105 @@
     mesh->setIndices(indices);
     geode->addDrawable(new osg::ShapeDrawable(mesh));
-    
+
     return geode;
 }