diff options
| author | Nivesh Rajbhandari | 2012-02-09 11:45:16 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 11:45:16 -0800 |
| commit | a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (patch) | |
| tree | 0b8f4151ce878479920a8fa4a8c1ab5367726f6b /assets/shaders/Basic.frag.glsl | |
| parent | 0b9e395418874a69a79e8e2565d5171e292b937e (diff) | |
| download | ninja-a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df.tar.gz | |
Undoing experimental changes from the basic webgl shaders.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'assets/shaders/Basic.frag.glsl')
| -rw-r--r-- | assets/shaders/Basic.frag.glsl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl index c1f9a5c8..a2c21afa 100644 --- a/assets/shaders/Basic.frag.glsl +++ b/assets/shaders/Basic.frag.glsl | |||
| @@ -11,9 +11,7 @@ precision highp float; | |||
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | uniform vec4 color; | 13 | uniform vec4 color; |
| 14 | varying vec4 v_color; | ||
| 15 | 14 | ||
| 16 | void main() { | 15 | void main() { |
| 17 | gl_FragColor = v_color; | 16 | gl_FragColor = color; |
| 18 | //gl_FragColor = color; | ||
| 19 | } | 17 | } |