Added blend color to osg::TexEnv

2002-07-12 10:30:27 +00:00
parent 0d84d3ed15
commit 3edb8a3d18
3 changed files with 45 additions and 13 deletions
--- a/src/osg/TexEnv.cpp
+++ b/src/osg/TexEnv.cpp
@@ -5,6 +5,7 @@ using namespace osg;
 TexEnv::TexEnv()
 {
    _mode = MODULATE;
+    _color.set(0.0f,0.0f,0.0f,0.0f);
 }


@@ -12,17 +13,11 @@ TexEnv::~TexEnv()
 {
 }

-void TexEnv::setMode( const Mode mode )
-{
-    _mode = (mode == DECAL ||
-        mode == MODULATE ||
-        mode == BLEND ||
-        mode == REPLACE ) ?
-        mode : MODULATE;
-}
-
-
 void TexEnv::apply(State&) const
 {
    glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, _mode);
+    if (_mode==TexEnv::BLEND)
+    {
+        glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, _color.ptr());
+    }
 }