From 765669301368ace007171539bdc692104bae9e4f Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Tue, 2 Oct 2012 08:19:21 +0200 Subject: [PATCH] Minor updates in the documentation of sf::Shader --- include/SFML/Graphics/Shader.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/SFML/Graphics/Shader.hpp b/include/SFML/Graphics/Shader.hpp index 8b8633a42..897d7d63b 100644 --- a/include/SFML/Graphics/Shader.hpp +++ b/include/SFML/Graphics/Shader.hpp @@ -547,7 +547,7 @@ private : /// /// A sf::Shader can be composed of either a vertex shader /// alone, a fragment shader alone, or both combined -/// (see the variants of the Load functions). +/// (see the variants of the load functions). /// /// Shaders are written in GLSL, which is a C-like /// language dedicated to OpenGL shaders. You'll probably @@ -556,17 +556,19 @@ private : /// /// Like any C/C++ program, a shader has its own variables /// that you can set from your C++ application. sf::Shader -/// handles 4 different types of variables: +/// handles 5 different types of variables: /// \li floats /// \li vectors (2, 3 or 4 components) +/// \li colors /// \li textures /// \li transforms (matrices) /// /// The value of the variables can be changed at any time -/// with either the various overloads of the setParameter function: +/// with the various overloads of the setParameter function: /// \code /// shader.setParameter("offset", 2.f); -/// shader.setParameter("color", 0.5f, 0.8f, 0.3f); +/// shader.setParameter("point", 0.5f, 0.8f, 0.3f); +/// shader.setParameter("color", sf::Color(128, 50, 255)); /// shader.setParameter("matrix", transform); // transform is a sf::Transform /// shader.setParameter("overlay", texture); // texture is a sf::Texture /// shader.setParameter("texture", sf::Shader::CurrentTexture);