still pulling out atmosphere shader pass

Author: clayjohn

assets/shaders/basic.vert

@@ -4,6 +4,7 @@
 //TODO add more flexibility to parameters
 	//rain
 	//
+//TODO add 2d cloud layer on top
 //TODO either integrate atmosphere or cut out completely
 	//integrated is nice because i can sample sun color anytime
 	//seperate is nice cause I do each pixel only once and can benefit from that cheap mipmapping
@@ -13,7 +14,6 @@ uniform sampler3D perlworl;
 uniform sampler3D worl;
 uniform sampler2D curl;
 uniform sampler2D weather;
-uniform sampler2D atmosphere;
 
 uniform int check;
 uniform mat4 MVPM; 
@@ -30,10 +30,6 @@ const float sky_t_radius = 602300.0;//top of cloud layer
 const float c_radius = 6008400.0; //2d noise layer
 
 
-
-
-
-
 /*
 Atmospheric scattering based off of: 
 */
@@ -261,11 +257,10 @@ vec3 U2Tone(vec3 x) {
 }
 
 vec3 getSunDirection() {
-	vec3 sun_dir = vec3(0.0, 1.0, 0.0);
+	const vec3 sun_dir = vec3(0.0, 1.0, 0.0);
 
 	mat3 rot = rotate_around_x(-abs(sin(time / 20.)) * 90.);
-	sun_dir *= rot;
-	return sun_dir;
+	return sun_dir*rot;
 }
 
 vec3 getSunColor() {
@@ -274,7 +269,8 @@ vec3 getSunColor() {
 }
 
 vec3 getSkyColor() {
-	return texture(atmosphere, vec2(0.5, 0.9), 7).xyz;
+	vec3 dir = getSunDirection();
+	return mix(vec3(0.2, 0.3, 0.4), vec3(0.9, 0.9, 1.0), smoothstep(0.05, 0.2, dir.y));
 }
 
 int check_pos(vec2 x, float size) {
@@ -430,7 +426,7 @@ vec4 march(vec3 pos, vec3 end, vec3 dir, int depth) {
 		float beers = max(exp(-ld*ncd*lss), exp(-ld*0.25*ncd*lss)*0.7);
 		float powshug = 1.0-exp(-ld*ncd*lss*2.0);
 
-		vec3 ambient = 9.0*ambientLight*mix(0.25, 1.0, height_fraction);
+		vec3 ambient = 9.0*ambientLight*mix(0.05, 1.0, height_fraction);
 		vec3 sunC = sunLight*40.0;
 		L += (ambient+sunC*beers*powshug*2.0*phase)*(t)*T*ss;		
 		alpha += (1.0-dt)*(1.0-alpha);

assets/shaders/sky.frag

@@ -9,6 +9,10 @@
 #include "include/TileableVolumeNoise/TileableVolumeNoise.h"
 #include "include/stb_image_write.h"
 
+//TODO make a repeating 2d cirrus noise texture
+//TODO Clean this up for github
+//TODO Make a repeating curl noise implementation
+
 /*
  * g++ include/TileableVolumeNoise/tileableVolumeNoise.cpp gen_noise.cpp -o gen_noise -std=c++11
  */

gen_noise.cpp

@@ -86,7 +86,6 @@ int main()
     Shader ourShader("sky.vert", "sky.frag");
 		Shader postShader("tex.vert", "tex.frag");
 		Shader upscaleShader("upscale.vert", "upscale.frag");
-		Shader atmoShader("atmo.vert", "atmo.frag");
 
     // Set up vertex data (and buffer(s)) and attribute pointers
     GLfloat vertices[] = {
@@ -156,22 +155,7 @@ int main()
 		glBindFramebuffer(GL_FRAMEBUFFER, subbuffer);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, subbuffertex, 0);
 
-
-		//small buffer for rendering sky background//should be removed and incorporated into sky
-		GLuint skyfbo, skytex;
-		
-    glGenFramebuffers(1, &skyfbo);
-    glGenTextures(1, &skytex);
-    glBindTexture(GL_TEXTURE_2D, skytex);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, WIDTH/downscale, HEIGHT/downscale, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glBindTexture(GL_TEXTURE_2D, 0);
-
-		glBindFramebuffer(GL_FRAMEBUFFER, skyfbo);
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, skytex, 0);
-
-		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
 		//setup noise textures
 		GLuint curltex, worltex, perlworltex, weathertex;
@@ -240,7 +224,6 @@ int main()
     GLuint worluniform = glGetUniformLocation(ourShader.Program, "worl");
     GLuint curluniform = glGetUniformLocation(ourShader.Program, "curl");
     GLuint weatheruniform = glGetUniformLocation(ourShader.Program, "weather");
-    GLuint atmosphereuniform = glGetUniformLocation(ourShader.Program, "atmosphere"); 
 
 		upscaleShader.Use();
     GLuint upuniformMatrix = glGetUniformLocation(upscaleShader.Program, "MVPM");
@@ -250,12 +233,6 @@ int main()
     GLuint updownscale = glGetUniformLocation(upscaleShader.Program, "downscale");
     GLuint buffuniform = glGetUniformLocation(upscaleShader.Program, "buff");
     GLuint ponguniform = glGetUniformLocation(upscaleShader.Program, "pong");
-
-		atmoShader.Use();
-    GLuint atmotimeu = glGetUniformLocation(atmoShader.Program, "time");
-    GLuint atmochecku = glGetUniformLocation(atmoShader.Program, "check");
-    GLuint atmoresolution = glGetUniformLocation(atmoShader.Program, "resolution");
-    GLuint atmouniformMatrix = glGetUniformLocation(atmoShader.Program, "MVPM");
 
     // Game loop
 		int check = 0;
@@ -286,25 +263,7 @@ int main()
     			std::cout<<err<<std::endl;
 				}
 
-/*
-        glBindFramebuffer(GL_FRAMEBUFFER, skyfbo);
-        glViewport(0, 0, WIDTH/downscale, HEIGHT/downscale);
-
-        atmoShader.Use();
-
-        glUniformMatrix4fv(atmouniformMatrix, 1, GL_FALSE, glm::value_ptr(MVPM));
-        glUniform1f(atmotimeu, timePassed);
-        glUniform2f(atmoresolution, float(WIDTH/downscale), float(HEIGHT/downscale));
-
-        glBindVertexArray(VAO);        
-        glDrawArrays(GL_TRIANGLES, 0, 3);
-        glBindVertexArray(0);
-
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, skytex);
-        glGenerateMipmap(GL_TEXTURE_2D);
-        */        
-				
+			
 				//Write to quarter scale buffer
         glBindFramebuffer(GL_FRAMEBUFFER, subbuffer);
         glViewport(0, 0, WIDTH/downscale, HEIGHT/downscale);
@@ -322,7 +281,6 @@ int main()
         glUniform1i(worluniform, 1);
         glUniform1i(curluniform, 2);
         glUniform1i(weatheruniform, 3);
-        glUniform1i(atmosphereuniform, 4);
 
         glActiveTexture(GL_TEXTURE0);
         glBindTexture(GL_TEXTURE_3D, perlworltex);
@@ -332,8 +290,6 @@ int main()
         glBindTexture(GL_TEXTURE_2D, curltex);
         glActiveTexture(GL_TEXTURE3);
         glBindTexture(GL_TEXTURE_2D, weathertex);
-        glActiveTexture(GL_TEXTURE4);
-        glBindTexture(GL_TEXTURE_2D, skytex);
 
         glBindVertexArray(VAO);
         glDrawArrays(GL_TRIANGLES, 0, 3);