Smol stuff

Eldeston · Mar 13, 2022 · 4cfde68 · 4cfde68
1 parent 18b003b
commit 4cfde68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/shaders/main/composite.glsl b/shaders/main/composite.glsl
@@ -91,6 +91,7 @@ varying vec2 screenCoord;
         posVector.eyePlayerPos = mat3(gbufferModelViewInverse) * posVector.viewPos;
         posVector.feetPlayerPos = posVector.eyePlayerPos + gbufferModelViewInverse[3].xyz;
 
+        // Get scene color
         vec3 sceneCol = texture2D(gcolor, screenCoord).rgb;
 
         #if ANTI_ALIASING == 2
@@ -111,13 +112,11 @@ varying vec2 screenCoord;
                 vec2 matRaw0 = texture2D(colortex3, screenCoord).xy;
                 material.metallic = matRaw0.x; material.smoothness = matRaw0.y;
 
+                // Apply deffered shading
                 sceneCol = complexShadingDeferred(material, posVector, sceneCol, dither);
 
-                // Get sky color
-                vec3 skyRender = getSkyRender(vec3(0), normalize(posVector.eyePlayerPos), false);
-
-                // Fog calculation
-                sceneCol = getFogRender(posVector.eyePlayerPos, sceneCol, skyRender, posVector.feetPlayerPos.y + cameraPosition.y, false);
+                // Fog and sky calculation
+                sceneCol = getFogRender(posVector.eyePlayerPos, sceneCol, getSkyRender(vec3(0), normalize(posVector.eyePlayerPos), false), posVector.feetPlayerPos.y + cameraPosition.y, false);
             }
         }
 

diff --git a/shaders/main/deferred.glsl b/shaders/main/deferred.glsl
@@ -103,11 +103,9 @@ varying vec2 screenCoord;
         posVector.eyePlayerPos = mat3(gbufferModelViewInverse) * posVector.viewPos;
         posVector.feetPlayerPos = posVector.eyePlayerPos + gbufferModelViewInverse[3].xyz;
 
+        // Get scene color
         vec3 sceneCol = texture2D(gcolor, screenCoord).rgb;
 
-        // Get sky color and do skyCol with vanilla sun and moon and skybox blend and input as new skyCol
-        vec3 skyRender = getSkyRender(sceneCol, normalize(posVector.eyePlayerPos), skyMask, true);
-
         // If not sky, don't calculate lighting
         if(!skyMask){
             // Declare and get materials
@@ -124,6 +122,7 @@ varying vec2 screenCoord;
                 vec3 dither = getRand3(gl_FragCoord.xy * 0.03125);
             #endif
 
+            // Apply deffered shading
             sceneCol = complexShadingDeferred(material, posVector, sceneCol, dither);
 
             #ifdef OUTLINES
@@ -132,8 +131,8 @@ varying vec2 screenCoord;
             #endif
         }
 
-        // Fog calculation
-        sceneCol = getFogRender(posVector.eyePlayerPos, sceneCol, skyRender, posVector.feetPlayerPos.y + cameraPosition.y, skyMask);
+        // Fog and sky calculation
+        sceneCol = getFogRender(posVector.eyePlayerPos, sceneCol, getSkyRender(sceneCol, normalize(posVector.eyePlayerPos), skyMask, true), posVector.feetPlayerPos.y + cameraPosition.y, skyMask);
 
     /* DRAWBUFFERS:0 */
         gl_FragData[0] = vec4(sceneCol, 1); //gcolor