diff options
author | David Thompson <dthompson2@worcester.edu> | 2014-09-06 15:04:59 -0400 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2014-09-06 15:06:40 -0400 |
commit | 1ec09a868168d3410dd0563a29a82bd9b30c8bb2 (patch) | |
tree | 14af59f513e786f0444aaccbe787d1fb4df5144d /data/shaders | |
parent | 44a43fd9dbdcac1ccef9eb7f432261047fe75032 (diff) |
shader: Add color uniform to default fragment shader.
* data/shaders/default-fragment.glsl: Add color uniform.
Diffstat (limited to 'data/shaders')
-rw-r--r-- | data/shaders/default-fragment.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |