X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexenv.cpp;h=703a8d0a95d0303140d37a5c1af9588e50735cfe;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=e6c06bcbbbcebbf2af37b25d9fe58ce02609e481;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/texenv.cpp b/source/texenv.cpp
index e6c06bcb..703a8d0a 100644
--- a/source/texenv.cpp
+++ b/source/texenv.cpp
@@ -18,14 +18,18 @@ TexEnv::TexEnv():
 void TexEnv::set_mode(TexEnvMode m)
 {
 	mode = m;
+	if(current()==this)
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
 }
 
 void TexEnv::set_color(const Color &c)
 {
 	color = c;
+	if(current()==this)
+		glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
 }
 
-void TexEnv::bind()
+void TexEnv::bind() const
 {
 	if(TexUnit::current().set_texenv(this))
 	{
@@ -34,9 +38,19 @@ void TexEnv::bind()
 	}
 }
 
+const TexEnv *TexEnv::current()
+{
+	return TexUnit::current().get_texenv();
+}
+
 void TexEnv::unbind()
 {
-	TexUnit::current().set_texenv(0);
+	if(TexUnit::current().set_texenv(0))
+	{
+		Color black(0, 0, 0, 0);
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, MODULATE);
+		glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &black.r);
+	}
 }
 
 } // namespace GL