X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturing.cpp;h=1c8410c57a6bff3ee9388805964a1cca0876981c;hb=27fe0982fc18d1f5f9efe942e18c42f508268f34;hp=69c2b3ca55cdae1ff6df19a9227b7d4ddbfa24bf;hpb=abc16c5ab0fff0945d724febe9d5d3889fb8a6ce;p=libs%2Fgl.git

diff --git a/source/texturing.cpp b/source/texturing.cpp
index 69c2b3ca..1c8410c5 100644
--- a/source/texturing.cpp
+++ b/source/texturing.cpp
@@ -1,15 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "texenv.h"
 #include "texture.h"
 #include "texturing.h"
 #include "texunit.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -37,7 +32,7 @@ void Texturing::detach(unsigned attch)
 void Texturing::set_attachment(unsigned attch, const Texture *tex, const TexEnv *env)
 {
 	if(attch>=TexUnit::get_n_units())
-		throw InvalidParameterValue("Invalid texture attachment");
+		throw out_of_range("Texturing::set_attachment");
 
 	if(attachments.size()<=attch)
 		attachments.resize(attch+1);
@@ -52,22 +47,20 @@ void Texturing::set_attachment(unsigned attch, const Texture *tex, const TexEnv
 void Texturing::bind_attachment(unsigned i) const
 {
 	const Attachment &attch = attachments[i];
-	TexUnit::activate(i);
 	if(attch.tex)
-		attch.tex->bind();
+		attch.tex->bind_to(i);
 	else
-		Texture::unbind();
+		Texture::unbind_from(i);
 	if(attch.env)
-		attch.env->bind();
+		attch.env->bind_to(i);
 	else
-		TexEnv::unbind();
+		TexEnv::unbind_from(i);
 }
 
 void Texturing::unbind_attachment(unsigned i)
 {
-	TexUnit::activate(i);
-	Texture::unbind();
-	TexEnv::unbind();
+	Texture::unbind_from(i);
+	TexEnv::unbind_from(i);
 }
 
 void Texturing::bind() const