diff options
54 files changed, 2419 insertions, 2589 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 @@ | |||
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 | uniform vec4 color; | ||
14 | |||
15 | void main() { | ||
16 | gl_FragColor = color; | ||
17 | } | ||
diff --git a/assets/shaders/radialGradient.frag.glsl b/assets/shaders/radialGradient.frag.glsl new file mode 100644 index 00000000..cd751750 --- /dev/null +++ b/assets/shaders/radialGradient.frag.glsl | |||
@@ -0,0 +1,51 @@ | |||
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 | #ifdef GL_ES | ||
8 | precision highp float; | ||
9 | #endif | ||
10 | |||
11 | uniform vec4 u_color1; | ||
12 | uniform vec4 u_color2; | ||
13 | uniform vec4 u_color3; | ||
14 | uniform vec4 u_color4; | ||
15 | uniform float u_colorStop1; | ||
16 | uniform float u_colorStop2; | ||
17 | uniform float u_colorStop3; | ||
18 | uniform float u_colorStop4; | ||
19 | uniform vec2 u_cos_sin_angle; | ||
20 | //uniform int u_colorCount; // currently using all 4 | ||
21 | |||
22 | varying vec2 v_uv; | ||
23 | |||
24 | void main(void) | ||
25 | { | ||
26 | vec2 pt = vec2( v_uv.x - 0.5, v_uv.y - 0.5); | ||
27 | float t = sqrt( dot(pt, pt) ); | ||
28 | |||
29 | vec4 color; | ||
30 | if (t < u_colorStop1) | ||
31 | color = u_color1; | ||
32 | else if (t < u_colorStop2) | ||
33 | { | ||
34 | float tLocal = (t - u_colorStop1)/(u_colorStop2 - u_colorStop1); | ||
35 | color = mix(u_color1,u_color2,tLocal); | ||
36 | } | ||
37 | else if (t < u_colorStop3) | ||
38 | { | ||
39 | float tLocal = (t - u_colorStop2)/(u_colorStop3 - u_colorStop2); | ||
40 | color = mix(u_color2,u_color3,tLocal); | ||
41 | } | ||
42 | else if (t < u_colorStop4) | ||
43 | { | ||
44 | float tLocal = (t - u_colorStop3)/(u_colorStop4 - u_colorStop3); | ||
45 | color = mix(u_color3,u_color4,tLocal); | ||
46 | } | ||
47 | else | ||
48 | color = u_color4; | ||
49 | |||
50 | gl_FragColor = color; | ||
51 | } | ||
diff --git a/assets/shaders/radialGradient.vert.glsl b/assets/shaders/radialGradient.vert.glsl new file mode 100644 index 00000000..c3e1b50a --- /dev/null +++ b/assets/shaders/radialGradient.vert.glsl | |||
@@ -0,0 +1,28 @@ | |||
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 | // matrix uniforms | ||
19 | uniform mat4 u_mvMatrix; | ||
20 | uniform mat4 u_projMatrix; | ||
21 | |||
22 | varying vec2 v_uv; | ||
23 | |||
24 | void main(void) | ||
25 | { | ||
26 | gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ; | ||
27 | v_uv = texcoord; | ||
28 | } \ No newline at end of file | ||
diff --git a/assets/shaders/test_fshader.glsl b/assets/shaders/test_fshader.glsl index 3a0af39f..629d1878 100644 --- a/assets/shaders/test_fshader.glsl +++ b/assets/shaders/test_fshader.glsl | |||
@@ -4,7 +4,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | |||
8 | #ifdef GL_ES | 7 | #ifdef GL_ES |
9 | precision highp float; | 8 | precision highp float; |
10 | #endif | 9 | #endif |
@@ -15,18 +14,18 @@ uniform vec4 u_light0Diff; | |||
15 | uniform vec4 u_light0Amb; | 14 | uniform vec4 u_light0Amb; |
16 | 15 | ||
17 | // diffuse map | 16 | // diffuse map |
18 | uniform sampler2D colMap; | 17 | uniform sampler2D u_colMap; |
19 | 18 | ||
20 | // environment map | 19 | // environment map |
21 | uniform sampler2D envMap; | 20 | uniform sampler2D envMap; |
22 | 21 | ||
23 | // normal map | 22 | // normal map |
24 | uniform sampler2D normalMap; | 23 | uniform sampler2D u_normalMap; |
25 | 24 | ||
26 | // glow map | 25 | // specular map |
27 | uniform sampler2D glowMap; | 26 | uniform sampler2D u_glowMap; |