X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=b071e8545df50ce665b1476b0683058a00af0590;hp=d5453c182e128b13e201cb87d7b738e38caefd00;hb=e37851b98dde5082ee92570354746f2f92e21940;hpb=49758ab622d2e8ed4b3a60d7b9afc4abd741300c

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index d5453c18..b071e854 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -71,17 +71,20 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	}
 }
 
-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");
+
+		PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
+		if(srgb)
+			f = get_srgb_pixelformat(f);
+		storage(f, w);
 	}
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
@@ -166,6 +169,17 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 
 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,7 +192,7 @@ 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)
@@ -188,6 +202,8 @@ void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 
 void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
 {
+	if(srgb)
+		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, s);
 }