diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 5f194c53a..6b97f0a66 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -25,9 +25,9 @@ namespace Magnum { /** -@brief Non-templated base for Texture +@brief Non-templated base for one-, two- or three-dimensional textures. -See Texture documentation for more information. +See Texture, CubeMapTexture documentation for more information. */ class MAGNUM_EXPORT AbstractTexture { AbstractTexture(const AbstractTexture& other) = delete; @@ -156,7 +156,14 @@ class MAGNUM_EXPORT AbstractTexture { /** @brief %Texture layer */ inline GLint layer() const { return _layer; } - /** @brief Bind texture for usage / rendering */ + /** + * @brief Bind texture for usage / rendering + * + * Sets current texture as active in its texture layer. Note that + * only one texture can be bound to given layer. + * + * @see layer() + */ inline void bind() { glActiveTexture(GL_TEXTURE0 + _layer); glBindTexture(target, texture); diff --git a/src/CubeMapTexture.h b/src/CubeMapTexture.h index ef853faaa..5b7ad2803 100644 --- a/src/CubeMapTexture.h +++ b/src/CubeMapTexture.h @@ -38,7 +38,7 @@ turned upside down (+Y is top): | +Y | +----+ -When using cube map texture in the shader, use `samplerCube`. Unlike normal +When using cube map texture in the shader, use `samplerCube`. Unlike classic textures, coordinates for cube map textures is signed three-part vector from the center of the cube, which intersects one of the six sides of the cube map.