X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexenv.h;h=c422331aadd8f95285a842d9322fde6241bce16a;hb=67538c60b8baa6816b8ae2d343ae62d881e6c58d;hp=5ed05d6c7e0d24343e6fe9dbeba3675613208ead;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/texenv.h b/source/texenv.h
index 5ed05d6c..c422331a 100644
--- a/source/texenv.h
+++ b/source/texenv.h
@@ -20,19 +20,35 @@ enum TexEnvMode
 class TexEnv
 {
 private:
+	enum ParameterMask
+	{
+		MODE = 1,
+		COLOR = 2
+	};
+
 	TexEnvMode mode;
 	Color color;
 
 public:
 	TexEnv();
+	~TexEnv();
+
+	static const TexEnv &default_object();
+
+private:
+	void update_parameter(int) const;
+
+public:
 	void set_mode(TexEnvMode);
 	void set_color(const Color &);
 	TexEnvMode get_mode() const { return mode; }
 	const Color &get_color() const { return color; }
-	void bind() const;
+	void bind() const { bind_to(0); }
+	void bind_to(unsigned) const;
 
-	static const TexEnv *current();
-	static void unbind();
+	static const TexEnv *current(unsigned = 0);
+	static void unbind() { unbind_from(0); }
+	static void unbind_from(unsigned);
 };
 
 } // namespace GL