X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=743eb986247eb95318c98490179b3fdb95683980;hb=4a6c595b4d954b6cf69c6388a43b2b66f84d8c0a;hp=7f8301187c35e07257037aec9967ad6b502e83a8;hpb=f33a98b1a044c8ac7b12778cbca6c4a124875e4a;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 7f830118..743eb986 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -23,6 +23,7 @@ Vector3 TextureCube::directions[6] =
 
 TextureCube::TextureCube():
 	Texture(GL_TEXTURE_CUBE_MAP),
+	ifmt(RGB),
 	size(0),
 	allocated(0)
 {
@@ -46,8 +47,10 @@ void TextureCube::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	DataType type = get_alloc_type(base_fmt);
 	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+		image(enumerate_faces(i), level, base_fmt, type, 0);
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -66,22 +69,24 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		// TODO Only do this once all faces are created
+		auto_generate_mipmap();
 		for(; s; s>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
 }
 
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(size==0)
 	{
-		if(w==h)
-			storage(storage_pixelformat_from_graphics(img.get_format()), w);
-		else
+		if(w!=h)
 			throw incompatible_data("TextureCube::image");
+
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
 	}
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
@@ -92,6 +97,30 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 	image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
+void TextureCube::image(const Graphics::Image &img, bool srgb)
+{
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+
+	if(h!=w*6)
+		throw incompatible_data("TextureCube::image");
+	h /= 6;
+
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(size==0)
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+	else if(w!=size || h!=size)
+		throw incompatible_data("TextureCube::image");
+
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
+	const char *cdata = reinterpret_cast<const char *>(img.get_data());
+	unsigned face_size = img.get_stride()*size;
+	for(unsigned i=0; i<6; ++i)
+		image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
+}
+
 unsigned TextureCube::get_level_size(unsigned level)
 {
 	return size>>level;
@@ -163,9 +192,25 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 	return fv+s*sv+t*tv;
 }
 
+UInt64 TextureCube::get_data_size() const
+{
+	return id ? size*size*6*get_pixel_size(ifmt) : 0;
+}
+
 
 TextureCube::Loader::Loader(TextureCube &t):
 	DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)
+{
+	init();
+}
+
+TextureCube::Loader::Loader(TextureCube &t, Collection &c):
+	DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t, c)
+{
+	init();
+}
+
+void TextureCube::Loader::init()
 {
 	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
@@ -178,16 +223,18 @@ void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 	IO::Memory mem(data.data(), data.size());
 	img.load_io(mem);
 
-	obj.image(face, img);
+	obj.image(face, img, srgb);
 }
 
 void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 {
-	obj.image(face, 0, obj.ifmt, UNSIGNED_BYTE, data.data());
+	obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
 }
 
 void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
 {
+	if(srgb)
+		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, s);
 }