Clean up

Author: Artem Kholodnyi

library/src/main/res/raw/tiles_frag.glsl

@@ -1,15 +1,8 @@
-precision mediump float;       	// Set the default precision to medium. We don't need as high of a
-								// precision in the fragment shader.
+precision mediump float;       	// Set the default precision to medium. We don't need as high of a precision in the fragment shader.
 uniform sampler2D u_Texture;    // The input texture.
 
 varying vec2 v_TexCoordinate;   // Interpolated texture coordinate per fragment.
 
-float rand( vec2 co )
-{
-   return step(0.9, fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453));
-}
-
-// The entry point for our fragment shader.
 void main()
 {
     gl_FragColor = texture2D(u_Texture, v_TexCoordinate);

library/src/main/res/raw/tiles_vert.glsl

@@ -1,49 +1,32 @@
 uniform mat4 u_MVPMatrix;		// A constant representing the combined model/view/projection matrix.
 uniform mat4 u_MVMatrix;		// A constant representing the combined model/view matrix.
-uniform float u_Time;
 uniform float u_DeltaPos;
 
 attribute vec4 a_Position;		// Per-vertex position information we will pass in.
-attribute vec3 a_Normal;		// Per-vertex normal information we will pass in.
 attribute vec2 a_TexCoordinate; // Per-vertex texture coordinate information we will pass in.
 
 // Contains tile's x and y position + random value at .z
 attribute vec3 a_TileXY;
 
-varying vec3 v_Position;		// This will be passed into the fragment shader.
-varying vec3 v_Normal;			// This will be passed into the fragment shader.
 varying vec2 v_TexCoordinate;   // This will be passed into the fragment shader.
-varying vec3 v_Color;
-
-float rand( vec2 co )
-{
-   return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
 
 void main()
 {
-	// Transform the vertex into eye space.
-	v_Position = vec3(u_MVMatrix * a_Position);
-
-	// Pass through the texture coordinate.
-	v_TexCoordinate = a_TexCoordinate;
-
-	// Transform the normal's orientation into eye space.
-    v_Normal = vec3(u_MVMatrix * vec4(a_Normal, 0.0));
+  // Pass through the texture coordinate.
+  v_TexCoordinate = a_TexCoordinate;
 
-    // Tiles' elevation
-    float z = - (a_TileXY.z - 0.5) * sin(u_DeltaPos/7.0) * 1.3;
+  // Tiles' elevation
+  float z = - (a_TileXY.z - 0.5) * sin(u_DeltaPos/7.0) * 1.3;
 
-    vec4 calcPos = a_Position;
+  vec4 calcPos = a_Position;
 
-    calcPos.z = z;
+  calcPos.z = z;
 
-    float randomShift = a_TileXY.z;
+  float randomShift = a_TileXY.z;
 
-    // Just some random perturbations
-    calcPos.x += u_DeltaPos * (randomShift - 0.5) * 0.3;
-    calcPos.y += u_DeltaPos + randomShift * sin(u_DeltaPos / 30.0) * 3.3;
-    v_Color.rgb = vec3(rand(a_TileXY.xy));
+  // Just some random perturbations
+  calcPos.x += u_DeltaPos * (randomShift - 0.5) * 0.3;
+  calcPos.y += u_DeltaPos + randomShift * sin(u_DeltaPos / 30.0) * 3.3;
 
-	gl_Position = u_MVPMatrix * calcPos;
+  gl_Position = u_MVPMatrix * calcPos;
 }