Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool

14 files changed, 463 insertions, 13 deletions

diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl
new file mode 100644
index 00000000..a2c21afa
--- /dev/null
+++ b/assets/shaders/Basic.frag.glsl
@@ -0,0 +1,17 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+
+uniform vec4 color;
+
+void main() {
+    gl_FragColor = color;
+}
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl
new file mode 100644
index 00000000..68cda703
--- /dev/null
+++ b/assets/shaders/Julia.frag.glsl
@@ -0,0 +1,25 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform vec2 u_resolution;
+uniform float u_time;
+
+void main(void)
+{
+    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
+    vec2 cc = vec2( cos(.25*u_time), sin(.25*u_time*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
new file mode 100644
index 00000000..7d1bdb17
--- /dev/null
+++ b/assets/shaders/Keleidoscope.frag.glsl
@@ -0,0 +1,25 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform vec2 u_resolution;
+uniform float u_time;
+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));
+
+    uv.x =          7.0*a/3.1416;
+    uv.y = -u_time+ sin(7.0*r+u_time) + .7*cos(u_time+7.0*a);
+
+    float w = .5+.5*(sin(u_time+7.0*r)+ .7*cos(u_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
new file mode 100644
index 00000000..6465899d
--- /dev/null
+++ b/assets/shaders/Mandel.frag.glsl
@@ -0,0 +1,55 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform vec2 u_resolution;
+uniform float u_time;
+
+void main(void)
+{
+    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
+    p.x *= u_resolution.x/u_resolution.y;
+
+    float zoo = .62+.38*sin(.1*u_time);
+    float coa = cos( 0.1*(1.0-zoo)*u_time );
+    float sia = sin( 0.1*(1.0-zoo)*u_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),
+                         .5+.5*cos(6.2831*co+0.7),
+                         1.0 );
+}
\ No newline at end of file
diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl
new file mode 100644
index 00000000..b24c9bef
--- /dev/null
+++ b/assets/shaders/Pulse.frag.glsl
@@ -0,0 +1,22 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform float u_time;
+uniform vec2 u_resolution;
+uniform sampler2D u_tex0;
+
+void main(void)
+{
+    vec2 halfres = u_resolution.xy/2.0;
+    vec2 cPos = gl_FragCoord.xy;
+
+    cPos.x -= 0.5*halfres.x*sin(u_time/2.0)+0.3*halfres.x*cos(u_time)+halfres.x;
+    cPos.y -= 0.4*halfres.y*sin(u_time/5.0)+0.3*halfres.y*cos(u_time)+halfres.y;
+    float cLength = length(cPos);
+
+    vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-u_time*10.0)/25.0;
+    vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength;
+
+    gl_FragColor = vec4(col,1.0);
+}
\ No newline at end of file
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl
new file mode 100644
index 00000000..46f04fb3
--- /dev/null
+++ b/assets/shaders/Taper.vert.glsl
@@ -0,0 +1,61 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+
+// attributes
+attribute vec3 vert;
+attribute vec3 normal;
+attribute vec2 texcoord;
+
+// scalar uniforms
+uniform float u_limit1;
+uniform float u_limit2;
+uniform float u_limit3;
+uniform float u_taperAmount;
+
+uniform vec4 color;
+
+
+// matrix uniforms
+uniform mat4 u_mvMatrix;
+uniform mat4 u_projMatrix;
+uniform mat4 u_worldMatrix;
+
+varying vec4 v_color;
+
+
+void main(void)
+{
+        vec3 pos = vert;
+        vec2 uv = texcoord;
+
+        v_color = vec4(0, 1, 0, 1);
+        if (uv.x > u_limit1)
+        {
+                if (uv.x < u_limit2)
+                {
+                        float t = (uv.x - u_limit1)/(u_limit2 - u_limit1);
+                        pos.y = pos.y - t*u_taperAmount;
+                        v_color = vec4( 1, 1, 0, 1 );
+                }
+                else if (uv.x < u_limit3)
+                {
+                        float t = 1.0 - (uv.x - u_limit2)/(u_limit3 - u_limit2);
+                        pos.y = pos.y - t*u_taperAmount;
+                        v_color = vec4( 0, 1, 1, 1 );
+                }
+                else
+                        v_color = vec4(0,0,1,1);
+        }
+
+
+        gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
+}
\ No newline at end of file
diff --git a/assets/shaders/Tunnel.frag.glsl b/assets/shaders/Tunnel.frag.glsl
new file mode 100644
index 00000000..9deb52fb
--- /dev/null
+++ b/assets/shaders/Tunnel.frag.glsl
@@ -0,0 +1,23 @@
+#ifdef GL_ES
+precision highp float;