Always bind textures in a specific texture unit

[libs/gl.git] / source / texenv.cpp

diff --git a/source/texenv.cpp b/source/texenv.cpp
index e6c06bcbbbcebbf2af37b25d9fe58ce02609e481..ff77e8cead0d6afb77fe51fd837b960377be8096 100644 (file)
--- 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"
 
@@ -18,25 +11,43 @@ TexEnv::TexEnv():
 void TexEnv::set_mode(TexEnvMode m)
 {
        mode = m;
+       if(TexUnit::current().get_texenv()==this)
+               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
 }
 
 void TexEnv::set_color(const Color &c)
 {
        color = c;
+       if(TexUnit::current().get_texenv()==this)
+               glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
 }
 
-void TexEnv::bind()
+void TexEnv::bind_to(unsigned i) const
 {
-       if(TexUnit::current().set_texenv(this))
+       TexUnit &unit = TexUnit::get_unit(i);
+       if(unit.set_texenv(this))
        {
+               unit.bind();
                glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
                glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
        }
 }
 
-void TexEnv::unbind()
+const TexEnv *TexEnv::current(unsigned i)
 {
-       TexUnit::current().set_texenv(0);
+       return TexUnit::get_unit(i).get_texenv();
+}
+
+void TexEnv::unbind_from(unsigned i)
+{
+       TexUnit &unit = TexUnit::get_unit(i);
+       if(unit.set_texenv(0))
+       {
+               unit.bind();
+               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