Bind ProgramData to a Program upon construction

[libs/gl.git] / source / texunit.h

diff --git a/source/texunit.h b/source/texunit.h
index 0bdb2159ff409beb8383f04444caa1df80a9a117..1a4111e6e52569b53bbb003d452aed90c333a2a9 100644 (file)
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -13,24 +13,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