Browse Source

Shaders: doc++

pull/364/head
Vladimír Vondruš 7 years ago
parent
commit
d5e4de772e
  1. 3
      src/Magnum/Shaders/Phong.h
  2. 4
      src/Magnum/Shaders/VertexColor.h

3
src/Magnum/Shaders/Phong.h

@ -49,7 +49,8 @@ the shader.
If you want to use textures, you need to provide also the If you want to use textures, you need to provide also the
@ref TextureCoordinates attribute. Pass appropriate @ref Flag combination to @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 @ref bindSpecularTexture() (or the combined @ref bindTextures()). The texture
is multipled by the color, which is by default set to fully opaque white for is multipled by the color, which is by default set to fully opaque white for
enabled textures. enabled textures.

4
src/Magnum/Shaders/VertexColor.h

@ -74,7 +74,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT VertexColor: public
typedef typename Generic<dimensions>::Position Position; typedef typename Generic<dimensions>::Position Position;
/** /**
* @brief Three-component vertex color. * @brief Three-component vertex color
* *
* @ref shaders-generic "Generic attribute", @ref Magnum::Color3. Use * @ref shaders-generic "Generic attribute", @ref Magnum::Color3. Use
* either this or the @ref Color4 attribute. * either this or the @ref Color4 attribute.
@ -82,7 +82,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT VertexColor: public
typedef typename Generic<dimensions>::Color3 Color3; typedef typename Generic<dimensions>::Color3 Color3;
/** /**
* @brief Four-component vertex color. * @brief Four-component vertex color
* *
* @ref shaders-generic "Generic attribute", @ref Magnum::Color4. Use * @ref shaders-generic "Generic attribute", @ref Magnum::Color4. Use
* either this or the @ref Color3 attribute. * either this or the @ref Color3 attribute.

Loading…
Cancel
Save