From ecd5a96671a8605b59b84bd9341c5b1ab2e05b34 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 8 Jun 2006 12:07:11 +0000 Subject: [PATCH] From Mike Weiblen, reverted shaders changes due to lack of hardware/driver support --- examples/osgshaders/GL2Scene.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/examples/osgshaders/GL2Scene.cpp b/examples/osgshaders/GL2Scene.cpp index e69ddc874..ced2db157 100644 --- a/examples/osgshaders/GL2Scene.cpp +++ b/examples/osgshaders/GL2Scene.cpp @@ -10,8 +10,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -/* file: examples/osgshaders/GL2Scene.cpp - * author: Mike Weiblen 2006-05-14 +/* file: examples/osgshaders/GL2Scene.cpp + * author: Mike Weiblen 2005-05-01 * * Compose a scene of several instances of a model, with a different * OpenGL Shading Language shader applied to each. @@ -358,16 +358,6 @@ GL2Scene::buildScene() ss->addUniform( new osg::Uniform("NoiseTex", TEXUNIT_NOISE) ); ss->addUniform( new osg::Uniform("SineTex", TEXUNIT_SINE) ); - - osg::Uniform* MarbleColor = new osg::Uniform( osg::Uniform::FLOAT_VEC3, "MarbleColor[0]", 2 ); - MarbleColor->setElement( 0, osg::Vec3( 0.7, 0.7, 0.7 ) ); - MarbleColor->setElement( 1, osg::Vec3( 0.2, 0.2, 0.2 ) ); - ss->addUniform( MarbleColor ); - - osg::Uniform* VeinColor = new osg::Uniform( osg::Uniform::FLOAT_VEC3, "VeinColor[0]", 2 ); - VeinColor->setElement( 0, osg::Vec3( 0.0, 0.15, 0.0 ) ); - VeinColor->setElement( 1, osg::Vec3( 0.9, 0.95, 0.9 ) ); - ss->addUniform( VeinColor ); } #ifdef INTERNAL_3DLABS //[