diff options
| author | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
| commit | 483ad57efcd6475776f580c3af5b60e6deeaf781 (patch) | |
| tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /assets/shaders/Julia.frag.glsl | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| parent | c65c532d081afd73e4a325abe4ab97c6726c02db (diff) | |
| download | ninja-483ad57efcd6475776f580c3af5b60e6deeaf781.tar.gz | |
Merge pull request #298 from ericmueller/Textures
Textures
Diffstat (limited to 'assets/shaders/Julia.frag.glsl')
| -rw-r--r-- | assets/shaders/Julia.frag.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl index 68cda703..7e616c40 100644 --- a/assets/shaders/Julia.frag.glsl +++ b/assets/shaders/Julia.frag.glsl | |||
| @@ -4,11 +4,12 @@ precision highp float; | |||
| 4 | 4 | ||
| 5 | uniform vec2 u_resolution; | 5 | uniform vec2 u_resolution; |
| 6 | uniform float u_time; | 6 | uniform float u_time; |
| 7 | uniform float u_speed; | ||
| 7 | 8 | ||
| 8 | void main(void) | 9 | void main(void) |
| 9 | { | 10 | { |
| 10 | vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; | 11 | vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; |
| 11 | vec2 cc = vec2( cos(.25*u_time), sin(.25*u_time*1.423) ); | 12 | vec2 cc = vec2( cos(.25*u_time*u_speed), sin(.25*u_time*u_speed*1.423) ); |
| 12 | 13 | ||
| 13 | float dmin = 1000.0; | 14 | float dmin = 1000.0; |
| 14 | vec2 z = p*vec2(1.33,1.0); | 15 | vec2 z = p*vec2(1.33,1.0); |