Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/texture.h b/source/texture.h
index 55eda001a79ec0b12dc3c1e52628327653733365..21edb81a74ae53ac67d0c18dff005709c048c431 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -8,7 +8,9 @@ Distributed under the LGPL
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <GL/gl.h>
+#include <istream>
+#include <msp/datafile/objectloader.h>
+#include "gl.h"
 #include "types.h"
 
 namespace Msp {
@@ -24,22 +26,31 @@ enum TextureFilter
        LINEAR_MIPMAP_LINEAR   = GL_LINEAR_MIPMAP_LINEAR
 };
 
-enum TextureFormat
-{
-       LUMINANCE8,
-       LUMINANCE8_ALPHA8,
-       RGB8,
-       RGBA8,
-       BGR8,
-       BGRA8
-};
+std::istream &operator>>(std::istream &, TextureFilter &);
+
 
+/**
+Base class for textures.  This class only defines operations common for all
+texture types and is not instantiable.  For specifying images for textures, see
+one of the dimensioned texture classes.
+*/
 class Texture
 {
+protected:
+       class Loader: public DataFile::ObjectLoader<Texture>
+       {
+       public:
+               Loader(Texture &);
+               void min_filter(TextureFilter);
+               void mag_filter(TextureFilter);
+               void generate_mipmap(bool);
+       };
+
 public:
        ~Texture();
 
        void bind() const;
+       void bind_to(unsigned) const;
        void parameter(GLenum, int);
        void parameter(GLenum, float);
        void set_min_filter(TextureFilter f) { parameter(GL_TEXTURE_MIN_FILTER, f); }
@@ -48,6 +59,7 @@ public:
        uint  get_id() const                 { return id; }
 
        static void unbind();
+       static void unbind_from(unsigned);
 protected:
        uint   id;
        GLenum target;