From 1ec09a868168d3410dd0563a29a82bd9b30c8bb2 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 6 Sep 2014 15:04:59 -0400 Subject: shader: Add color uniform to default fragment shader. * data/shaders/default-fragment.glsl: Add color uniform. --- data/shaders/default-fragment.glsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/shaders/default-fragment.glsl b/data/shaders/default-fragment.glsl index e90adbe..21bb756 100644 --- a/data/shaders/default-fragment.glsl +++ b/data/shaders/default-fragment.glsl @@ -1,8 +1,9 @@ #version 130 in vec2 frag_tex; +uniform vec4 color; uniform sampler2D color_texture; void main (void) { - gl_FragColor = texture2D(color_texture, frag_tex); + gl_FragColor = texture2D(color_texture, frag_tex) * color; } -- cgit v1.2.3