X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.h;h=62f1189aa541426ff86d0cdcb5593604155a2dea;hb=6f8c0c6c088be92804cb413c0234bfb817ef2d8d;hp=fe343c7390630de1ad6fdc9a1f3a2cbc3ebfcdda;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texturecube.h b/source/texturecube.h
index fe343c73..62f1189a 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -1,12 +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 "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 #include "vector.h"
-#include <msp/gl/extensions/arb_texture_cube_map.h>
 
 namespace Msp {
 namespace GL {
@@ -44,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);
@@ -82,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
@@ -103,7 +105,7 @@ public:
 	/** Returns a vector pointing to the center a texel. */
 	Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 
-	virtual AsyncLoader *load(IO::Seekable &) { return 0; }
+	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
 	virtual UInt64 get_data_size() const;
 	virtual void unload() { }
 };