From 8992d9baf542135e910bb59328a592d9e330703a Mon Sep 17 00:00:00 2001
From: hwc487
Date: Sun, 15 Apr 2012 05:16:34 -0700
Subject: Cloud Material

---
 assets/shaders/Basic.vert.glsl    |  3 +++
 assets/shaders/BasicTex.frag.glsl | 19 +++++++++++++++++++
 assets/shaders/Cloud.frag.glsl    |  4 ++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 assets/shaders/BasicTex.frag.glsl

(limited to 'assets/shaders')

diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 0d5b8d63..f96f8322 100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -14,6 +14,8 @@ precision highp float;
 attribute vec3 a_pos;
 attribute vec2 texcoord;
 
+// varying
+varying vec2	v_texCoord0;
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
@@ -22,5 +24,6 @@ uniform mat4 u_worldMatrix;
 
 void main(void)
 {
+	v_texCoord0 = texcoord;
 	gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
 }
\ No newline at end of file
diff --git a/assets/shaders/BasicTex.frag.glsl b/assets/shaders/BasicTex.frag.glsl
new file mode 100644
index 00000000..a716e77d
--- /dev/null
+++ b/assets/shaders/BasicTex.frag.glsl
@@ -0,0 +1,19 @@
+/* <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
+
+uniform sampler2D u_tex0;
+
+varying vec2	v_texCoord0;
+
+
+void main() {
+   gl_FragColor = texture2D(u_tex0, v_texCoord0);
+}
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index b07bb627..ba1ef39e 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -17,7 +17,7 @@ varying vec2	v_texCoord0;
 
 void main()
 {
-   // gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha;
-   gl_FragColor = vec4(1,0,0,1);
+   gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha;
+   //gl_FragColor = texture2D(u_tex0, v_texCoord0);
 }    
   
\ No newline at end of file
-- 
cgit v1.2.3