From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- assets/shaders/Cloud.vert.glsl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'assets/shaders/Cloud.vert.glsl') diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index 95c14132..c709bc27 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl @@ -34,7 +34,7 @@ precision highp float; #endif // attributes -attribute vec3 a_pos; +attribute vec3 a_pos; attribute vec2 texcoord; // uniforms @@ -48,7 +48,7 @@ uniform mat4 u_mvMatrix; uniform mat4 u_projMatrix; // varying -varying vec2 v_texCoord0; +varying vec2 v_texCoord0; // constants const float zSpeed = 10.0; @@ -57,19 +57,19 @@ const float zSpeed = 10.0; void main() { // Transform position - vec4 pos = vec4(a_pos,1); + 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); - float z = pos.z + dz; - if (z > u_zmax) - { - z = u_zmin + (z - u_zmax); - } - pos.z = z; + 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; - + gl_Position = u_projMatrix * u_mvMatrix * pos; + v_texCoord0 = texcoord; } -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- 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 c709bc27..a33429fe 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl @@ -70,6 +70,6 @@ void main() pos.z = z; gl_Position = u_projMatrix * u_mvMatrix * pos; - + v_texCoord0 = texcoord; } -- cgit v1.2.3