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

diff --git a/source/texenv.cpp b/source/texenv.cpp
index e6c06bcb..c8af55f8 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"
 
@@ -12,31 +5,72 @@ namespace Msp {
 namespace GL {
 
 TexEnv::TexEnv():
-	mode(MODULATE)
+	mode(MODULATE),
+	color(0, 0, 0, 0)
 { }
 
+TexEnv::~TexEnv()
+{
+	if(this!=&default_object())
+	{
+		while(TexUnit *unit = TexUnit::find_unit(this))
+			unbind_from(unit->get_index());
+	}
+}
+
+const TexEnv &TexEnv::default_object()
+{
+	static TexEnv obj;
+	return obj;
+}
+
+void TexEnv::update_parameter(int mask) const
+{
+	if(TexUnit::current().get_texenv()!=this)
+	{
+		TexUnit *unit = TexUnit::find_unit(this);
+		if(!unit)
+			return;
+
+		unit->bind();
+	}
+
+	if(mask&MODE)
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
+	if(mask&COLOR)
+		glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
+}
+
 void TexEnv::set_mode(TexEnvMode m)
 {
 	mode = m;
+	update_parameter(MODE);
 }
 
 void TexEnv::set_color(const Color &c)
 {
 	color = c;
+	update_parameter(COLOR);
 }
 
-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))
 	{
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
-		glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r);
+		unit.bind();
+		update_parameter(-1);
 	}
 }
 
-void TexEnv::unbind()
+const TexEnv *TexEnv::current(unsigned i)
+{
+	return TexUnit::get_unit(i).get_texenv();
+}
+
+void TexEnv::unbind_from(unsigned i)
 {
-	TexUnit::current().set_texenv(0);
+	default_object().bind_to(i);
 }
 
 } // namespace GL