X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.h;h=5e6f254977f877a20565e131412bb333f6248ab4;hp=b4cf0d0ba5aecc266427d93e30b1b8c9bc9d1828;hb=f14516331a9b98b1d9d6c9c4e44787167f87a813;hpb=9d696772b2194b67d8e3e4da11169900eab58c0d

diff --git a/source/texture1d.h b/source/texture1d.h
index b4cf0d0b..5e6f2549 100644
--- 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,8 +8,20 @@ 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;
 	unsigned allocated;
 
@@ -21,13 +31,17 @@ public:
 	void storage(PixelFormat, unsigned);
 	void allocate(unsigned);
 	void image(unsigned, PixelFormat, DataType, const void *);
+	void sub_image(unsigned, int, 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);
+	unsigned get_n_levels() const;
+	unsigned get_level_size(unsigned) const;
 
 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() { }
 };