From c1a6cacf364d79cbf23b41e7089a1a6d39afea85 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 10 Apr 2012 10:12:49 -0700 Subject: Cloud material --- assets/shaders/Cloud.vert.glsl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 assets/shaders/Cloud.vert.glsl (limited to 'assets/shaders/Cloud.vert.glsl') diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl new file mode 100644 index 00000000..fbd7f40b --- /dev/null +++ b/assets/shaders/Cloud.vert.glsl @@ -0,0 +1,42 @@ +/* +This file contains proprietary software owned by Motorola Mobility, Inc.
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + + +#ifdef GL_ES +precision highp float; +#endif + +// attributes +attribute vec3 a_pos; +attribute vec2 texcoord; + +// uniforms +uniform float u_time; +uniform float u_zmin; +uniform float u_zmax; +uniform float u_surfaceAlpha; + +// matrix uniforms +uniform mat4 u_mvMatrix; +uniform mat4 u_projMatrix; +uniform mat4 u_worldMatrix; + +// varying +varying vec2 v_texCoord0; + +// constants +const float zSpeed = 1.0; + + +void main() +{ + // Transform position + vec4 pos = a_pos; + pos.z += u+time*zSpeed; + gl_Position = u_projMatrix * u_mvMatrix * pos; + + v_texCoord0 = texcoord; +} \ No newline at end of file -- cgit v1.2.3 From 1b7592f81c9b47c2b42d78efe385cd979d54d3ca Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 11 Apr 2012 06:24:05 -0700 Subject: Cloud material --- assets/shaders/Cloud.vert.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.vert.glsl') diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index fbd7f40b..c673e40c 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl @@ -34,8 +34,8 @@ const float zSpeed = 1.0; void main() { // Transform position - vec4 pos = a_pos; - pos.z += u+time*zSpeed; + vec4 pos = vec4(a_pos,1); + pos.z += u_time*zSpeed; gl_Position = u_projMatrix * u_mvMatrix * pos; v_texCoord0 = texcoord; -- cgit v1.2.3 From 331b2ad4d602016f9bb3d03be759fd81fed50c10 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Fri, 13 Apr 2012 07:08:42 -0700 Subject: Cloud Material --- assets/shaders/Cloud.vert.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assets/shaders/Cloud.vert.glsl') diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index c673e40c..9a235349 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl @@ -35,7 +35,7 @@ void main() { // Transform position vec4 pos = vec4(a_pos,1); - pos.z += u_time*zSpeed; + //pos.z += u_time*zSpeed; gl_Position = u_projMatrix * u_mvMatrix * pos; v_texCoord0 = texcoord; -- cgit v1.2.3 From c0aa5e88890fbf74124d019df96c33215da99f17 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Mon, 16 Apr 2012 05:59:01 -0700 Subject: Cloud material --- assets/shaders/Cloud.vert.glsl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.vert.glsl') diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index 9a235349..c8ca9f3f 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl @@ -28,14 +28,22 @@ uniform mat4 u_worldMatrix; varying vec2 v_texCoord0; // constants -const float zSpeed = 1.0; +const float zSpeed = 2.0; void main() { // Transform position vec4 pos = vec4(a_pos,1); - //pos.z += u_time*zSpeed; + float dz = u_time*zSpeed; + float n = floor( dz/(u_zmax-u_zmin) ); + dz -= n*(u_zmax - u_zmin); + float z = pos.z + dz; + if (z > u_zmax) + { + z = u_zmin + (z - u_zmax); + } + pos.z = z; gl_Position = u_projMatrix * u_mvMatrix * pos; v_texCoord0 = texcoord; -- cgit v1.2.3 From 447268000c379f619c78d7132c81e23b5c252598 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 17 Apr 2012 09:20:49 -0700 Subject: Cloud material --- assets/shaders/Cloud.vert.glsl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.vert.glsl') diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index c8ca9f3f..acd581fc 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl @@ -22,19 +22,19 @@ uniform float u_surfaceAlpha; // matrix uniforms uniform mat4 u_mvMatrix; uniform mat4 u_projMatrix; -uniform mat4 u_worldMatrix; // varying varying vec2 v_texCoord0; // constants -const float zSpeed = 2.0; +const float zSpeed = 10.0; void main() { // Transform position vec4 pos = vec4(a_pos,1); + float dz = u_time*zSpeed; float n = floor( dz/(u_zmax-u_zmin) ); dz -= n*(u_zmax - u_zmin); @@ -44,6 +44,7 @@ void main() z = u_zmin + (z - u_zmax); } pos.z = z; + gl_Position = u_projMatrix * u_mvMatrix * pos; v_texCoord0 = texcoord; -- cgit v1.2.3