X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturing.h;h=cba77e3fb3e49a57e4ca98f7bb698f7ddf7f8489;hb=180b20bee11425a776c5ead05afcf6a63945d3b2;hp=51070ffa4d06cdbf3291529eef50cb1ca7a27821;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/texturing.h b/source/texturing.h
index 51070ffa..cba77e3f 100644
--- a/source/texturing.h
+++ b/source/texturing.h
@@ -7,7 +7,6 @@
 namespace Msp {
 namespace GL {
 
-class TexEnv;
 class Texture;
 
 class Texturing: public Bindable<Texturing>
@@ -15,10 +14,10 @@ class Texturing: public Bindable<Texturing>
 private:
 	struct Attachment
 	{
-		const Texture *tex;
-		const TexEnv *env;
+		unsigned unit;
+		const Texture *texture;
 
-		Attachment();
+		Attachment(unsigned, const Texture *);
 	};
 
 	std::vector<Attachment> attachments;
@@ -26,16 +25,14 @@ private:
 public:
 	~Texturing();
 
+	int find_free_unit(const std::string & = std::string()) const;
 	void attach(unsigned, const Texture &);
-	void attach(unsigned, const Texture &, const TexEnv &);
 	void detach(unsigned);
 private:
-	void set_attachment(unsigned, const Texture *, const TexEnv *);
-	void bind_attachment(unsigned) const;
-
-	static void unbind_attachment(unsigned);
-
+	void set_attachment(unsigned, const Texture *);
 public:
+	const Texture *get_attached_texture(unsigned) const;
+
 	void bind() const;
 
 	static void unbind();