cleaned up code significantly

Author: clayjohn

assets/shaders/atmo.frag

@@ -1,12 +1,9 @@
 #version 330 core
-in vec3 ourColor;
-in vec3 TexCoords;
 
-//uniform vec2 resolution;
-const vec2 resolution = vec2(512.0);
+uniform vec2 resolution;
 uniform float time;
 uniform mat4 MVPM;
-uniform int check;
+
 out vec4 color;
 
 // ----------------------------------------------------------------------------
@@ -277,17 +274,9 @@ void main()
 	worldPos.xyz /= worldPos.w;
 	point_cam = normalize(worldPos.xyz);
 
-
-	if (check_pos(gl_FragCoord.xy/1.0, 4.0)!=check&&true==false){
-		//reprojection from http://john-chapman-graphics.blogspot.ca/2013/01/what-is-motion-blur-motion-pictures-are.html
-		//look into running all this on cpu
-		discard;
-
-	} else {
-
 		vec3 col = vec3(0);
 		if (point_cam.y>-0.05) {
-	// sun
+			// sun
 			mat3 rot = rotate_around_x(-abs(sin(u_time / 20.)) * 90.);
 			sun_dir *= rot;
 
@@ -300,5 +289,4 @@ void main()
 		}
 		col = ACESFilm(col);
 		color = vec4(col, 1);
-	}
 }

assets/shaders/atmo.vert

@@ -1,19 +1,7 @@
 #version 330 core
-in vec3 position;
-in vec3 color;
-in vec3 texCoords;
-
-out vec3 ourColor;
-out vec3 TexCoords;
-out vec4 fragPos;
-
-uniform mat4 MVPM;
+layout (location = 0) in vec2 position;
 
 void main()
 {
-
-    gl_Position = vec4(position.xy, 0.0, 1.0);
-    ourColor = color;
-    TexCoords = texCoords;
-		fragPos = gl_Position;
+    gl_Position = vec4(position, 0.0, 1.0);
 }

assets/shaders/sky.frag

@@ -1,8 +1,4 @@
 #version 330 core
-in vec3 ourColor;
-in vec3 TexCoords;
-in vec4 fragPos;
-
 //TODO update cloud shaping
 //TODO fix up weather texture
 //TODO add more flexibility to parameters
@@ -17,11 +13,9 @@ uniform sampler2D atmosphere;
 
 uniform int check;
 uniform mat4 MVPM; 
-uniform mat4 LFMVPM;
-uniform mat4 VM;
 uniform float aspect;
 uniform float time;
-uniform int camera_dirty;
+uniform vec2 resolution;
 
 out vec4 color;
 
