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/Flag.vert.glsl | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 assets/shaders/Flag.vert.glsl

(limited to 'assets/shaders/Flag.vert.glsl')

diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
new file mode 100644
index 00000000..7dc932a7
--- /dev/null
+++ b/assets/shaders/Flag.vert.glsl
@@ -0,0 +1,35 @@
+/* <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
+
+
+// attributes
+attribute vec3 a_pos;
+attribute vec2 texcoord;
+
+// scalar uniforms
+uniform float u_time;
+
+// matrix uniforms
+uniform mat4 u_mvMatrix;
+uniform mat4 u_projMatrix;
+uniform mat4 u_worldMatrix;
+
+void main()
+{
+	float angle = (u_time%360)*2;
+
+	a_pos.z  = sin( a_pos.x + angle);
+	a_pos.z += sin( a_pos.y/2 + angle);
+	a_pos.z *= a_pos.x * 0.09;
+	gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,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/Flag.vert.glsl | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 assets/shaders/Flag.vert.glsl

(limited to 'assets/shaders/Flag.vert.glsl')

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 @@
-/* <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
-
-
-// attributes
-attribute vec3 a_pos;
-attribute vec2 texcoord;
-
-// scalar uniforms
-uniform float u_time;
-
-// matrix uniforms
-uniform mat4 u_mvMatrix;
-uniform mat4 u_projMatrix;
-uniform mat4 u_worldMatrix;
-
-void main()
-{
-	float angle = (u_time%360)*2;
-
-	a_pos.z  = sin( a_pos.x + angle);
-	a_pos.z += sin( a_pos.y/2 + angle);
-	a_pos.z *= a_pos.x * 0.09;
-	gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,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/Flag.vert.glsl | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 assets/shaders/Flag.vert.glsl

(limited to 'assets/shaders/Flag.vert.glsl')

diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
new file mode 100644
index 00000000..7dc932a7
--- /dev/null
+++ b/assets/shaders/Flag.vert.glsl
@@ -0,0 +1,35 @@
+/* <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
+
+
+// attributes
+attribute vec3 a_pos;
+attribute vec2 texcoord;
+
+// scalar uniforms
+uniform float u_time;
+
+// matrix uniforms
+uniform mat4 u_mvMatrix;
+uniform mat4 u_projMatrix;
+uniform mat4 u_worldMatrix;
+
+void main()
+{
+	float angle = (u_time%360)*2;
+
+	a_pos.z  = sin( a_pos.x + angle);
+	a_pos.z += sin( a_pos.y/2 + angle);
+	a_pos.z *= a_pos.x * 0.09;
+	gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
+
+	gl_FragColor = v_color;
+}
-- 
cgit v1.2.3