X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.h;h=b14ff917666f88cb02fc7fbbcd5c55a8330b0075;hp=63b25c138756c8c6a44bd635e341cab9810332f9;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=cabb833e9b4ca10b9f350f3be6c351dce6a66822

diff --git a/source/texture1d.h b/source/texture1d.h
index 63b25c13..b14ff917 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,21 +8,45 @@ 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);
+		void storage_levels(PixelFormat, unsigned, unsigned);
+	};
+
 private:
-	PixelFormat ifmt;
 	unsigned width;
+	unsigned levels;
 	unsigned allocated;
 
 public:
 	Texture1D();
 
-	void storage(PixelFormat, unsigned);
+	void storage(PixelFormat, unsigned, unsigned = 0);
+
+	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned l = 0)
+	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); }
+
 	void allocate(unsigned);
-	void image(unsigned, PixelFormat, DataType, const void *);
+	void image(unsigned, const void *);
+	DEPRECATED void image(unsigned, PixelComponents, DataType, const void *);
+	void sub_image(unsigned, int, unsigned, const void *);
+	DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *);
+	virtual void image(const Graphics::Image &, unsigned = 0);
+	using Texture::image;
 	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 &, const Resources * = 0) { return 0; }