X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.h;h=506356c77676d98cea1a01d52d8a8f373a71f024;hp=20b1d35cbf88b8ead6421902493e18d3d97aea19;hb=9319f1c8ed99866966f20fbab952da673af2257e;hpb=f35535633aab06e80f0666d8551431364654c6dc

diff --git a/source/texture1d.h b/source/texture1d.h
index 20b1d35c..506356c7 100644
--- a/source/texture1d.h
+++ b/source/texture1d.h
@@ -8,21 +8,37 @@ 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 levels;
 	unsigned allocated;
 
 public:
 	Texture1D();
 
-	void storage(PixelFormat, unsigned);
+	void storage(PixelFormat, unsigned, unsigned = 0);
 	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 &, const Resources * = 0) { return 0; }