Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes

Conflicts:
	assets/shaders/radialBlur.frag.glsl

1 files changed, 0 insertions, 26 deletions

diff --git a/assets/shaders/Twist.frag.glsl b/assets/shaders/Twist.frag.glsl
deleted file mode 100644
index ab66cdae..00000000
--- a/assets/shaders/Twist.frag.glsl
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform vec2 u_resolution;
-uniform float u_time;
-uniform float u_speed;
-uniform sampler2D u_tex0;
-
-void main(void)
-{
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    vec2 uv;
-   
-    float a = atan(p.y,p.x);
-    float r = sqrt(dot(p,p));
-
-        float time = u_time * u_speed;
-
-    uv.x = r - .25*time;
-    uv.y = cos(a*5.0 + 2.0*sin(time+7.0*r)) ;
-
-    vec3 col =  (.5+.5*uv.y)*texture2D(u_tex0,uv).xyz;
-
-    gl_FragColor = vec4(col,1.0);
-}
\ No newline at end of file