X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=043e0c0e1008bcc4346cc6852b42ad19d9f99e4a;hb=d2efbd8a32efa2a3ee8542efc846277af19d63e0;hp=a0876aced2d57f987d06f45660de8d8f9f456078;hpb=9dc2c20e8c7ac91d932b12492591b65786e24b0f;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index a0876ace..043e0c0e 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -34,7 +34,8 @@ void Texture1D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -50,11 +51,27 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		auto_generate_mipmap();
 		for(; w; w>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
 }
 
+void Texture1D::image(const Graphics::Image &img, bool srgb)
+{
+	if(img.get_height()!=1)
+		throw incompatible_data("Texture1D::image");
+
+	unsigned w = img.get_width();
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(width==0)
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+	else if(w!=width)
+		throw incompatible_data("Texture1D::image");
+
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
 unsigned Texture1D::get_level_size(unsigned level)
 {
 	return width>>level;
@@ -65,5 +82,36 @@ UInt64 Texture1D::get_data_size() const
 	return id ? width*get_pixel_size(ifmt) : 0;
 }
 
+
+Texture1D::Loader::Loader(Texture1D &t):
+	DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t)
+{
+	init();
+}
+
+Texture1D::Loader::Loader(Texture1D &t, Collection &c):
+	DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t, c)
+{
+	init();
+}
+
+void Texture1D::Loader::init()
+{
+	add("raw_data", &Loader::raw_data);
+	add("storage", &Loader::storage);
+}
+
+void Texture1D::Loader::raw_data(const string &data)
+{
+	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
+{
+	if(srgb)
+		fmt = get_srgb_pixelformat(fmt);
+	obj.storage(fmt, w);
+}
+
 } // namespace GL
 } // namespace Msp