From 4bb344719a482820748784e8b17c8d629ae71c3c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 10 Oct 2002 20:04:02 +0000 Subject: [PATCH] Fixes from Macro. --- src/Demos/osgcubemap/osgcubemap.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Demos/osgcubemap/osgcubemap.cpp b/src/Demos/osgcubemap/osgcubemap.cpp index e2b0664ee..4f15a437b 100644 --- a/src/Demos/osgcubemap/osgcubemap.cpp +++ b/src/Demos/osgcubemap/osgcubemap.cpp @@ -85,7 +85,6 @@ void create_specular_highlights(osg::Node *node) // enable texturing, replacing any textures in the subgraphs ss->setTextureAttributeAndModes(0, tcm, osg::StateAttribute::OVERRIDE | osg::StateAttribute::ON); - ss->setTextureMode(0, GL_TEXTURE_CUBE_MAP, osg::StateAttribute::OVERRIDE | osg::StateAttribute::ON); // texture coordinate generation osg::TexGen *tg = osgNew osg::TexGen; @@ -95,8 +94,10 @@ void create_specular_highlights(osg::Node *node) // use TexEnvCombine to add the highlights to the original lighting osg::TexEnvCombine *te = osgNew osg::TexEnvCombine; te->setCombine_RGB(osg::TexEnvCombine::ADD); - te->setOperand0_RGB(osg::TexEnvCombine::TEXTURE0); - te->setOperand1_RGB(osg::TexEnvCombine::PRIMARY_COLOR); + te->setSource0_RGB(osg::TexEnvCombine::TEXTURE); + te->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR); + te->setSource1_RGB(osg::TexEnvCombine::PRIMARY_COLOR); + te->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR); ss->setTextureAttributeAndModes(0, te, osg::StateAttribute::OVERRIDE | osg::StateAttribute::ON); }