diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh index 1d76a6b..7c7d488 100644 --- a/shaders/dimensions/all_translucent.fsh +++ b/shaders/dimensions/all_translucent.fsh @@ -466,22 +466,19 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) #endif #ifdef NETHER_SHADER - WS_normal.xz = -WS_normal.xz; - vec3 AmbientLightColor = skyCloudsFromTexLOD2(WS_normal, colortex4, 6).rgb / 15; - - vec3 up = skyCloudsFromTexLOD2(vec3( 0, 1, 0), colortex4, 6).rgb / 15; - vec3 down = skyCloudsFromTexLOD2(vec3( 0,-1, 0), colortex4, 6).rgb / 15; - + vec3 AmbientLightColor = skyCloudsFromTexLOD2(WS_normal, colortex4, 6).rgb ; + vec3 up = skyCloudsFromTexLOD2(vec3( 0, 1, 0), colortex4, 6).rgb; + vec3 down = skyCloudsFromTexLOD2(vec3( 0,-1, 0), colortex4, 6).rgb; + up *= pow( max( WS_normal.y, 0), 2); down *= pow( max(-WS_normal.y, 0), 2); AmbientLightColor += up + down; - + + #endif #ifdef END_SHADER - float fresnelGlow = pow(clamp(1.5 + dot(WS_normal, normalize(feetPlayerPos))*0.5,0,2),2); - vec3 AmbientLightColor = (vec3(0.5,0.75,1.0) *0.9 + 0.1)* fresnelGlow; float vortexBounds = clamp(vortexBoundRange - length(feetPlayerPos+cameraPosition), 0.0,1.0); @@ -496,6 +493,9 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) Direct_lighting = lightColors * endFogPhase(lightPos) * NdotL; + vec3 AmbientLightColor = vec3(0.5,0.75,1.0) * 0.9 + 0.1; + AmbientLightColor *= clamp(1.5 + dot(WS_normal, normalize(feetPlayerPos))*0.5,0,2); + #endif Indirect_lighting = DoAmbientLightColor(AmbientLightColor, vec3(TORCH_R,TORCH_G,TORCH_B), lightmap.xy); diff --git a/shaders/lib/diffuse_lighting.glsl b/shaders/lib/diffuse_lighting.glsl index eefc94b..e78686c 100644 --- a/shaders/lib/diffuse_lighting.glsl +++ b/shaders/lib/diffuse_lighting.glsl @@ -3,6 +3,7 @@ vec3 DoAmbientLightColor( vec3 TorchColor, vec2 Lightmap ){ + // do sky lighting. float skyLM = (pow(Lightmap.y,15.0)*2.0 + pow(Lightmap.y,2.5))*0.5; SkyColor = (SkyColor / 30.0) * ambient_brightness * skyLM; diff --git a/shaders/world-1/gbuffers_entities_translucent.fsh b/shaders/world-1/gbuffers_entities_translucent.fsh index 78b1b61..c3b1fa5 100644 --- a/shaders/world-1/gbuffers_entities_translucent.fsh +++ b/shaders/world-1/gbuffers_entities_translucent.fsh @@ -1,6 +1,6 @@ #version 120 #define ENTITIES -#define OVERWORLD_SHADER +#define NETHER_SHADER #include "/dimensions/all_translucent.fsh" \ No newline at end of file diff --git a/shaders/world-1/gbuffers_entities_translucent.vsh b/shaders/world-1/gbuffers_entities_translucent.vsh index 3e0489a..f7599fe 100644 --- a/shaders/world-1/gbuffers_entities_translucent.vsh +++ b/shaders/world-1/gbuffers_entities_translucent.vsh @@ -1,6 +1,6 @@ #version 120 #define ENTITIES -#define OVERWORLD_SHADER +#define NETHER_SHADER #include "/dimensions/all_translucent.vsh" \ No newline at end of file diff --git a/shaders/world1/gbuffers_entities_translucent.fsh b/shaders/world1/gbuffers_entities_translucent.fsh index 78b1b61..82168aa 100644 --- a/shaders/world1/gbuffers_entities_translucent.fsh +++ b/shaders/world1/gbuffers_entities_translucent.fsh @@ -1,6 +1,6 @@ #version 120 #define ENTITIES -#define OVERWORLD_SHADER +#define END_SHADER #include "/dimensions/all_translucent.fsh" \ No newline at end of file diff --git a/shaders/world1/gbuffers_entities_translucent.vsh b/shaders/world1/gbuffers_entities_translucent.vsh index 3e0489a..6f7c6f0 100644 --- a/shaders/world1/gbuffers_entities_translucent.vsh +++ b/shaders/world1/gbuffers_entities_translucent.vsh @@ -1,6 +1,6 @@ #version 120 #define ENTITIES -#define OVERWORLD_SHADER +#define END_SHADER #include "/dimensions/all_translucent.vsh" \ No newline at end of file