Change some class names

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

diff --git a/source/texunit.h b/source/texunit.h
index 5aec5b31127d032c3cf2da87ba5ba646e04d0643..0bba15d6a48fc86ccfe945351b04190f95fef73f 100644 (file)
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -6,24 +6,37 @@
 namespace Msp {
 namespace GL {
 
+class TexEnv;
+class TexGen;
 class Texture;
 
+/**
+Keeps track of texture unit related state.  Mostly for internal use.
+*/
 class TexUnit
 {
-public:
-       TexUnit();
-       bool set_texture(const Texture *);
-       const Texture *get_texture() { return texture; }
-       //TexEnv &get_env() { return env; }
-
-       static TexUnit &activate(unsigned);
-       static TexUnit &current();
 private:
+       unsigned index;
+       bool legacy;
        const Texture *texture;
-       //TexEnv env;
 
        static std::vector<TexUnit> units;
        static TexUnit *cur_unit;
+
+       TexUnit();
+
+public:
+       unsigned get_index() const { return index; }
+       bool supports_legacy() const { return legacy; }
+       bool set_texture(const Texture *);
+       const Texture *get_texture() const { return texture; }
+       void bind();
+
+       static unsigned get_n_units();
+       static unsigned get_n_legacy_units();
+       static TexUnit &get_unit(unsigned);
+       static TexUnit &current();
+       static TexUnit *find_unit(const Texture *);
 };
 
 } // namespace GL