diff options
| author | John Mayhew | 2012-07-09 17:28:24 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
| commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /assets/shaders/Pulse.frag.glsl | |
| parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
| parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
| download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'assets/shaders/Pulse.frag.glsl')
| -rw-r--r-- | assets/shaders/Pulse.frag.glsl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl index 9aeb05c9..b717d359 100644 --- a/assets/shaders/Pulse.frag.glsl +++ b/assets/shaders/Pulse.frag.glsl | |||
| @@ -22,6 +22,7 @@ void main(void) | |||
| 22 | float cLength = length(cPos); | 22 | float cLength = length(cPos); |
| 23 | 23 | ||
| 24 | vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0; | 24 | vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0; |
| 25 | uv.y = 1.0 - uv.y; | ||
| 25 | vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength; | 26 | vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength; |
| 26 | 27 | ||
| 27 | gl_FragColor = vec4(col,1.0); | 28 | gl_FragColor = vec4(col,1.0); |