X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexturecube.h;h=0882a5e31004c3cef3e129b65ff24a2671e88fc0;hp=0d23884f1458626b954f2a6badd871d38ff9026f;hb=b38a4cba9d2a9963a0937757eff9e955f18ddf2a;hpb=2157e9320c60d561208dfdf6034e9a06781c9f30

diff --git a/source/texturecube.h b/source/texturecube.h
index 0d23884f..0882a5e3 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GL_TEXTURECUBE_H_
 #define MSP_GL_TEXTURECUBE_H_
 
-#include "datatype.h"
-#include "pixelformat.h"
+#include <msp/gl/extensions/arb_texture_cube_map.h>
+#include <msp/graphics/image.h>
 #include "texture.h"
 #include "vector.h"
 
@@ -33,19 +33,39 @@ Requires OpenGL version 1.3.
 */
 class TextureCube: public Texture
 {
+public:
+	class Loader: public Msp::DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>
+	{
+	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 levels;
 	unsigned allocated;
 
+	static TextureCubeFace face_order[6];
 	static Vector3 directions[6];
+	static unsigned orientations[12];
 
 public:
 	TextureCube();
 
-	/** Defines storage structure for the texture.  Must be called before an
-	image can be uploaded.  Once storage is defined, it can't be changed. */
-	void storage(PixelFormat fmt, unsigned size);
+	/** Defines storage structure for the texture.  If lv is zero, the number
+	of mipmap levels is automatically determined from storage dimensions.
+
+	Must be called before an image can be uploaded.  Once storage is defined,
+	it can't be changed. */
+	void storage(PixelFormat fmt, unsigned size, unsigned lv = 0);
 
 	/** Allocates storage for the cube faces.  The contents are initially
 	undefined.  If storage has already been allocated, does nothing. */
@@ -64,15 +84,22 @@ public:
 		int x, int y, unsigned w, unsigned h,
 		PixelFormat fmt, DataType type, const void *data);
 
+	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);
 
@@ -84,8 +111,14 @@ 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 &);
+
 } // namespace GL
 } // namespace Msp