From 8546e911fce4632a2cd63bbb71968a69a959d383 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 17 Feb 2015 19:22:37 +0000 Subject: [PATCH] Removed GL_ usage in defines git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14697 16af8721-9629-0410-8352-f15c8da7e697 --- examples/osgterrain/osgterrain.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/osgterrain/osgterrain.cpp b/examples/osgterrain/osgterrain.cpp index 209609f58..0be1c21b9 100644 --- a/examples/osgterrain/osgterrain.cpp +++ b/examples/osgterrain/osgterrain.cpp @@ -137,12 +137,12 @@ public: } else if (ea.getKey()=='l') { - toggleDefine("GL_LIGHTING"); + toggleDefine("LIGHTING"); return true; } else if (ea.getKey()=='t') { - toggleDefine("GL_TEXTURE_2D"); + toggleDefine("TEXTURE_2D"); return true; } else if (ea.getKey()=='d') @@ -382,8 +382,9 @@ int main(int argc, char** argv) } } - //terrain->getOrCreateStateSet()->setDefine("NUM_LIGHTS", "20.0"); - //terrain->getOrCreateStateSet()->setDefine("GL_LIGHTING"); // , osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE); + // following are tests of the #pragma(tic) shader composition + //terrain->getOrCreateStateSet()->setDefine("NUM_LIGHTS", "1"); + //terrain->getOrCreateStateSet()->setDefine("LIGHTING"); // , osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE); //terrain->getOrCreateStateSet()->setDefine("COMPUTE_DIAGONALS"); // , osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE); // run the viewers main loop