Browse Source

Shaders: support color alpha in FlatShader.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
40a69636bd
  1. 6
      src/Shaders/FlatShader.frag
  2. 2
      src/Shaders/FlatShader.h

6
src/Shaders/FlatShader.frag

@ -27,9 +27,9 @@
#endif #endif
#ifdef EXPLICIT_UNIFORM_LOCATION #ifdef EXPLICIT_UNIFORM_LOCATION
layout(location = 1) uniform vec3 color; layout(location = 1) uniform vec4 color;
#else #else
uniform lowp vec3 color; uniform lowp vec4 color;
#endif #endif
#ifdef NEW_GLSL #ifdef NEW_GLSL
@ -37,5 +37,5 @@ out lowp vec4 fragmentColor;
#endif #endif
void main() { void main() {
fragmentColor = vec4(color, 1.0); fragmentColor = color;
} }

2
src/Shaders/FlatShader.h

@ -64,7 +64,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT FlatShader: public
* @brief Set color * @brief Set color
* @return Pointer to self (for method chaining) * @return Pointer to self (for method chaining)
*/ */
FlatShader<dimensions>* setColor(const Color3<>& color) { FlatShader<dimensions>* setColor(const Color4<>& color) {
setUniform(colorUniform, color); setUniform(colorUniform, color);
return this; return this;
} }

Loading…
Cancel
Save