X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexenv.cpp;h=ff77e8cead0d6afb77fe51fd837b960377be8096;hb=48b1ab4fff00c49cc15d70a354eedb3d7a2f3e87;hp=703a8d0a95d0303140d37a5c1af9588e50735cfe;hpb=020811d96d5c823686e5c2b0a392b95d1a321f05;p=libs%2Fgl.git

diff --git a/source/texenv.cpp b/source/texenv.cpp
index 703a8d0a..ff77e8ce 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"
 
@@ -18,35 +11,39 @@ TexEnv::TexEnv():
 void TexEnv::set_mode(TexEnvMode m)
 {
 	mode = m;
-	if(current()==this)
+	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(current()==this)
+	if(TexUnit::current().get_texenv()==this)
 		glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
 }
 
-void TexEnv::bind() const
+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);
 	}
 }
 
-const TexEnv *TexEnv::current()
+const TexEnv *TexEnv::current(unsigned i)
 {
-	return TexUnit::current().get_texenv();
+	return TexUnit::get_unit(i).get_texenv();
 }
 
-void TexEnv::unbind()
+void TexEnv::unbind_from(unsigned i)
 {
-	if(TexUnit::current().set_texenv(0))
+	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);