FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed GL_ usage in defines

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14697 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-17 19:22:37 +00:00
parent 441dbe6b02
commit 8546e911fc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/osgterrain/osgterrain.cpp
View File

@@ -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