Browse Source

Doc++

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
4545eb8987
  1. 10
      src/AbstractTexture.h
  2. 4
      src/Mesh.h

10
src/AbstractTexture.h

@ -29,10 +29,12 @@ namespace Magnum {
@brief Base for textures @brief Base for textures
@attention Don't forget to call @ref Texture::setWrapping() "setWrapping()", @attention Don't forget to call @ref Texture::setWrapping() "setWrapping()",
setMinificationFilter() and setMagnificationFilter() after creating the setMinificationFilter() and setMagnificationFilter() after creating the
texture, otherwise the texture will be incomplete. If you specified mipmap texture, otherwise the texture will be incomplete. If you specified
filtering in setMinificationFilter(), be sure to also either explicitly set @ref Wrapping "Wrapping::ClampToBorder" in @ref Texture::setWrapping() "setWrapping()",
all mip levels or call generateMipmap(). be sure to also call setBorderColor(). If you specified mipmap filtering
in setMinificationFilter(), be sure to also either explicitly set all mip
levels or call generateMipmap().
The texture is bound to shader via bind(). Texture uniform on the shader must The texture is bound to shader via bind(). Texture uniform on the shader must
also be set to particular texture layer using also be set to particular texture layer using

4
src/Mesh.h

@ -33,8 +33,8 @@ namespace Magnum {
@section Mesh-configuration Mesh configuration @section Mesh-configuration Mesh configuration
To properly configure mesh, you have to set primitive either in constructor or To properly configure mesh, you have to set primitive either in constructor or
using setPrimitive() and call setVertexCount(). Then create vertex buffers, using setPrimitive() and call setVertexCount(). Then create vertex buffers and
and them with vertex data. You can also use MeshTools::interleave() to fill them with vertex data. You can also use MeshTools::interleave() to
conveniently set vertex count and buffer data. At last assign them to mesh and conveniently set vertex count and buffer data. At last assign them to mesh and
@ref AbstractShaderProgram::Attribute "shader attributes" using @ref AbstractShaderProgram::Attribute "shader attributes" using
addVertexBuffer(), addInterleavedVertexBuffer() or addVertexBufferStride(). addVertexBuffer(), addInterleavedVertexBuffer() or addVertexBufferStride().

Loading…
Cancel
Save