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/TwistVert.frag.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/TwistVert.frag.glsl')
-rw-r--r-- | assets/shaders/TwistVert.frag.glsl | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/assets/shaders/TwistVert.frag.glsl b/assets/shaders/TwistVert.frag.glsl deleted file mode 100644 index f8490615..00000000 --- a/assets/shaders/TwistVert.frag.glsl +++ /dev/null | |||
@@ -1,32 +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 | // texture sampler uniforms | ||
13 | uniform sampler2D u_tex0; | ||
14 | uniform sampler2D u_tex1; | ||
15 | |||
16 | //uniform vec4 color; | ||
17 | //varying vec4 v_color; | ||
18 | varying float v_zNormal; | ||
19 | varying vec2 v_texcoord; | ||
20 | |||
21 | |||
22 | void main() | ||
23 | { | ||
24 | vec3 col; | ||
25 | if (v_zNormal >= 0.0) | ||
26 | col = texture2D(u_tex0, v_texcoord).xyz; | ||
27 | else | ||
28 | col = texture2D(u_tex1, v_texcoord).xyz; | ||
29 | |||
30 | gl_FragColor = vec4(col, 1.0); | ||
31 | //gl_FragColor = v_color; | ||
32 | } | ||