Add a texunit statement which automatically determines the unit number

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

diff --git a/source/texturing.h b/source/texturing.h
index 51070ffa4d06cdbf3291529eef50cb1ca7a27821..cba77e3fb3e49a57e4ca98f7bb698f7ddf7f8489 100644 (file)
--- a/source/texturing.h
+++ b/source/texturing.h
@@ -7,7 +7,6 @@
 namespace Msp {
 namespace GL {
 
-class TexEnv;
 class Texture;
 
 class Texturing: public Bindable<Texturing>
@@ -15,10 +14,10 @@ class Texturing: public Bindable<Texturing>
 private:
        struct Attachment
        {
-               const Texture *tex;
-               const TexEnv *env;
+               unsigned unit;
+               const Texture *texture;
 
-               Attachment();
+               Attachment(unsigned, const Texture *);
        };
 
        std::vector<Attachment> attachments;
@@ -26,16 +25,14 @@ private:
 public:
        ~Texturing();
 
+       int find_free_unit(const std::string & = std::string()) const;
        void attach(unsigned, const Texture &);
-       void attach(unsigned, const Texture &, const TexEnv &);
        void detach(unsigned);
 private:
-       void set_attachment(unsigned, const Texture *, const TexEnv *);
-       void bind_attachment(unsigned) const;
-
-       static void unbind_attachment(unsigned);
-
+       void set_attachment(unsigned, const Texture *);
 public:
+       const Texture *get_attached_texture(unsigned) const;
+
        void bind() const;
 
        static void unbind();