diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index d26abdb..318ba4b 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -1338,6 +1338,7 @@ void main() { // if(hideGUI == 0) gl_FragData[0].rgb = vec3(1) * (1.0 - SSAO_SSS.x); if(hideGUI == 0) gl_FragData[0].rgb = vec3(1) * exp(-10*filteredShadow.y);//exp(-7*(1-clamp(1.0 - filteredShadow.x,0.0,1.0))); #endif + // gl_FragData[0].rgb = albedo*30; // gl_FragData[0].rgb = vec3(1) * Shadows; // if(swappedDepth >= 1.0) gl_FragData[0].rgb = vec3(0.1); // gl_FragData[0].rgb = vec3(1) * ld(texture2D(depthtex1, texcoord).r); diff --git a/shaders/dimensions/composite11.fsh b/shaders/dimensions/composite11.fsh index 8dd93c1..84a5aac 100644 --- a/shaders/dimensions/composite11.fsh +++ b/shaders/dimensions/composite11.fsh @@ -158,8 +158,6 @@ void main() { VL_abs = clamp((1.0-VL_abs)*BLOOMY_FOG*0.75*(1.0+rainStrength) * (1.0-purkinje*0.3),0.0,1.0)*clamp(1.0-pow(cdist(texcoord.xy),15.0),0.0,1.0); col = (mix(col, bloom, VL_abs) + bloom * lightScat) * exposure.rgb; - - // if(hideGUI > 0) col = bloom * lightScat* exposure.rgb; float lum = dot(col, vec3(0.15,0.3,0.55)); float lum2 = dot(col, vec3(0.85,0.7,0.45)); @@ -178,7 +176,6 @@ void main() { #endif gl_FragData[0].rgb = clamp(int8Dither(col,texcoord),0.0,1.0); - #if DOF_QUALITY == 5 #if FOCUS_LASER_COLOR == 0 // Red diff --git a/shaders/dimensions/deferred.vsh b/shaders/dimensions/deferred.vsh index de0da17..40814d0 100644 --- a/shaders/dimensions/deferred.vsh +++ b/shaders/dimensions/deferred.vsh @@ -257,7 +257,7 @@ void main() { // exposure = mix(0.0, 1.0, min(targetExposure,1.0)); // exposure = 1; - float currCenterDepth = ld(texture2D(depthtex2, vec2(0.5)).r); + float currCenterDepth = ld(texture2D(depthtex2, vec2(0.5)*RENDER_SCALE).r); centerDepth = mix(sqrt(texelFetch2D(colortex4,ivec2(14,37),0).g/65000.0), currCenterDepth, clamp(DoF_Adaptation_Speed*exp(-0.016/frameTime+1.0)/(6.0+currCenterDepth*far),0.0,1.0)); centerDepth = centerDepth * centerDepth * 65000.0; diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index a250c29..1972496 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -1,4 +1,4 @@ -#define SHADER_VERSION_LABEL 467 // [467] +#define SHADER_VERSION_LABEL 468 // [468] #define saturate(x) clamp(x,0.0,1.0)