From 0d7dd09ae8f51995e701731102849d444c10966c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 11 May 2014 18:47:28 +0200 Subject: [PATCH] Shaders: completed documentation review. --- src/Magnum/Shaders/AbstractVector.h | 4 ++-- src/Magnum/Shaders/Flat.h | 10 +++++----- src/Magnum/Shaders/Phong.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Magnum/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h index 4c1fc5399..e50aedb04 100644 --- a/src/Magnum/Shaders/AbstractVector.h +++ b/src/Magnum/Shaders/AbstractVector.h @@ -43,13 +43,13 @@ template class AbstractVector: public AbstractShaderProg /** @brief Vertex position */ typedef typename Generic::Position Position; - /** @brief Texture coordinates */ + /** @brief %Texture coordinates */ typedef typename Generic::TextureCoordinates TextureCoordinates; #ifdef MAGNUM_BUILD_DEPRECATED enum: Int { /** - * Vector texture binding unit + * %Vector texture binding unit * @deprecated Use @ref Magnum::Shaders::AbstractVector::setVectorTexture() "setVectorTexture()" instead. */ VectorTextureLayer = 16 diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h index f4cdde677..8b1c687e3 100644 --- a/src/Magnum/Shaders/Flat.h +++ b/src/Magnum/Shaders/Flat.h @@ -65,7 +65,7 @@ template class MAGNUM_SHADERS_EXPORT Flat: public Abstra typedef typename Generic::Position Position; /** - * @brief Texture coordinates + * @brief %Texture coordinates * * Used only if @ref Flag::Textured is set. */ @@ -84,7 +84,7 @@ template class MAGNUM_SHADERS_EXPORT Flat: public Abstra #ifdef DOXYGEN_GENERATING_OUTPUT /** - * @brief Shader flag + * @brief %Flag * * @see @ref Flags, @ref flags() */ @@ -93,7 +93,7 @@ template class MAGNUM_SHADERS_EXPORT Flat: public Abstra }; /** - * @brief Shader flags + * @brief %Flags * * @see @ref flags() */ @@ -105,11 +105,11 @@ template class MAGNUM_SHADERS_EXPORT Flat: public Abstra /** * @brief Constructor - * @param flags Shader flags + * @param flags %Flags */ explicit Flat(Flags flags = Flags()); - /** @brief Shader flags */ + /** @brief %Flags */ Flags flags() const { return _flags; } /** diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index 902496ca7..44a2799ac 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/src/Magnum/Shaders/Phong.h @@ -55,7 +55,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { typedef Generic3D::Normal Normal; /**< @brief Normal direction */ /** - * @brief Texture coordinates + * @brief %Texture coordinates * * Used only if one of @ref Flag::AmbientTexture, @ref Flag::DiffuseTexture * or @ref Flag::SpecularTexture is set. @@ -91,7 +91,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { #endif /** - * @brief Shader flag + * @brief %Flag * * @see @ref Flags, @ref flags() */ @@ -102,7 +102,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { }; /** - * @brief Shader flags + * @brief %Flags * * @see @ref flags() */ @@ -110,11 +110,11 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { /** * @brief Constructor - * @param flags Shader flags + * @param flags %Flags */ explicit Phong(Flags flags = Flags()); - /** @brief Shader flags */ + /** @brief %Flags */ Flags flags() const { return _flags; } /**