X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.h;h=8f0af01fe44560b75300e756d524fbcded3ff8d5;hp=0bdb2159ff409beb8383f04444caa1df80a9a117;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036

diff --git a/source/texunit.h b/source/texunit.h
index 0bdb2159..8f0af01f 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXUNIT_H_
 #define MSP_GL_TEXUNIT_H_
 
@@ -13,24 +6,29 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class TexEnv;
 class Texture;
 
 class TexUnit
 {
+private:
+	const Texture *texture;
+	const TexEnv *texenv;
+
+	static std::vector<TexUnit> units;
+	static TexUnit *cur_unit;
+
 public:
 	TexUnit();
+
 	bool set_texture(const Texture *);
-	const Texture *get_texture() { return texture; }
-	//TexEnv &get_env() { return env; }
+	const Texture *get_texture() const { return texture; }
+	bool set_texenv(const TexEnv *);
+	const TexEnv *get_texenv() const { return texenv; }
 
+	static unsigned get_n_units();
 	static TexUnit &activate(unsigned);
 	static TexUnit &current();
-private:
-	const Texture *texture;
-	//TexEnv env;
-
-	static std::vector<TexUnit> units;
-	static TexUnit *cur_unit;
 };
 
 } // namespace GL