X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexturecube.h;h=ea1c8296190ade9703121238771c9277baba3d04;hp=1c0d672428a8f098e2e8b33744b6894aab2e783d;hb=7af837734a28a14b3e24a421187d12ecd16572d0;hpb=9d696772b2194b67d8e3e4da11169900eab58c0d

diff --git a/source/texturecube.h b/source/texturecube.h
index 1c0d6724..ea1c8296 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,17 +42,19 @@ 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);
 	};
 
 private:
-	PixelFormat ifmt;
 	unsigned size;
 	unsigned allocated;
 
+	static TextureCubeFace face_order[6];
 	static Vector3 directions[6];
+	static unsigned orientations[12];
 
 public:
 	TextureCube();
@@ -82,15 +82,20 @@ 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
 	and 5, inclusive. */
 	static TextureCubeFace enumerate_faces(unsigned);
 
+	static unsigned get_face_index(TextureCubeFace);
+
 	/** Returns a vector pointing out of the face. */
 	static const Vector3 &get_face_direction(TextureCubeFace);
 
@@ -103,7 +108,8 @@ 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() { }
 };