From a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 9 Feb 2012 11:45:16 -0800 Subject: Undoing experimental changes from the basic webgl shaders. Signed-off-by: Nivesh Rajbhandari --- assets/shaders/Basic.frag.glsl | 4 +--- assets/shaders/Basic.vert.glsl | 3 --- 2 files changed, 1 insertion(+), 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; uniform vec4 color; -varying vec4 v_color; void main() { - gl_FragColor = v_color; - //gl_FragColor = color; + gl_FragColor = color; } 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; attribute vec3 a_pos; attribute vec2 texcoord; -varying vec4 v_color; - // matrix uniforms uniform mat4 u_mvMatrix; @@ -24,6 +22,5 @@ uniform mat4 u_worldMatrix; void main(void) { - v_color = vec4(texcoord.x, texcoord.y, 0, 1); gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ; } \ No newline at end of file -- cgit v1.2.3