X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.h;h=62f1189aa541426ff86d0cdcb5593604155a2dea;hb=cb836adcf11f690188df9b7bc59f3fe87b67aaa7;hp=f65ec0592a4358b1816a59090b68f224f0c7ad78;hpb=f35535633aab06e80f0666d8551431364654c6dc;p=libs%2Fgl.git

diff --git a/source/texturecube.h b/source/texturecube.h
index f65ec059..62f1189a 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -1,10 +1,10 @@
 #ifndef MSP_GL_TEXTURECUBE_H_
 #define MSP_GL_TEXTURECUBE_H_
 
+#include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/graphics/image.h>
 #include "texture.h"
 #include "vector.h"
-#include <msp/gl/extensions/arb_texture_cube_map.h>
 
 namespace Msp {
 namespace GL {
@@ -42,6 +42,7 @@ public:
 	private:
 		void init();
 
+		void external_image(TextureCubeFace, const std::string &);
 		void image_data(TextureCubeFace, const std::string &);
 		void raw_data(TextureCubeFace, const std::string &);
 		void storage(PixelFormat, unsigned);
@@ -80,9 +81,12 @@ public:
 
 	void image(TextureCubeFace, const Graphics::Image &, bool = false);
 
+	virtual void image(const Graphics::Image &, bool = false);
+
 	unsigned get_size() const { return size; }
 private:
-	unsigned get_level_size(unsigned);
+	unsigned get_n_levels() const;
+	unsigned get_level_size(unsigned) const;
 
 public:
 	/** Translates indices into face constants.  Valid indices are between 0