diff options
author | Nivesh Rajbhandari | 2012-02-22 11:36:19 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 11:36:19 -0800 |
commit | f775fb752cac57a0c1f6c42c8c60f5ff329eab32 (patch) | |
tree | 62ef5c4e57ed4fe3601eb90d8881b94053df8f3d /assets/shaders/Flag.vert.glsl | |
parent | eb8223a286e3703a0b7995f5472aaec8dcffd7f8 (diff) | |
download | ninja-f775fb752cac57a0c1f6c42c8c60f5ff329eab32.tar.gz |
Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL materials."
This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
Diffstat (limited to 'assets/shaders/Flag.vert.glsl')
-rw-r--r-- | assets/shaders/Flag.vert.glsl | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl deleted file mode 100644 index 7dc932a7..00000000 --- a/assets/shaders/Flag.vert.glsl +++ /dev/null | |||
@@ -1,35 +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 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 | } | ||