From 96a0a8c916533eb5625816192ed38488f639326d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:00:20 -0800
Subject: Integrating canvas-2d drawing and WebGL fixes, including adding back
 WebGL materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 assets/shaders/TwistVert.frag.glsl | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 assets/shaders/TwistVert.frag.glsl

(limited to 'assets/shaders/TwistVert.frag.glsl')

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;
+}
-- 
cgit v1.2.3


From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:36:19 -0800
Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including
 adding back WebGL materials."

This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
---
 assets/shaders/TwistVert.frag.glsl | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 assets/shaders/TwistVert.frag.glsl

(limited to 'assets/shaders/TwistVert.frag.glsl')

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 @@
-/* <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;
-}
-- 
cgit v1.2.3


From d5b216d9d6d2b8cb93106e8f8ca351089d05b41d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:52:31 -0800
Subject: Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL
 materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 assets/shaders/TwistVert.frag.glsl | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 assets/shaders/TwistVert.frag.glsl

(limited to 'assets/shaders/TwistVert.frag.glsl')

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;
+}
-- 
cgit v1.2.3