X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=7f5250ee99e1381195977b1a40e12b77a8220839;hb=00d3ccedefb1a5efb3d2d4625a2b68446703fbab;hp=eb7448c324ea14c7e82e0dd0da32ba8d9e30ed87;hpb=804ad5d99c575b92e9d47421947e963a44f7a905;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index eb7448c3..7f5250ee 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -3,6 +3,7 @@
 #include <msp/strings/format.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -22,6 +23,7 @@ Vector3 TextureCube::directions[6] =
 
 TextureCube::TextureCube():
 	Texture(GL_TEXTURE_CUBE_MAP),
+	ifmt(RGB),
 	size(0),
 	allocated(0)
 {
@@ -58,7 +60,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	if(s==0)
 		throw out_of_range("TextureCube::image");
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
@@ -70,21 +72,27 @@ 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(fmt, 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");
 
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
 	image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
@@ -159,9 +167,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);
@@ -174,16 +198,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);
 }