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

Conflicts:
	assets/shaders/radialBlur.frag.glsl

12 files changed, 0 insertions, 346 deletions

diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2cd21830..d9d74e6b 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -28,35 +28,23 @@
                 "shaders/TwistVert.vert.glsl",
                 "shaders/Basic.vert.glsl",
                 "shaders/Water.frag.glsl",
-                "shaders/Deform.frag.glsl",
                 "shaders/Water2.frag.glsl",
                 "shaders/Flag.vert.glsl",
                 "shaders/Flag.frag.glsl",
-                "shaders/ZInvert.frag.glsl",
-                "shaders/Fly.frag.glsl",
                 "shaders/linearGradient.frag.glsl",
-                "shaders/Julia.frag.glsl",
                 "shaders/linearGradient.vert.glsl",
-                "shaders/Keleidoscope.frag.glsl",
                 "shaders/plasma.frag.glsl",
-                "shaders/Mandel.frag.glsl",
         "shaders/Paris.frag.glsl",
                 "shaders/plasma.vert.glsl",
                 "shaders/Pulse.frag.glsl",
-                "shaders/radialBlur.frag.glsl",
-                "shaders/ReliefTunnel.frag.glsl",
                 "shaders/radialGradient.frag.glsl",
-                "shaders/SquareTunnel.frag.glsl",
                 "shaders/radialGradient.vert.glsl",
-                "shaders/Star.frag.glsl",
                 "shaders/test_fshader.glsl",
                 "shaders/Taper.frag.glsl",
                 "shaders/test_fshader_full.glsl",
                 "shaders/Taper.vert.glsl",
                 "shaders/test_vshader.glsl",
-                "shaders/Tunnel.frag.glsl",
                 "shaders/ub_fshader.glsl",
-                "shaders/Twist.frag.glsl",
                 "shaders/ub_vshader.glsl",
                 "shaders/TwistVert.frag.glsl"
         ]
diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl
deleted file mode 100644
index a2bb4fa0..00000000
--- a/assets/shaders/Deform.frag.glsl
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform float u_time;
-uniform float u_speed;
-uniform vec2 u_resolution;
-//uniform vec4 mouse;
-uniform sampler2D u_tex0;
-
-void main(void)
-{
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    //vec2 m = -1.0 + 2.0 * mouse.xy / u_resolution.xy;
-        vec2 m = vec2(-.8, .8);
-
-    float a1 = atan(p.y-m.y,p.x-m.x);
-    float r1 = sqrt(dot(p-m,p-m));
-    float a2 = atan(p.y+m.y,p.x+m.x);
-    float r2 = sqrt(dot(p+m,p+m));
-
-    vec2 uv;
-    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;
-    vec3 col = texture2D(u_tex0,uv).xyz;
-
-    gl_FragColor = vec4(col/(.1+w),1.0);
-}
\ No newline at end of file
diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl
deleted file mode 100644
index d36928a1..00000000
--- a/assets/shaders/Fly.frag.glsl
+++ /dev/null
@@ -1,24 +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 an = u_time*u_speed*.25;
-
-    float x = p.x*cos(an)-p.y*sin(an);
-    float y = p.x*sin(an)+p.y*cos(an);
-     
-    uv.x = .25*x/abs(y);
-    uv.y = .20*u_time*u_speed + .25/abs(y);
-
-    gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0);
-}
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl
deleted file mode 100644
index 7e616c40..00000000
--- a/assets/shaders/Julia.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;
-
-void main(void)
-{
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    vec2 cc = vec2( cos(.25*u_time*u_speed), sin(.25*u_time*u_speed*1.423) );
-
-    float dmin = 1000.0;
-    vec2 z  = p*vec2(1.33,1.0);
-    for( int i=0; i<64; i++ )
-    {
-        z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y );
-        float m2 = dot(z,z);
-        if( m2>100.0 ) break;
-        dmin=min(dmin,m2);
-        }
-
-    float color = sqrt(sqrt(dmin))*0.7;
-    gl_FragColor = vec4(color,color,color,1.0);
-}
\ No newline at end of file
diff --git a/assets/shaders/Keleidoscope.frag.glsl b/assets/shaders/Keleidoscope.frag.glsl
deleted file mode 100644
index 7d95a95b..00000000
--- a/assets/shaders/Keleidoscope.frag.glsl
+++ /dev/null
@@ -1,29 +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 time = u_time * u_speed;
-   
-    float a = atan(p.y,p.x);
-    float r = sqrt(dot(p,p));
-
-    uv.x =          7.0*a/3.1416;
-    uv.y = -time + sin(7.0*r+time) + .7*cos(
-        +7.0*a);
-
-    float w = .5+.5*(sin(time+7.0*r)+ .7*cos(time+7.0*a));
-
-    vec3 col =  texture2D(u_tex0,uv*.5).xyz;
-
-    gl_FragColor = vec4(col*w,1.0);
-}
\ No newline at end of file
diff --git a/assets/shaders/Mandel.frag.glsl b/assets/shaders/Mandel.frag.glsl
deleted file mode 100644
index 62be76b9..00000000
--- a/assets/shaders/Mandel.frag.glsl
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform vec2 u_resolution;
-uniform float u_time;
-uniform float u_speed;
-
-void main(void)
-{
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    p.x *= u_resolution.x/u_resolution.y;
-
-        float time = u_time * u_speed;
-
-    float zoo = .62+.38*sin(.1*time);
-    float coa = cos( 0.1*(1.0-zoo)*time );
-    float sia = sin( 0.1*(1.0-zoo)*time );
-    zoo = pow( zoo,8.0);
-    vec2 xy = vec2( p.x*coa-p.y*sia, p.x*sia+p.y*coa);
-    vec2 cc = vec2(-.745,.186) + xy*zoo;
-
-    vec2 z  = vec2(0.0);
-    vec2 z2 = z*z;
-    float m2;
-    float co = 0.0;
-
-
-    // chrome/angelproject/nvidia/glslES don't seem to like to "break" a loop...
-    // so we have to rewrite it in another way
-/*
-    for( int i=0; i<256; i++ )
-    {
-        z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y );
-        m2 = dot(z,z);
-        if( m2>1024.0 ) break;
-        co += 1.0;
-    }
-*/
-
-    for( int i=0; i<256; i++ )
-    {
-        if( m2<1024.0 )
-        {
-            z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y );
-            m2 = dot(z,z);
-            co += 1.0;
-        }
-    }
-
-    co = co + 1.0 - log2(.5*log2(m2));
-
-    co = sqrt(co/256.0);
-    gl_FragColor = vec4( .5+.5*cos(6.2831*co+0.0),
-                         .5+.5*cos(6.2831*co+0.4),