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


From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Mon, 9 Jul 2012 16:27:52 -0700
Subject: BSD License

---
 assets/shaders/Cloud.vert.glsl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

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

diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl
index a33429fe..d129e267 100644
--- a/assets/shaders/Cloud.vert.glsl
+++ b/assets/shaders/Cloud.vert.glsl
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-- 
cgit v1.2.3