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

Fixed StateSet::Define names to match OpenSceneGraph-Data/shaders.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14745 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-03-01 15:20:37 +00:00
parent 321750d72d
commit 0a83632f0a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/osgshadercomposition/osgshadercomposition.cpp
View File

@ -82,7 +82,7 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
// shader calling the lighting function per vertex
osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
pat->setPosition(position);
pat->getOrCreateStateSet()->setDefine("GL_LIGHTING");
pat->getOrCreateStateSet()->setDefine("LIGHTING");
pat->addChild(node.get());
@ -99,7 +99,7 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
// the fragment shader to read the texture of unit 0 (provided by the "texture0" uniform above.
osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
pat->setPosition(position);
pat->getOrCreateStateSet()->setDefine("GL_TEXTURE_2D");
pat->getOrCreateStateSet()->setDefine("TEXTURE_2D");
pat->addChild(node.get());
@ -113,8 +113,8 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
// fourth subgraph, enable texturing and lighting
osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
pat->setPosition(position);
pat->getOrCreateStateSet()->setDefine("GL_LIGHTING");
pat->getOrCreateStateSet()->setDefine("GL_TEXTURE_2D");
pat->getOrCreateStateSet()->setDefine("LIGHTING");
pat->getOrCreateStateSet()->setDefine("TEXTURE_2D");
pat->addChild(node.get());
@ -127,8 +127,8 @@ osg::Node* createNewShaderCompositionScene(osg::ArgumentParser& arguments)
// fourth subgraph, enable texturing and lighting
osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
pat->setPosition(position);
pat->getOrCreateStateSet()->setDefine("GL_LIGHTING");
pat->getOrCreateStateSet()->setDefine("GL_TEXTURE_2D");
pat->getOrCreateStateSet()->setDefine("LIGHTING");
pat->getOrCreateStateSet()->setDefine("TEXTURE_2D");
pat->getOrCreateStateSet()->setDefine("VERTEX_FUNC(v)", "vec4(v.x, v.y, v.z * sin(osg_SimulationTime), v.w)");
pat->addChild(node.get());