aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/Julia.frag.glsl
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:00:34 -0700
committerArmen Kesablyan2012-06-20 15:00:34 -0700
commit38f571d1fdf02d36c3816637af7b2ca2493809da (patch)
tree69b97839be8b2b6fb65e9150d4dc02856041fb1d /assets/shaders/Julia.frag.glsl
parentf7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff)
parent120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff)
downloadninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz
Merge branch 'refs/heads/master' into binding
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);