diff options
author | Pushkar Joshi | 2012-02-09 10:55:58 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-09 10:55:58 -0800 |
commit | 5f42bd1f7723483d374cdd3fe51ef8298c86a1a2 (patch) | |
tree | 2404735a87ae1a755a1a301d1560db1c503d0a12 | |
parent | abeb9f1e23679200bb2f4a3ccbcebfb37645975c (diff) | |
parent | fba39dbb3bd64eddf6162fbf57232089e446fb06 (diff) | |
download | ninja-5f42bd1f7723483d374cdd3fe51ef8298c86a1a2.tar.gz |
Merge branch 'pentool' into brushtool
-rw-r--r-- | assets/shaders/Julia.frag.glsl | 25 | ||||
-rw-r--r-- | assets/shaders/Keleidoscope.frag.glsl | 25 | ||||
-rw-r--r-- | assets/shaders/Mandel.frag.glsl | 55 | ||||
-rw-r--r-- | assets/shaders/Pulse.frag.glsl | 22 | ||||
-rw-r--r-- | assets/shaders/Taper.vert.glsl | 61 | ||||
-rw-r--r-- | assets/shaders/Tunnel.frag.glsl | 23 | ||||
-rw-r--r-- | assets/shaders/Twist.frag.glsl | 23 | ||||
-rw-r--r-- | assets/shaders/plasma.frag.glsl | 32 | ||||
-rw-r--r-- | assets/shaders/plasma.vert.glsl | 42 | ||||
-rw-r--r-- | assets/shaders/radialBlur.frag.glsl | 47 |
10 files changed, 0 insertions, 355 deletions
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl deleted file mode 100644 index 68cda703..00000000 --- a/assets/shaders/Julia.frag.glsl +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform vec2 u_resolution; | ||
6 | uniform float u_time; | ||
7 | |||
8 | void main(void) | ||
9 | { | ||
10 | 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 | |||
13 | float dmin = 1000.0; | ||
14 | vec2 z = p*vec2(1.33,1.0); | ||
15 | for( int i=0; i<64; i++ ) | ||
16 | { | ||
17 | z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y ); | ||
18 | float m2 = dot(z,z); | ||
19 | if( m2>100.0 ) break; | ||
20 | dmin=min(dmin,m2); | ||
21 | } | ||
22 | |||
23 | float color = sqrt(sqrt(dmin))*0.7; | ||
24 | gl_FragColor = vec4(color,color,color,1.0); | ||
25 | } \ 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 7d1bdb17..00000000 --- a/assets/shaders/Keleidoscope.frag.glsl +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform vec2 u_resolution; | ||
6 | uniform float u_time; | ||
7 | uniform sampler2D u_tex0; | ||
8 | |||
9 | void main(void) | ||
10 | { | ||
11 | vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; | ||
12 | vec2 uv; | ||
13 | |||
14 | float a = atan(p.y,p.x); | ||
15 | float r = sqrt(dot(p,p)); | ||
16 | |||
17 | uv.x = 7.0*a/3.1416; | ||
18 | uv.y = -u_time+ sin(7.0*r+u_time) + .7*cos(u_time+7.0*a); | ||
19 | |||
20 | float w = .5+.5*(sin(u_time+7.0*r)+ .7*cos(u_time+7.0*a)); | ||
21 | |||
22 | vec3 col = texture2D(u_tex0,uv*.5).xyz; | ||
23 | |||
24 | gl_FragColor = vec4(col*w,1.0); | ||
25 | } \ 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 6465899d..00000000 --- a/assets/shaders/Mandel.frag.glsl +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform vec2 u_resolution; | ||
6 | uniform float u_time; | ||
7 | |||
8 | void main(void) | ||
9 | { | ||
10 | vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; | ||
11 | p.x *= u_resolution.x/u_resolution.y; | ||
12 | |||
13 | float zoo = .62+.38*sin(.1*u_time); | ||
14 | float coa = cos( 0.1*(1.0-zoo)*u_time ); | ||
15 | float sia = sin( 0.1*(1.0-zoo)*u_time ); | ||
16 | zoo = pow( zoo,8.0); | ||
17 | vec2 xy = vec2( p.x*coa-p.y*sia, p.x*sia+p.y*coa); | ||
18 | vec2 cc = vec2(-.745,.186) + xy*zoo; | ||
19 | |||
20 | vec2 z = vec2(0.0); | ||
21 | vec2 z2 = z*z; | ||
22 | float m2; | ||
23 | float co = 0.0; | ||
24 | |||
25 | |||
26 | // chrome/angelproject/nvidia/glslES don't seem to like to "break" a loop... | ||
27 | // so we have to rewrite it in another way | ||
28 | /* | ||
29 | for( int i=0; i<256; i++ ) | ||
30 | { | ||
31 | z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y ); | ||
32 | m2 = dot(z,z); | ||
33 | if( m2>1024.0 ) break; | ||
34 | co += 1.0; | ||
35 | } | ||
36 | */ | ||
37 | |||
38 | for( int i=0; i<256; i++ ) | ||
39 | { | ||
40 | if( m2<1024.0 ) | ||
41 | { | ||
42 | z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y ); | ||
43 | m2 = dot(z,z); | ||
44 | co += 1.0; | ||
45 | } | ||
46 | } | ||
47 | |||
48 | co = co + 1.0 - log2(.5*log2(m2)); | ||
49 | |||
50 | co = sqrt(co/256.0); | ||
51 | gl_FragColor = vec4( .5+.5*cos(6.2831*co+0.0), | ||
52 | .5+.5*cos(6.2831*co+0.4), | ||
53 | .5+.5*cos(6.2831*co+0.7), | ||
54 | 1.0 ); | ||
55 | } \ No newline at end of file | ||
diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl deleted file mode 100644 index b24c9bef..00000000 --- a/assets/shaders/Pulse.frag.glsl +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform float u_time; | ||
6 | uniform vec2 u_resolution; | ||
7 | uniform sampler2D u_tex0; | ||
8 | |||
9 | void main(void) | ||
10 | { | ||
11 | vec2 halfres = u_resolution.xy/2.0; | ||
12 | vec2 cPos = gl_FragCoord.xy; | ||
13 | |||
14 | cPos.x -= 0.5*halfres.x*sin(u_time/2.0)+0.3*halfres.x*cos(u_time)+halfres.x; | ||
15 | cPos.y -= 0.4*halfres.y*sin(u_time/5.0)+0.3*halfres.y*cos(u_time)+halfres.y; | ||
16 | float cLength = length(cPos); | ||
17 | |||
18 | vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-u_time*10.0)/25.0; | ||
19 | vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength; | ||
20 | |||
21 | gl_FragColor = vec4(col,1.0); | ||
22 | } \ No newline at end of file | ||
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl deleted file mode 100644 index 46f04fb3..00000000 --- a/assets/shaders/Taper.vert.glsl +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | |||
8 | #ifdef GL_ES | ||
9 | precision highp float; | ||
10 | #endif | ||
11 | |||
12 | |||
13 | // attributes | ||
14 | attribute vec3 vert; | ||
15 | attribute vec3 normal; | ||
16 | attribute vec2 texcoord; | ||
17 | |||
18 | // scalar uniforms | ||
19 | uniform float u_limit1; | ||
20 | uniform float u_limit2; | ||
21 | uniform float u_limit3; | ||
22 | uniform float u_taperAmount; | ||
23 | |||
24 | uniform vec4 color; | ||
25 | |||
26 | |||
27 | // matrix uniforms | ||
28 | uniform mat4 u_mvMatrix; | ||
29 | uniform mat4 u_projMatrix; | ||
30 | uniform mat4 u_worldMatrix; | ||
31 | |||
32 | varying vec4 v_color; | ||
33 | |||
34 | |||
35 | void main(void) | ||
36 | { | ||
37 | vec3 pos = vert; | ||
38 | vec2 uv = texcoord; | ||
39 | |||
40 | v_color = vec4(0, 1, 0, 1); | ||
41 | if (uv.x > u_limit1) | ||
42 | { | ||
43 | if (uv.x < u_limit2) | ||
44 | { | ||
45 | float t = (uv.x - u_limit1)/(u_limit2 - u_limit1); | ||
46 | pos.y = pos.y - t*u_taperAmount; | ||
47 | v_color = vec4( 1, 1, 0, 1 ); | ||
48 | } | ||
49 | else if (uv.x < u_limit3) | ||
50 | { | ||
51 | float t = 1.0 - (uv.x - u_limit2)/(u_limit3 - u_limit2); | ||
52 | pos.y = pos.y - t*u_taperAmount; | ||
53 | v_color = vec4( 0, 1, 1, 1 ); | ||
54 | } | ||
55 | else | ||
56 | v_color = vec4(0,0,1,1); | ||
57 | } | ||
58 | |||
59 | |||
60 | gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ; | ||
61 | } \ No newline at end of file | ||
diff --git a/assets/shaders/Tunnel.frag.glsl b/assets/shaders/Tunnel.frag.glsl deleted file mode 100644 index 9deb52fb..00000000 --- a/assets/shaders/Tunnel.frag.glsl +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform vec2 u_resolution; | ||
6 | uniform float u_time; | ||
7 | uniform sampler2D u_tex0; | ||
8 | |||
9 | void main(void) | ||
10 | { | ||
11 | vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; | ||
12 | vec2 uv; | ||
13 | |||
14 | float a = atan(p.y,p.x); | ||
15 | float r = sqrt(dot(p,p)); | ||
16 | |||
17 | uv.x = .75*u_time+.1/r; | ||
18 | uv.y = a/3.1416; | ||
19 | |||
20 | vec3 col = texture2D(u_tex0,uv).xyz; | ||
21 | |||
22 | gl_FragColor = vec4(col*r,1.0); | ||
23 | } \ No newline at end of file | ||
diff --git a/assets/shaders/Twist.frag.glsl b/assets/shaders/Twist.frag.glsl deleted file mode 100644 index b7477747..00000000 --- a/assets/shaders/Twist.frag.glsl +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform vec2 u_resolution; | ||
6 | uniform float u_time; | ||
7 | uniform sampler2D u_tex0; | ||