diff options
author | hwc487 | 2012-04-13 07:08:42 -0700 |
---|---|---|
committer | hwc487 | 2012-04-13 07:08:42 -0700 |
commit | 331b2ad4d602016f9bb3d03be759fd81fed50c10 (patch) | |
tree | 6bd56180f319d400881356626f32919a4d6b1f63 /assets/shaders | |
parent | 1fa8516bcd0fb0277c13a7081b5a51ce041d3496 (diff) | |
download | ninja-331b2ad4d602016f9bb3d03be759fd81fed50c10.tar.gz |
Cloud Material
Diffstat (limited to 'assets/shaders')
-rw-r--r-- | assets/shaders/Cloud.frag.glsl | 4 | ||||
-rw-r--r-- | assets/shaders/Cloud.vert.glsl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index 522e17bb..b07bb627 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl | |||
@@ -12,12 +12,12 @@ precision highp float; | |||
12 | uniform sampler2D u_tex0; | 12 | uniform sampler2D u_tex0; |
13 | uniform float u_surfaceAlpha; | 13 | uniform float u_surfaceAlpha; |
14 | 14 | ||
15 | varying vec4 v_Colors; | ||
16 | varying vec2 v_texCoord0; | 15 | varying vec2 v_texCoord0; |
17 | 16 | ||
18 | 17 | ||
19 | void main() | 18 | void main() |
20 | { | 19 | { |
21 | gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; | 20 | // gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; |
21 | gl_FragColor = vec4(1,0,0,1); | ||
22 | } | 22 | } |
23 | \ No newline at end of file | 23 | \ No newline at end of file |
diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index c673e40c..9a235349 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl | |||
@@ -35,7 +35,7 @@ void main() | |||
35 | { | 35 | { |
36 | // Transform position | 36 | // Transform position |
37 | vec4 pos = vec4(a_pos,1); | 37 | vec4 pos = vec4(a_pos,1); |
38 | pos.z += u_time*zSpeed; | 38 | //pos.z += u_time*zSpeed; |
39 | gl_Position = u_projMatrix * u_mvMatrix * pos; | 39 | gl_Position = u_projMatrix * u_mvMatrix * pos; |
40 | 40 | ||
41 | v_texCoord0 = texcoord; | 41 | v_texCoord0 = texcoord; |