X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexenv.cpp;h=c1585391bdcddc04ce809f25ce767001a046116f;hb=ae9abd6be3e556d0a202cc5ab05668da715382c9;hp=6e5cca7748f2f6b25fa8194f15af2543a7caaf0e;hpb=50e504e2171295d5922ddf87b358e0024db3ce40;p=libs%2Fgl.git

diff --git a/source/texenv.cpp b/source/texenv.cpp
index 6e5cca77..c1585391 100644
--- a/source/texenv.cpp
+++ b/source/texenv.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "texenv.h"
 #include "texunit.h"
 
@@ -17,15 +10,19 @@ TexEnv::TexEnv():
 
 void TexEnv::set_mode(TexEnvMode m)
 {
-	mode=m;
+	mode = m;
+	if(current()==this)
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
 }
 
 void TexEnv::set_color(const Color &c)
 {
-	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 +31,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