From d5e4de772eee2e53c6292e527303c75c0d0f53a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 12 Aug 2019 13:57:51 +0200 Subject: [PATCH] Shaders: doc++ --- src/Magnum/Shaders/Phong.h | 3 ++- src/Magnum/Shaders/VertexColor.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index 377430bb6..cdeb7da8b 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/src/Magnum/Shaders/Phong.h @@ -49,7 +49,8 @@ the shader. If you want to use textures, you need to provide also the @ref TextureCoordinates attribute. Pass appropriate @ref Flag combination to -the constructor and then at render time don't forget to also call appropriate subset of @ref bindAmbientTexture(), @ref bindDiffuseTexture() and +the constructor and then at render time don't forget to also call appropriate +subset of @ref bindAmbientTexture(), @ref bindDiffuseTexture() and @ref bindSpecularTexture() (or the combined @ref bindTextures()). The texture is multipled by the color, which is by default set to fully opaque white for enabled textures. diff --git a/src/Magnum/Shaders/VertexColor.h b/src/Magnum/Shaders/VertexColor.h index 97d8618ed..1fb6c9367 100644 --- a/src/Magnum/Shaders/VertexColor.h +++ b/src/Magnum/Shaders/VertexColor.h @@ -74,7 +74,7 @@ template class MAGNUM_SHADERS_EXPORT VertexColor: public typedef typename Generic::Position Position; /** - * @brief Three-component vertex color. + * @brief Three-component vertex color * * @ref shaders-generic "Generic attribute", @ref Magnum::Color3. Use * either this or the @ref Color4 attribute. @@ -82,7 +82,7 @@ template class MAGNUM_SHADERS_EXPORT VertexColor: public typedef typename Generic::Color3 Color3; /** - * @brief Four-component vertex color. + * @brief Four-component vertex color * * @ref shaders-generic "Generic attribute", @ref Magnum::Color4. Use * either this or the @ref Color3 attribute.