X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.h;h=7cf43a7832b4dc6bb3949685f4f90f09a80c1bbb;hp=1a4111e6e52569b53bbb003d452aed90c333a2a9;hb=025016d7628be9c43b20999325dcbaae5cb3c3b8;hpb=7e9e15a12fb398798f2719545cc8553354c1e389

diff --git a/source/texunit.h b/source/texunit.h
index 1a4111e6..7cf43a78 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXUNIT_H_
 #define MSP_GL_TEXUNIT_H_
 
@@ -14,28 +7,38 @@ namespace Msp {
 namespace GL {
 
 class TexEnv;
+class TexGen;
 class Texture;
 
+/**
+Keeps track of texture unit related state.  Mostly for internal use.
+*/
 class TexUnit
 {
 private:
+	unsigned index;
+	bool legacy;
 	const Texture *texture;
-	const TexEnv *texenv;
+	bool tex_legacy;
 
 	static std::vector<TexUnit> units;
 	static TexUnit *cur_unit;
 
-public:
 	TexUnit();
 
-	bool set_texture(const Texture *);
+public:
+	unsigned get_index() const { return index; }
+	bool supports_legacy() const { return legacy; }
+	bool set_texture(const Texture *, bool = true);
 	const Texture *get_texture() const { return texture; }
-	bool set_texenv(const TexEnv *);
-	const TexEnv *get_texenv() const { return texenv; }
+	bool get_texture_legacy() const { return tex_legacy; }
+	void bind();
 
 	static unsigned get_n_units();
-	static TexUnit &activate(unsigned);
+	static unsigned get_n_legacy_units();
+	static TexUnit &get_unit(unsigned);
 	static TexUnit &current();
+	static TexUnit *find_unit(const Texture *);
 };
 
 } // namespace GL