X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.h;h=127251d6497735b50267672807e8f4459b608988;hp=15b598174ae3b233b52846e380603f8093e0a3de;hb=HEAD;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302 diff --git a/source/core/texturecube.h b/source/core/texturecube.h index 15b59817..127251d6 100644 --- a/source/core/texturecube.h +++ b/source/core/texturecube.h @@ -1,9 +1,8 @@ #ifndef MSP_GL_TEXTURECUBE_H_ #define MSP_GL_TEXTURECUBE_H_ -#include #include -#include "texture.h" +#include "texturecube_backend.h" #include "vector.h" namespace Msp { @@ -11,28 +10,27 @@ namespace GL { enum TextureCubeFace { - POSITIVE_X = GL_TEXTURE_CUBE_MAP_POSITIVE_X, - NEGATIVE_X = GL_TEXTURE_CUBE_MAP_NEGATIVE_X, - POSITIVE_Y = GL_TEXTURE_CUBE_MAP_POSITIVE_Y, - NEGATIVE_Y = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, - POSITIVE_Z = GL_TEXTURE_CUBE_MAP_POSITIVE_Z, - NEGATIVE_Z = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z + POSITIVE_X = 0, + NEGATIVE_X = 1, + POSITIVE_Y = 2, + NEGATIVE_Y = 3, + POSITIVE_Z = 4, + NEGATIVE_Z = 5 }; /** -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, 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. +Cube map texture, consisting of six square faces. -All faces of a cube map texture must be allocated for it to be usable. - -Requires OpenGL version 1.3. +A cube map texture is addressed by three-dimensional texture coordinates. The +coordinate vector is projected on the unit cube, with the largest coordinate +selecting the face and the remaining two used to sample from the face image. +The images are oriented so that the cross product of the s and t axes will +point into the cube. */ -class TextureCube: public Texture +class TextureCube: public TextureCubeBackend { + friend TextureCubeBackend; + public: class Loader: public Msp::DataFile::DerivedObjectLoader { @@ -50,69 +48,42 @@ public: }; private: - unsigned size; - unsigned levels; - /* Lowest six bits track allocation status of faces on the base level. Bit - seven is set if the entire base level is allocated. */ - unsigned allocated; + unsigned size = 0; - static TextureCubeFace face_order[6]; - static Vector3 directions[6]; - static unsigned orientations[12]; + static const Vector3 directions[6]; + static const unsigned orientations[12]; public: - TextureCube(); - - /** 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); - - DEPRECATED void storage(PixelComponents c, unsigned s, unsigned l = 0) - { storage(make_pixelformat(c, UNSIGNED_BYTE), s, l); } - - /** Allocates storage for the cube faces. The contents are initially - undefined. If storage has already been allocated, does nothing. */ - void allocate(unsigned level); + /** Sets storage format and dimensions and allocates memory for the texture. + If lv is zero, a complete mipmap pyramid is automatically created. Storage + cannot be changed once set. */ + void storage(PixelFormat, unsigned size, unsigned lv = 0); - /** Updates the contents of a face. Storage must be defined beforehand. - The image data must have dimensions and format matching the defined - storage. */ - void image(TextureCubeFace face, unsigned level, const void *data); + virtual void image(unsigned, const void *); - DEPRECATED void image(TextureCubeFace face, unsigned level, - PixelComponents comp, DataType type, const void *data); + /** Replaces contents of a single face. Allocated storage must exist. The + image data is interpreted according to the storage format and must have size + matching the selected mipmap level. */ + void image(TextureCubeFace, unsigned level, const void *); - /** Updates a rectangular region of a face. Storage must be defined - beforehand. The image data must be in a format mathing the defined storage - and the update region must be fully inside the face. */ - void sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned w, unsigned h, const void *data); - - DEPRECATED void sub_image(TextureCubeFace face, unsigned level, - int x, int y, unsigned w, unsigned h, - PixelComponents comp, DataType type, const void *data); + /** Replaces a rectangular region of a face. Allocated storage must exist. + The image data is interpreted according to the storage format and the region + must be fully inside the face. */ + void sub_image(TextureCubeFace, unsigned level, unsigned x, unsigned y, unsigned w, unsigned h, const void *); void image(TextureCubeFace, const Graphics::Image &); - DEPRECATED void image(TextureCubeFace, const Graphics::Image &, bool); - + /** Sets the texture's contents from an image. The image is treated as a + stack of square layers and its height must be six times its width. If + storage has not been allocated yet, it will be set to match the image. + Otherwise the image must be compatible with the existing storage. */ virtual void image(const Graphics::Image &, unsigned = 0); - using Texture::image; unsigned get_size() const { return size; } private: - 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); @@ -122,12 +93,8 @@ public: /** 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. */ + /** Returns a vector pointing to the center of a texel. */ Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned); - - virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; } - virtual std::uint64_t get_data_size() const; - virtual void unload() { } }; void operator>>(const LexicalConverter &, TextureCubeFace &);