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

diff --git a/source/texturecube.h b/source/texturecube.h
index c8e18a11..e775be1d 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -1,9 +1,12 @@
 #ifndef MSP_GL_TEXTURECUBE_H_
 #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>
 
 namespace Msp {
 namespace GL {
@@ -21,8 +24,10 @@ enum TextureCubeFace
 /**
 Cube map texture, consisting of six square faces.  All of the faces must be of
 the same size.  A cube map texture is addressed by three-dimensional texture
-coordinates.  The face is first selected according to the largest coordinate,
-and the remaining two coordinates are used to sample the face image.
+coordinates, with a principal range of [-1, 1].  The face is first selected
+according to the largest coordinate, and the remaining two coordinates are used
+to sample the face image.  The images are oriented so that the cross product of
+the s and t axes will point into the cube.
 
 All faces of a cube map texture must be allocated for it to be usable.
 
@@ -30,11 +35,24 @@ Requires OpenGL version 1.3.
 */
 class TextureCube: public Texture
 {
+public:
+	class Loader: public Msp::DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>
+	{
+	public:
+		Loader(TextureCube &);
+	private:
+		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 Vector3 directions[6];
+
 public:
 	TextureCube();
 
@@ -59,11 +77,32 @@ public:
 		int x, int y, unsigned w, unsigned h,
 		PixelFormat fmt, DataType type, const void *data);
 
+	void image(TextureCubeFace, const Graphics::Image &);
+
 	unsigned get_size() const { return size; }
 private:
 	unsigned get_level_size(unsigned);
+
+public:
+	/** Translates indices into face constants.  Valid indices are between 0
+	and 5, inclusive. */
+	static TextureCubeFace enumerate_faces(unsigned);
+
+	/** Returns a vector pointing out of the face. */
+	static const Vector3 &get_face_direction(TextureCubeFace);
+
+	/** Returns a vector in the direction of the s axis of the face. */
+	static const Vector3 &get_s_direction(TextureCubeFace);
+
+	/** Returns a vector in the direction of the t axis of the face. */
+	static const Vector3 &get_t_direction(TextureCubeFace);
+
+	/** Returns a vector pointing to the center a texel. */
+	Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 };
 
+void operator>>(const LexicalConverter &, TextureCubeFace &);
+
 } // namespace GL
 } // namespace Msp