Enable resource management on Texture2D

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

diff --git a/source/texture.h b/source/texture.h
index 6b8117fe4f7d11b1c385e174cb343da29f48d909..5566dccb8c9a111f55336b59d6aa7b68d08c0370 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -4,6 +4,7 @@
 #include <msp/datafile/objectloader.h>
 #include "gl.h"
 #include "predicate.h"
+#include "resource.h"
 
 namespace Msp {
 namespace GL {
@@ -63,14 +64,20 @@ texture to be usable.
 If texture coordinates fall outside of the principal range of the texture,
 wrapping is applied.  The default for all directions is REPEAT.
 */
-class Texture
+class Texture: public Resource
 {
 protected:
-       class Loader: public DataFile::ObjectLoader<Texture>
+       class Loader: public DataFile::CollectionObjectLoader<Texture>
        {
+       protected:
+               bool srgb;
+
        public:
                Loader(Texture &);
+               Loader(Texture &, Collection &);
        private:
+               void init();
+
                void filter(TextureFilter);
                void generate_mipmap(bool);
                void mag_filter(TextureFilter);
@@ -108,7 +115,7 @@ protected:
        Predicate cmp_func;
        mutable int dirty_params;
 
-       Texture(GLenum);
+       Texture(GLenum, ResourceManager * = 0);
        Texture(const Texture &);
        Texture &operator=(const Texture &);
 public:
@@ -149,11 +156,11 @@ public:
        GLenum get_target() const { return target; }
        unsigned get_id() const { return id; }
 
-       void bind() const;
+       void bind() const { bind_to(0); }
        void bind_to(unsigned) const;
 
-       static const Texture *current();
-       static void unbind();
+       static const Texture *current(unsigned = 0);
+       static void unbind() { unbind_from(0); }
        static void unbind_from(unsigned);
 };