X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=65b1845eaf9ca5f1bb82f9886ada4ed0eed46472;hb=e01371d38e290b4c526146fd5d1388bba8201233;hp=889d051b905e490dc9006f993a24fc476871d5c5;hpb=49323eea600fb989d4181ccfd437ee12722ae733;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 889d051b..65b1845e 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -75,11 +75,21 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	{
 		// TODO Only do this once all faces are created
 		auto_generate_mipmap();
-		for(; s; s>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
+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();
@@ -125,7 +135,14 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
 		image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
 }
 
-unsigned TextureCube::get_level_size(unsigned level)
+unsigned TextureCube::get_n_levels() const
+{
+	unsigned n = 0;
+	for(unsigned s=size; s; s>>=1, ++n) ;
+	return n;
+}
+
+unsigned TextureCube::get_level_size(unsigned level) const
 {
 	return size>>level;
 }