X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.h;h=8f0af01fe44560b75300e756d524fbcded3ff8d5;hb=2157e9320c60d561208dfdf6034e9a06781c9f30;hp=5aec5b31127d032c3cf2da87ba5ba646e04d0643;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git

diff --git a/source/texunit.h b/source/texunit.h
index 5aec5b31..8f0af01f 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -6,24 +6,29 @@
 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