@@ -245,7 +239,7 @@ void main()
 {
 	vec2 shift = vec2(floor(float(check)/4.0), mod(float(check), 4.0));	
 	//shift = vec2(0.0);
-	vec2 uv = (gl_FragCoord.xy*4.0+shift.yx)/vec2(512.0);
+	vec2 uv = (gl_FragCoord.xy*4.0+shift.yx)/(resolution*4.0);
 	uv = uv-vec2(0.5);
 	uv *= 2.0;
 	uv.x *= aspect;
@@ -257,7 +251,7 @@ void main()
 	vec3 dir = normalize(worldPos.xyz/worldPos.w);
 
 	vec4 col = vec4(0.0);
-	vec3 background = textureLod(atmosphere, TexCoords.xy, 0.0).xyz;
+	vec3 background = textureLod(atmosphere, gl_FragCoord.xy/resolution, 0.0).xyz;
 	//vec3 background = vec3(dot(normalize(dir), normalize(getSunDirection())));
 	if (dir.y>0.0) {
 		vec3 start = camPos+vec3(0.0, g_radius, 0.0)+dir*intersectSphere(camPos+vec3(0.0, g_radius, 0.0), dir, sky_b_radius);

assets/shaders/sky.vert

@@ -1,19 +1,7 @@
 #version 330 core
-in vec3 position;
-in vec3 color;
-in vec3 texCoords;
-
-out vec3 ourColor;
-out vec3 TexCoords;
-out vec4 fragPos;
-
-uniform mat4 MVPM;
+layout (location = 0) in vec2 position;
 
 void main()
 {
-
-    gl_Position = vec4(position.xy, 0.0, 1.0);
-    ourColor = color;
-    TexCoords = texCoords;
-		fragPos = gl_Position;
+    gl_Position = vec4(position, 0.0, 1.0);
 }

assets/shaders/tex.frag

@@ -1,12 +1,11 @@
 #version 330 core
-in vec3 ourColor;
-in vec3 TexCoords;
+in vec2 TexCoords;
 
 uniform sampler2D fbo;
 
 out vec4 color;
 
 void main()
 {
-  color = texture(fbo, TexCoords.xy, 0.0);  
+  color = texture(fbo, TexCoords, 0.0);  
 }

assets/shaders/tex.vert

@@ -1,20 +1,10 @@
 #version 330 core
-in vec3 position;
-in vec3 color;
-in vec3 texCoords;
+layout (location = 0) in vec2 position;
 
-uniform float size;
-uniform float pos;
-
-out vec3 ourColor;
-out vec3 TexCoords;
-
-uniform mat4 MVPM;
+out vec2 TexCoords;
 
 void main()
 {
-
-    gl_Position = vec4(position.xy*size, 0.0, 1.0);
-    ourColor = color;
-    TexCoords = texCoords;
+    gl_Position = vec4(position, 0.0, 1.0);
+    TexCoords = position*0.5+0.5;
 }

assets/shaders/upscale.frag

@@ -1,13 +1,11 @@
 #version 330 core
-in vec3 ourColor;
-in vec3 TexCoords;
-in vec4 fragPos;
 
 uniform sampler2D buff;
 uniform sampler2D pong;
 uniform int check;
 uniform mat4 MVPM;
 uniform mat4 LFMVPM;
+uniform vec2 resolution;
 
 out vec4 color;
 
@@ -21,14 +19,14 @@ void main()
 	vec2 shift = vec2(floor(float(check)/4.0), mod(float(check), 4.0));	
 
 	vec2 uv = floor(gl_FragCoord.xy/4.0);
-	uv = uv/vec2(128.0);
+	uv = uv/(resolution/4.0);
 
 	vec4 col = vec4(0.0);
 	if (check_pos(gl_FragCoord.xy/1.0, 4.0)!=check&&true==true){
 		//reprojection from http://john-chapman-graphics.blogspot.ca/2013/01/what-is-motion-blur-motion-pictures-are.html
 		//look into running all this on cpu
 		//discard;
-		uv = gl_FragCoord.xy/512.0;
+		uv = gl_FragCoord.xy/resolution;
 		vec2 uvd = uv-vec2(0.5);
 		uvd *= 2.0;
 		vec4 uvdir = (vec4(uvd, 1.0, 1.0));
@@ -46,7 +44,7 @@ void main()
 			lookup = uv.xy;
 			col = texture(buff, lookup);
 		} else {
-			uv = gl_FragCoord.xy/512.0;
+			uv = gl_FragCoord.xy/resolution;
 			col = texture(pong, lookup);
 		}
 	} else {

assets/shaders/upscale.vert

@@ -1,22 +1,7 @@
 #version 330 core
-in vec3 position;
-in vec3 color;
-in vec3 texCoords;
-
-uniform float size;
-uniform float pos;
-
-out vec3 ourColor;
-out vec3 TexCoords;
-out vec4 fragPos;
-
-uniform mat4 MVPM;
+layout (location = 0) in vec2 position;
 
 void main()
 {
-
-    gl_Position = vec4(position.xy, 0.0, 1.0);
-    ourColor = color;
-    TexCoords = texCoords;
-		fragPos = gl_Position;
+    gl_Position = vec4(position, 0.0, 1.0);
 }