diff options
author | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
commit | d764428023d87446fbbb153d8e04a23b900d71d5 (patch) | |
tree | 2581815db5567b52d4c59663ea9e37d6df057ca3 | |
parent | 3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e (diff) | |
parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
download | ninja-d764428023d87446fbbb153d8e04a23b900d71d5.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
83 files changed, 4995 insertions, 763 deletions
diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl new file mode 100644 index 00000000..1dbe45a0 --- /dev/null +++ b/assets/shaders/Deform.frag.glsl | |||
@@ -0,0 +1,29 @@ | |||
1 | #ifdef GL_ES | ||
2 | precision highp float; | ||
3 | #endif | ||
4 | |||
5 | uniform float u_time; | ||
6 | uniform vec2 u_resolution; | ||
7 | //uniform vec4 mouse; | ||
8 | uniform sampler2D u_tex0; | ||
9 | |||
10 | void main(void) | ||
11 | { | ||
12 | vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; | ||
13 | //vec2 m = -1.0 + 2.0 * mouse.xy / u_resolution.xy; | ||
14 | vec2 m = vec2(-.8, .8); | ||
15 | |||
16 | float a1 = atan(p.y-m.y,p.x-m.x); | ||
17 | float r1 = sqrt(dot(p-m,p-m)); | ||
18 | float a2 = atan(p.y+m.y,p.x+m.x); | ||
19 | float r2 = sqrt(dot(p+m,p+m)); | ||
20 | |||
21 | vec2 uv; | ||
22 | uv.x = 0.2*u_time + (r1-r2)*0.25; | ||
23 | uv.y = sin(2.0*(a1-a2)); | ||
24 | |||
25 | float w = r1*r2*0.8; | ||
26 | vec3 col = texture2D(u_tex0,uv).xyz; | ||
27 | |||
28 | gl_FragColor = vec4(col/(.1+w),1.0); | ||
29 | } \ No newline at end of file | ||
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl new file mode 100644 index 00000000..7dc932a7 --- /dev/null +++ b/assets/shaders/Flag.vert.glsl | |||
@@ -0,0 +1,35 @@ | |||
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 a_pos; | ||
15 | attribute vec2 texcoord; | ||
16 | |||
17 | // scalar uniforms | ||
18 | uniform float u_time; | ||
19 | |||
20 | // matrix uniforms | ||
21 | uniform mat4 u_mvMatrix; | ||
22 | uniform mat4 u_projMatrix; | ||
23 | uniform mat4 u_worldMatrix; | ||
24 | |||
25 | void main() | ||
26 | { | ||
27 | float angle = (u_time%360)*2; | ||
28 | |||
29 | a_pos.z = sin( a_pos.x + angle); | ||
30 | a_pos.z += sin( a_pos.y/2 + angle); | ||
31 | a_pos.z *= a_pos.x * 0.09; | ||
32 | gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ; | ||
33 | |||
34 | gl_FragColor = v_color; | ||
35 | } | ||
diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl new file mode 100644 index 00000000..f99b5ab8 --- /dev/null +++ b/assets/shaders/Fly.frag.glsl | |||
@@ -0,0 +1,23 @@ | |||
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 an = u_time*.25; | ||
15 | |||
16 | float x = p.x*cos(an)-p.y*sin(an); | ||
17 | float y = p.x*sin(an)+p.y*cos(an); | ||
18 | |||
19 | uv.x = .25*x/abs(y); | ||
20 | uv.y = .20*u_time + .25/abs(y); | ||
21 | |||
22 | gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0); | ||
23 | } | ||