X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=12fc856b8415d4e9cc18ac95c2a9c548a79cf79f;hb=e01371d38e290b4c526146fd5d1388bba8201233;hp=7b9c3590ef6bc7eb8e936e20816c36549bbdec2c;hpb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 7b9c3590..12fc856b 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -11,6 +11,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Texture3D::Texture3D(GLenum t):
+	Texture(t),
+	ifmt(RGB),
+	width(0),
+	height(0),
+	depth(0),
+	allocated(0)
+{ }
+
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
 	ifmt(RGB),
@@ -28,12 +37,15 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 		throw invalid_operation("Texture3D::storage");
 	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
+
+	if(MSP_sized_internal_formats)
+		fmt = get_sized_pixelformat(fmt);
 	require_pixelformat(fmt);
 
+	ifmt = fmt;
 	width = wd;
 	height = ht;
 	depth = dp;
-	ifmt = fmt;
 }
 
 void Texture3D::allocate(unsigned level)
@@ -41,7 +53,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)
@@ -61,8 +74,7 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	if(gen_mipmap && level==0)
 	{
 		auto_generate_mipmap();
-		for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
@@ -123,11 +135,55 @@ void Texture3D::load_image(const string &fn, int dp)
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+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());
+}
+
+unsigned Texture3D::get_n_levels() const
+{
+	unsigned s = max(width, height);
+	if(target!=GL_TEXTURE_2D_ARRAY)
+		s = max(s, depth);
+	unsigned n = 0;
+	for(; s; s>>=1, ++n) ;
+	return n;
+}
+
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
 {
 	w >>= level;
 	h >>= level;
-	d >>= level;
+	if(target!=GL_TEXTURE_2D_ARRAY)
+		d >>= level;
 
 	if(!w && (h || d))
 		w = 1;
@@ -142,5 +198,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