Implement loading functionality for texture classes that were missing it

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

diff --git a/source/texture1d.h b/source/texture1d.h
index ea673c3b8b8a606326e78963cdbe30b35fb3cc50..ee930a8721a80205507deed18c73536a7584efe4 100644 (file)
--- a/source/texture1d.h
+++ b/source/texture1d.h
@@ -1,8 +1,6 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
@@ -10,6 +8,19 @@ namespace GL {
 
 class Texture1D: public Texture
 {
+public:
+       class Loader: public DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>
+       {
+       public:
+               Loader(Texture1D &);
+               Loader(Texture1D &, Collection &);
+       private:
+               void init();
+
+               void raw_data(const std::string &);
+               void storage(PixelFormat, unsigned);
+       };
+
 private:
        PixelFormat ifmt;
        unsigned width;
@@ -21,13 +32,14 @@ public:
        void storage(PixelFormat, unsigned);
        void allocate(unsigned);
        void image(unsigned, PixelFormat, DataType, const void *);
+       virtual void image(const Graphics::Image &, bool = false);
        unsigned get_width() const { return width; }
 
 private:
        unsigned get_level_size(unsigned);
 
 public:
-       virtual AsyncLoader *load(IO::Seekable &) { return 0; }
+       virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
        virtual UInt64 get_data_size() const;
        virtual void unload() { }
 };