aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/Julia.frag.glsl
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:26 -0700
committerJonathan Duran2012-06-19 08:40:26 -0700
commit6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch)
tree253e5f6dd5923218e3155f78fa67ff3e43de0ebc /assets/shaders/Julia.frag.glsl
parentb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'assets/shaders/Julia.frag.glsl')
-rw-r--r--assets/shaders/Julia.frag.glsl3
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
5uniform vec2 u_resolution; 5uniform vec2 u_resolution;
6uniform float u_time; 6uniform float u_time;
7uniform float u_speed;
7 8
8void main(void) 9void 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);