From db2bb0ab5d2747f0d07878e3b8a7d2d10c755110 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 7 Jun 2012 17:07:21 -0700 Subject: Material cleanup --- assets/shaders/Deform.frag.glsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'assets/shaders/Deform.frag.glsl') diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl index 1dbe45a0..a2bb4fa0 100644 --- a/assets/shaders/Deform.frag.glsl +++ b/assets/shaders/Deform.frag.glsl @@ -3,6 +3,7 @@ precision highp float; #endif uniform float u_time; +uniform float u_speed; uniform vec2 u_resolution; //uniform vec4 mouse; uniform sampler2D u_tex0; @@ -19,7 +20,7 @@ void main(void) float r2 = sqrt(dot(p+m,p+m)); vec2 uv; - uv.x = 0.2*u_time + (r1-r2)*0.25; + uv.x = 0.2*u_time*u_speed + (r1-r2)*0.25; uv.y = sin(2.0*(a1-a2)); float w = r1*r2*0.8; -- cgit v1.2.3