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>

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 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+// texture sampler uniforms
+uniform sampler2D u_tex0;
+uniform sampler2D u_tex1;
+
+//uniform vec4 color;
+//varying vec4 v_color;
+varying float v_zNormal;
+varying vec2 v_texcoord;
+
+
+void main()
+{
+    vec3 col;
+        if (v_zNormal >= 0.0)
+                col = texture2D(u_tex0, v_texcoord).xyz;
+        else
+                col = texture2D(u_tex1, v_texcoord).xyz;
+
+    gl_FragColor = vec4(col, 1.0);
+    //gl_FragColor = v_color;
+}