aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/TwistVert.frag.glsl
diff options
context:
space:
mode:
authorAnanya Sen2012-02-23 13:52:32 -0800
committerAnanya Sen2012-02-23 13:52:32 -0800
commitec3d07c2fea4e79c68606234074f43d694982e5b (patch)
treedc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /assets/shaders/TwistVert.frag.glsl
parent7283884c39df537694b21419a3ea9e3ca7793b4b (diff)
parent287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff)
downloadninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'assets/shaders/TwistVert.frag.glsl')
-rw-r--r--assets/shaders/TwistVert.frag.glsl32
1 files changed, 32 insertions, 0 deletions
diff --git a/assets/shaders/TwistVert.frag.glsl b/assets/shaders/TwistVert.frag.glsl
new file mode 100644
index 00000000..f8490615
--- /dev/null
+++ b/assets/shaders/TwistVert.frag.glsl
@@ -0,0 +1,32 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No 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
9precision highp float;
10#endif
11
12// texture sampler uniforms
13uniform sampler2D u_tex0;
14uniform sampler2D u_tex1;
15
16//uniform vec4 color;
17//varying vec4 v_color;
18varying float v_zNormal;
19varying vec2 v_texcoord;
20
21
22void 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}