ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

GL: my engrish is bettar now.

pull/362/head
Vladimír Vondruš 7 years ago
parent
e8cd9a2b93
commit
09f5a15d36
5 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/Magnum/GL/CubeMapTexture.h
  2. 16
      src/Magnum/GL/CubeMapTextureArray.h
  3. 16
      src/Magnum/GL/RectangleTexture.h
  4. 16
      src/Magnum/GL/Texture.h
  5. 16
      src/Magnum/GL/TextureArray.h

24
src/Magnum/GL/CubeMapTexture.h
Unescape View File

@ -539,7 +539,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
#ifndef MAGNUM_TARGET_GLES
/**
* @brief Read given mip level of texture to image
* @brief Read given texture mip level to an image
*
* Image parameters like format and type of pixel data are taken from
* given image, image size is taken from the texture using
@ -566,7 +566,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
Image3D image(Int level, Image3D&& image);
/**
* @brief Read given mip level of texture to buffer image
* @brief Read given texture mip level to a buffer image
*
* See @ref image(Int, Image3D&) for more information. The storage is
* not reallocated if it is large enough to contain the new data, which
@ -587,7 +587,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
BufferImage3D image(Int level, BufferImage3D&& image, BufferUsage usage);
/**
* @brief Read given mip level of compressed texture to image
* @brief Read given mip level of a compressed texture to an image
*
* Compression format and data size are taken from the texture, image
* size is taken using @ref imageSize(). The storage is not reallocated
@ -615,7 +615,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
CompressedImage3D compressedImage(Int level, CompressedImage3D&& image);
/**
* @brief Read given mip level of compressed texture to buffer image
* @brief Read given compressed texture mip level to a buffer image
*
* See @ref compressedImage(Int, CompressedImage3D&) for more
* information. The storage is not reallocated if it is large enough to
@ -638,7 +638,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
CompressedBufferImage3D compressedImage(Int level, CompressedBufferImage3D&& image, BufferUsage usage);
/**
* @brief Read given mip level and coordinate of texture to image
* @brief Read given texture mip level and coordinate to an image
*
* Image parameters like format and type of pixel data are taken from
* given image, image size is taken from the texture using
@ -672,7 +672,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
Image2D image(CubeMapCoordinate coordinate, Int level, Image2D&& image);
/**
* @brief Read given mip level and coordinate of texture to buffer image
* @brief Read given texture mip level and coordinate to a buffer image
*
* See @ref image(CubeMapCoordinate, Int, Image2D&) for more
* information. The storage is not reallocated if it is large enough to
@ -692,7 +692,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
BufferImage2D image(CubeMapCoordinate coordinate, Int level, BufferImage2D&& image, BufferUsage usage);
/**
* @brief Read given mip level and coordinate of compressed texture to image
* @brief Read given compressed texture mip level and coordinate to an image
*
* Compression format and data size are taken from the texture, image
* size is taken using @ref imageSize(). The storage is not reallocated
@ -728,7 +728,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
CompressedImage2D compressedImage(CubeMapCoordinate coordinate, Int level, CompressedImage2D&& image);
/**
* @brief Read given mip level and coordinate of compressed texture to buffer image
* @brief Read given compressed texture mip level and coordinate to a buffer image
*
* See @ref compressedImage(CubeMapCoordinate, Int, CompressedImage2D&)
* for more information. The storage is not reallocated if it is large
@ -751,7 +751,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
CompressedBufferImage2D compressedImage(CubeMapCoordinate coordinate, Int level, CompressedBufferImage2D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* @brief Read a range of given texture mip level to an image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* for more information.
@ -773,7 +773,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
Image3D subImage(Int level, const Range3Di& range, Image3D&& image);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* @brief Read a range of given texture mip level to a buffer image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* for more information.
@ -795,7 +795,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
BufferImage3D subImage(Int level, const Range3Di& range, BufferImage3D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* @brief Read a range of given compressed texture mip level to an image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* for more information.
@ -821,7 +821,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
CompressedImage3D compressedSubImage(Int level, const Range3Di& range, CompressedImage3D&& image);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* @brief Read a range of given compressed texture mip level to a buffer image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* for more information.

16
src/Magnum/GL/CubeMapTextureArray.h
Unescape View File

@ -466,7 +466,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
#ifndef MAGNUM_TARGET_GLES
/**
* @brief @copybrief Texture::image(Int, Image&)
* @brief Read given texture mip level to an image
*
* See @ref Texture::image(Int, Image&) for more information.
* @requires_gl Texture image queries are not available in OpenGL ES.
@ -486,7 +486,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
Image3D image(Int level, Image3D&& image);
/**
* @brief @copybrief Texture::image(Int, BufferImage&, BufferUsage)
* @brief Read given texture mip level to a buffer image
*
* See @ref Texture::image(Int, BufferImage&, BufferUsage) for more
* information.
@ -507,7 +507,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
BufferImage3D image(Int level, BufferImage3D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::compressedImage(Int, CompressedImage&)
* @brief Read given compressed texture mip level to an image
*
* See @ref Texture::compressedImage(Int, CompressedImage&) for more
* information.
@ -530,7 +530,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
CompressedImage3D compressedImage(Int level, CompressedImage3D&& image);
/**
* @brief @copybrief Texture::compressedImage(Int, CompressedBufferImage&, BufferUsage)
* @brief Read given compressed texture mip level to a buffer image
*
* See @ref Texture::compressedImage(Int, CompressedBufferImage&, BufferUsage)
* for more information.
@ -553,7 +553,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
CompressedBufferImage3D compressedImage(Int level, CompressedBufferImage3D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* @brief Read a range of given texture mip level to an image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* for more information.
@ -575,7 +575,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
Image3D subImage(Int level, const Range3Di& range, Image3D&& image);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* @brief Read a range of given texture mip level to a buffer image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* for more information.
@ -597,7 +597,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
BufferImage3D subImage(Int level, const Range3Di& range, BufferImage3D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* @brief Read a range of given compressed texture mip level to an image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* for more information.
@ -625,7 +625,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
CompressedImage3D compressedSubImage(Int level, const Range3Di& range, CompressedImage3D&& image);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* @brief Read a range of given compressed texture mip level to a buffer image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* for more information.

16
src/Magnum/GL/RectangleTexture.h
Unescape View File

@ -353,7 +353,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
Vector2i imageSize() { return DataHelper<2>::imageSize(*this, 0); }
/**
* @brief Read texture to image
* @brief Read texture to an image
*
* See @ref Texture::image(Int, Image&) for more information.
*/
@ -370,7 +370,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
Image2D image(Image2D&& image);
/**
* @brief Read texture to buffer image
* @brief Read texture to a buffer image
*
* See @ref Texture::image(Int, BufferImage&, BufferUsage) for more
* information.
@ -388,7 +388,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
BufferImage2D image(BufferImage2D&& image, BufferUsage usage);
/**
* @brief Read compressed texture to image
* @brief Read compressed texture to an image
*
* See @ref Texture::compressedImage(Int, CompressedImage&) for more
* information.
@ -408,7 +408,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
CompressedImage2D compressedImage(CompressedImage2D&& image);
/**
* @brief Read compressed texture to buffer image
* @brief Read compressed texture to a buffer image
*
* See @ref Texture::compressedImage(Int, CompressedBufferImage&, BufferUsage)
* for more information.
@ -428,7 +428,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
CompressedBufferImage2D compressedImage(CompressedBufferImage2D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* @brief Read a texture range to an image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* for more information.
@ -447,7 +447,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
Image2D subImage(const Range2Di& range, Image2D&& image);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* @brief Read a texture range to a buffer image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* for more information.
@ -466,7 +466,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
BufferImage2D subImage(const Range2Di& range, BufferImage2D&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* @brief Read a compressed texture range to an image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* for more information.
@ -491,7 +491,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
CompressedImage2D compressedSubImage(const Range2Di& range, CompressedImage2D&& image);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* @brief Read a compressed texture range to a buffer image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* for more information.

16
src/Magnum/GL/Texture.h
Unescape View File

@ -748,7 +748,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
#ifndef MAGNUM_TARGET_GLES
/**
* @brief Read given mip level of texture to image
* @brief Read given texture mip level to an image
* @param level Mip level
* @param image Image where to put the data
*
@ -786,7 +786,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
Image<dimensions> image(Int level, Image<dimensions>&& image);
/**
* @brief Read given mip level of texture to buffer image
* @brief Read given texture mip level to a buffer image
* @param level Mip level
* @param image Buffer image where to put the data
* @param usage Buffer usage
@ -813,7 +813,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
BufferImage<dimensions> image(Int level, BufferImage<dimensions>&& image, BufferUsage usage);
/**
* @brief Read given mip level of compressed texture to image
* @brief Read given compressed texture mip level to an image
* @param level Mip level
* @param image Image where to put the compressed data
*
@ -854,7 +854,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
CompressedImage<dimensions> compressedImage(Int level, CompressedImage<dimensions>&& image);
/**
* @brief Read given mip level of compressed texture to buffer image
* @brief Read given compressed texture mip level to a buffer image
* @param level Mip level
* @param image Buffer image where to put the compressed data
* @param usage Buffer usage
@ -883,7 +883,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
CompressedBufferImage<dimensions> compressedImage(Int level, CompressedBufferImage<dimensions>&& image, BufferUsage usage);
/**
* @brief Read range of given texture mip level to image
* @brief Read a range of given texture mip level to an image
* @param level Mip level
* @param range Range to read
* @param image Image where to put the data
@ -911,7 +911,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
Image<dimensions> subImage(Int level, const RangeTypeFor<dimensions, Int>& range, Image<dimensions>&& image);
/**
* @brief Read range of given texture mip level to buffer image
* @brief Read a range of given texture mip level to a buffer image
* @param level Mip level
* @param range Range to read
* @param image Buffer image where to put the data
@ -938,7 +938,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
BufferImage<dimensions> subImage(Int level, const RangeTypeFor<dimensions, Int>& range, BufferImage<dimensions>&& image, BufferUsage usage);
/**
* @brief Read range of given compressed texture mip level to image
* @brief Read a range of given compressed texture mip level to an image
* @param level Mip level
* @param range Range to read
* @param image Image where to put the compressed data
@ -975,7 +975,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
CompressedImage<dimensions> compressedSubImage(Int level, const RangeTypeFor<dimensions, Int>& range, CompressedImage<dimensions>&& image);
/**
* @brief Read range of given compressed texture mip level to buffer image
* @brief Read a range of given compressed texture mip level to a buffer image
* @param level Mip level
* @param range Range to read
* @param image Buffer image where to put the compressed data

16
src/Magnum/GL/TextureArray.h
Unescape View File

@ -503,7 +503,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
#ifndef MAGNUM_TARGET_GLES
/**
* @brief @copybrief Texture::image(Int, Image&)
* @brief Read given texture mip level to an image
*
* See @ref Texture::image(Int, Image&) for more information.
* @requires_gl Texture image queries are not available in OpenGL ES or
@ -523,7 +523,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
Image<dimensions+1> image(Int level, Image<dimensions+1>&& image);
/**
* @brief @copybrief Texture::image(Int, BufferImage&, BufferUsage)
* @brief Read given texture mip level to a buffer image
*
* See @ref Texture::image(Int, BufferImage&, BufferUsage) for more
* information.
@ -544,7 +544,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
BufferImage<dimensions+1> image(Int level, BufferImage<dimensions+1>&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::compressedImage(Int, CompressedImage&)
* @brief Read given compressed texture mip level to an image
*
* See @ref Texture::compressedImage(Int, CompressedImage&) for more
* information.
@ -567,7 +567,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
CompressedImage<dimensions+1> compressedImage(Int level, CompressedImage<dimensions+1>&& image);
/**
* @brief @copybrief Texture::compressedImage(Int, CompressedBufferImage&, BufferUsage)
* @brief Read given compressed texture mip level to a buffer image
*
* See @ref Texture::compressedImage(Int, CompressedBufferImage&, BufferUsage)
* for more information.
@ -590,7 +590,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
CompressedBufferImage<dimensions+1> compressedImage(Int level, CompressedBufferImage<dimensions+1>&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* @brief Read a range of given texture mip level to an image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, Image&)
* for more information.
@ -612,7 +612,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
Image<dimensions+1> subImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, Image<dimensions+1>&& image);
/**
* @brief @copybrief Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* @brief Read a range of given texture mip level to a buffer image
*
* See @ref Texture::subImage(Int, const RangeTypeFor<dimensions, Int>&, BufferImage&, BufferUsage)
* for more information.
@ -634,7 +634,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
BufferImage<dimensions+1> subImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, BufferImage<dimensions+1>&& image, BufferUsage usage);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* @brief Read a range of given compressed texture mip level to an image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedImage&)
* for more information.
@ -662,7 +662,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
CompressedImage<dimensions+1> compressedSubImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, CompressedImage<dimensions+1>&& image);
/**
* @brief @copybrief Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* @brief Read a range of given compressed texture mip level to a buffer image
*
* See @ref Texture::compressedSubImage(Int, const RangeTypeFor<dimensions, Int>&, CompressedBufferImage&, BufferUsage)
* for more information.

Write Preview
Loading…
Cancel
Save