From 67f4a2ff65b91da7cf6b308ab402aa913fbf09b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 25 Mar 2014 18:02:09 +0100 Subject: [PATCH] Doc++ --- src/Magnum/ResourceManager.h | 2 +- src/Magnum/Shader.h | 4 ++-- src/Magnum/Shaders/Phong.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Magnum/ResourceManager.h b/src/Magnum/ResourceManager.h index 67d6dfcc8..265a875f1 100644 --- a/src/Magnum/ResourceManager.h +++ b/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 diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index d3a077f86..6d2b5ba1b 100644 --- a/src/Magnum/Shader.h +++ b/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(); diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index e203f98cc..c2cd09356 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/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);