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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 743eb986..26402695 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>
@@ -36,6 +37,9 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz)
 		throw invalid_operation("TextureCube::storage");
 	if(sz==0)
 		throw invalid_argument("TextureCube::storage");
+
+	if(MSP_sized_internal_formats)
+		fmt = get_sized_pixelformat(fmt);
 	require_pixelformat(fmt);
 
 	ifmt = fmt;
@@ -76,6 +80,17 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	}
 }
 
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+{
+	if(size==0)
+		throw invalid_operation("TextureCube::sub_image");
+
+	allocate(level);
+
+	BindRestore _bind(this);
+	glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+}
+
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
 {
 	unsigned w = img.get_width();
@@ -212,11 +227,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;