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

diff --git a/source/texturecube.h b/source/texturecube.h
index e775be1d..f65ec059 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -2,8 +2,6 @@
 #define MSP_GL_TEXTURECUBE_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>
@@ -40,7 +38,10 @@ public:
 	{
 	public:
 		Loader(TextureCube &);
+		Loader(TextureCube &, Collection &);
 	private:
+		void init();
+
 		void image_data(TextureCubeFace, const std::string &);
 		void raw_data(TextureCubeFace, const std::string &);
 		void storage(PixelFormat, unsigned);
@@ -77,7 +78,7 @@ 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);
 
 	unsigned get_size() const { return size; }
 private:
@@ -99,6 +100,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 &);