X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=8b014aee0c262fb811444c1c44a1fba0083df21e;hb=d2efbd8a32efa2a3ee8542efc846277af19d63e0;hp=61c745bb95bf4d8ae3df56c1c94c7aec43a686f7;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 61c745bb..8b014aee 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -41,7 +41,8 @@ void Texture3D::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 Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -60,6 +61,7 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		auto_generate_mipmap();
 		for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
@@ -122,6 +124,39 @@ void Texture3D::load_image(const string &fn, int dp)
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
+void Texture3D::image(const Graphics::Image &img, bool srgb)
+{
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+	unsigned d = 1;
+
+	if(depth)
+	{
+		if(h%depth)
+			throw incompatible_data("Texture3D::load_image");
+		h /= depth;
+		d = depth;
+	}
+	else
+	{
+		if(h%w)
+			throw incompatible_data("Texture3D::load_image");
+		d = h/w;
+		h = w;
+	}
+
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(width==0)
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d);
+	else if(w!=width || h!=height || d!=depth)
+		throw incompatible_data("Texture3D::load_image");
+
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
 void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
 {
 	w >>= level;
@@ -141,5 +176,36 @@ UInt64 Texture3D::get_data_size() const
 	return id ? width*height*depth*get_pixel_size(ifmt) : 0;
 }
 
+
+Texture3D::Loader::Loader(Texture3D &t):
+	DataFile::DerivedObjectLoader<Texture3D, Texture::Loader>(t)
+{
+	init();
+}
+
+Texture3D::Loader::Loader(Texture3D &t, Collection &c):
+	DataFile::DerivedObjectLoader<Texture3D, Texture::Loader>(t, c)
+{
+	init();
+}
+
+void Texture3D::Loader::init()
+{
+	add("raw_data", &Loader::raw_data);
+	add("storage", &Loader::storage);
+}
+
+void Texture3D::Loader::raw_data(const string &data)
+{
+	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
+{
+	if(srgb)
+		fmt = get_srgb_pixelformat(fmt);
+	obj.storage(fmt, w, h, d);
+}
+
 } // namespace GL
 } // namespace Msp