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 | |
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')
-rw-r--r-- | assets/shaders/Basic.frag.glsl | 4 | ||||
-rw-r--r-- | assets/shaders/Basic.vert.glsl | 3 |
2 files changed, 1 insertions, 6 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 | } |
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index 40b97ad7..0d5b8d63 100644 --- a/assets/shaders/Basic.vert.glsl +++ b/assets/shaders/Basic.vert.glsl | |||
@@ -14,8 +14,6 @@ precision highp float; | |||
14 | attribute vec3 a_pos; | 14 | attribute vec3 a_pos; |
15 | attribute vec2 texcoord; | 15 | attribute vec2 texcoord; |
16 | 16 | ||
17 | varying vec4 v_color; | ||
18 | |||
19 | 17 | ||
20 | // matrix uniforms | 18 | // matrix uniforms |
21 | uniform mat4 u_mvMatrix; | 19 | uniform mat4 u_mvMatrix; |
@@ -24,6 +22,5 @@ uniform mat4 u_worldMatrix; | |||
24 | 22 | ||
25 | void main(void) | 23 | void main(void) |
26 | { | 24 | { |
27 | v_color = vec4(texcoord.x, texcoord.y, 0, 1); | ||
28 | gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ; | 25 | gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ; |
29 | } \ No newline at end of file | 26 | } \ No newline at end of file |