X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=3c6f23bd94f05443fd5e872febca8edf19555875;hb=0221e39a685c4f3122a0fae032a7888b5ce40579;hp=7f5250ee99e1381195977b1a40e12b77a8220839;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 7f5250ee..3c6f23bd 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,3 +1,4 @@
+#include <msp/datafile/collection.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
@@ -47,8 +48,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)
@@ -67,6 +70,8 @@ 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;
 	}
@@ -82,10 +87,7 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 		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);
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
 	}
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
@@ -96,6 +98,30 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 	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;
@@ -187,11 +213,21 @@ TextureCube::Loader::Loader(TextureCube &t, Collection &c):
 
 void TextureCube::Loader::init()
 {
+	add("external_image", &Loader::external_image);
 	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
 }
 
+void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
+{
+	Graphics::Image img;
+	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+	img.load_io(*io);
+
+	obj.image(face, img, srgb);
+}
+
 void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 {
 	Graphics::Image img;