Merge pull request #127 from OpenSauce04/Better-Sun-Moon-Textures

Improved Sun and Moon texture handling + Realistic textures
jebbyk · Apr 28, 2021 · f3b470a · f3b470a
2 parents 82d1f0c + 7cf0157
commit f3b470a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/shaders/glsl/sun_and_moon.fragment b/shaders/glsl/sun_and_moon.fragment
@@ -76,10 +76,15 @@ void main()
 	highp vec3 dp1 = dFdx(worldPosition.xyz);
 	highp vec3 dp2 = dFdy(worldPosition.xyz);
 
-	 vec3 normal = (normalize(cross(dp1, dp2)) + 1.0) / 2.0;
+	vec3 normal = (normalize(cross(dp1, dp2)) + 1.0) / 2.0;
 
 
 	gl_FragColor = CURRENT_COLOR * diffuse * length(diffuse.rgb);
 	gl_FragColor += halo * haloTint /*+ sun * sunTint*/;
-	gl_FragColor.a *= 1.0 - isRain;
+
+	float sunHaloIntensity = 0.6;
+	float moonHaloIntensity = 0.4;
+	float haloIntensity = sunHaloIntensity + abs((isDay * moonHaloIntensity) - moonHaloIntensity);
+
+	gl_FragColor.a *= haloIntensity - (isRain * haloIntensity);
 }
diff --git a/shaders/glsl/sun_and_moon.vertex b/shaders/glsl/sun_and_moon.vertex
@@ -17,7 +17,7 @@ varying vec3 viewPosition;
 
 void main()
 {
-    gl_Position = WORLDVIEWPROJ * (POSITION * vec4(8.0, 8.0, 8.0, 1.0));
+    gl_Position = WORLDVIEWPROJ * (POSITION * vec4(16.0, 16.0, 16.0, 8.0)); // <-- The sun's visual position
 
     position = POSITION.xyz * vec3(8.0);
     worldPosition = POSITION * vec4(8.0, 8.0, 8.0, 1.0) *  WORLD; 

diff --git a/textures/environment/moon_phases.png b/textures/environment/moon_phases.png
diff --git a/textures/environment/sun.png b/textures/environment/sun.png