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

diff --git a/source/texturecube.h b/source/texturecube.h
index e775be1d..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 {
@@ -40,18 +38,23 @@ public:
 	{
 	public:
 		Loader(TextureCube &);
+		Loader(TextureCube &, Collection &);
 	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();
@@ -77,17 +80,22 @@ public:
 		int x, int y, unsigned w, unsigned h,
 		PixelFormat fmt, DataType type, const void *data);
 
-	void image(TextureCubeFace, const Graphics::Image &);
+	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);
 
@@ -99,6 +107,10 @@ public:
 
 	/** Returns a vector pointing to the center a texel. */
 	Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
+
+	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
+	virtual UInt64 get_data_size() const;
+	virtual void unload() { }
 };
 
 void operator>>(const LexicalConverter &, TextureCubeFace &);