Browse Source

Doc++

pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
67f4a2ff65
  1. 2
      src/Magnum/ResourceManager.h
  2. 4
      src/Magnum/Shader.h
  3. 3
      src/Magnum/Shaders/Phong.h

2
src/Magnum/ResourceManager.h

@ -212,7 +212,7 @@ if(!cube) {
@endcode
- Using the resource data.
@code
shader->setTexture(layer);
shader->setTexture(*texture);
cube->draw(*shader);
@endcode
- Destroying resource references and deleting manager instance when nothing

4
src/Magnum/Shader.h

@ -375,8 +375,8 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
*
* The result is cached, repeated queries don't result in repeated
* OpenGL calls.
* @see @ref AbstractTexture::maxLayers(), @ref maxTextureImageUnits(),
* @fn_gl{Get} with @def_gl{MAX_COMBINED_TEXTURE_IMAGE_UNITS}
* @see @ref maxTextureImageUnits(), @fn_gl{Get} with
* @def_gl{MAX_COMBINED_TEXTURE_IMAGE_UNITS}
*/
static Int maxCombinedTextureImageUnits();

3
src/Magnum/Shaders/Phong.h

@ -197,6 +197,9 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram {
/**
* @brief Set normal matrix
* @return Reference to self (for method chaining)
*
* The matrix doesn't need to be normalized, as the renormalization
* must be done in the shader anyway.
*/
Phong& setNormalMatrix(const Matrix3x3& matrix) {
setUniform(normalMatrixUniform, matrix);

Loading…
Cancel
Save