diff --git a/enbseries.ini b/enbseries.ini index ccb82c4..e451c89 100644 --- a/enbseries.ini +++ b/enbseries.ini @@ -13,6 +13,7 @@ EnableBloom=true EnableLens=false EnableDepthOfField=true EnableSSAO=true +EnableSkyAmbientCalculation=true [COLORCORRECTION] UseProceduralCorrection=true Brightness=1.0 @@ -61,7 +62,7 @@ GradientIntensitySunrise=1.110001 GradientIntensityDay=1.330001 GradientIntensitySunset=1.110001 GradientIntensityDusk=1.03 -GradientIntensityNight=0.970001 +GradientIntensityNight=0.960001 GradientIntensityInteriorDay=1.29 GradientIntensityInteriorNight=0.94 GradientDesaturationDawn=0.0 @@ -152,14 +153,14 @@ CloudsIntensityDusk=0.880001 CloudsIntensityNight=0.640001 CloudsIntensityInteriorDay=1.26 CloudsIntensityInteriorNight=0.64 -CloudsCurveDawn=1.28 -CloudsCurveSunrise=1.01 -CloudsCurveDay=0.83 -CloudsCurveSunset=1.02 -CloudsCurveDusk=1.26 -CloudsCurveNight=1.44 -CloudsCurveInteriorDay=0.88 -CloudsCurveInteriorNight=1.37 +CloudsCurveDawn=0.81 +CloudsCurveSunrise=0.86 +CloudsCurveDay=0.95 +CloudsCurveSunset=0.87 +CloudsCurveDusk=0.82 +CloudsCurveNight=0.76 +CloudsCurveInteriorDay=0.95 +CloudsCurveInteriorNight=0.78 CloudsDesaturationDawn=0.0 CloudsDesaturationSunrise=0.0 CloudsDesaturationDay=0.0 @@ -266,6 +267,22 @@ AmbientLightingIntensityDusk=0.77 AmbientLightingIntensityNight=0.71 AmbientLightingIntensityInteriorDay=0.17 AmbientLightingIntensityInteriorNight=0.12 +SkyAmbientTopIntensityDawn=0.18 +SkyAmbientTopIntensitySunrise=0.23 +SkyAmbientTopIntensityDay=0.31 +SkyAmbientTopIntensitySunset=0.22 +SkyAmbientTopIntensityDusk=0.16 +SkyAmbientTopIntensityNight=0.11 +SkyAmbientTopIntensityInteriorDay=0.06 +SkyAmbientTopIntensityInteriorNight=0.03 +SkyAmbientBottomIntensityDawn=0.13 +SkyAmbientBottomIntensitySunrise=0.18 +SkyAmbientBottomIntensityDay=0.22 +SkyAmbientBottomIntensitySunset=0.17 +SkyAmbientBottomIntensityDusk=0.11 +SkyAmbientBottomIntensityNight=0.08 +SkyAmbientBottomIntensityInteriorDay=0.03 +SkyAmbientBottomIntensityInteriorNight=0.01 [SSAO_SSIL] UseIndirectLighting=true SamplingQuality=1 @@ -280,6 +297,9 @@ AOMixingType=2 AOMixingTypeInterior=2 ResolutionScale=0.5 SourceTexturesScale=1.0 +UseComplexAmbientOcclusion=true +EnableComplexFilter=true +FilterBluriness=1 [FOG] IgnoreWeatherSystem=true DistanceFadeDawn=1.0 diff --git a/enbseries/VERSION b/enbseries/VERSION index eed5b27..caa5262 100644 --- a/enbseries/VERSION +++ b/enbseries/VERSION @@ -1 +1 @@ -3.4.1 "Who In Their Right Mind Would Frost A Cake With Their Butt" +3.4.2 "Who In Their Right Mind Would Frost A Cake With Their Butt" diff --git a/enbseries/enbbloom.fx.ini b/enbseries/enbbloom.fx.ini index f54a126..4f93e23 100644 --- a/enbseries/enbbloom.fx.ini +++ b/enbseries/enbbloom.fx.ini @@ -1,17 +1,17 @@ [ENBBLOOM.FX] TECHNIQUE=2 -Bloom Intensity Night=0.27 -Bloom Intensity Day=0.25 -Bloom Intensity Interior=0.29 +Bloom Intensity Night=0.64 +Bloom Intensity Day=0.55 +Bloom Intensity Interior=0.59 Bloom Contrast Night=0.94 Bloom Contrast Day=0.98 Bloom Contrast Interior=0.96 Bloom Saturation Night=1.45 Bloom Saturation Day=1.36 Bloom Saturation Interior=1.57 -Bloom Offset Night=0.0 -Bloom Offset Day=0.0 -Bloom Offset Interior=0.0 +Bloom Offset Night=-0.05 +Bloom Offset Day=-0.08 +Bloom Offset Interior=-0.02 Bloom Intensity Cap Night=25.0 Bloom Intensity Cap Day=25.0 Bloom Intensity Cap Interior=25.0 diff --git a/enbseries/enbdepthoffield.fx.ini b/enbseries/enbdepthoffield.fx.ini index 9d7f092..cfa8191 100644 --- a/enbseries/enbdepthoffield.fx.ini +++ b/enbseries/enbdepthoffield.fx.ini @@ -66,7 +66,7 @@ DOF Fixed Unfocus Intensity Interior=1.24 DOF Fixed Unfocus Contrast Night=96.980003 DOF Fixed Unfocus Contrast Day=134.399994 DOF Fixed Unfocus Contrast Interior=65.19001 -DOF Fixed Unfocus Shift Night=-0.95 +DOF Fixed Unfocus Shift Night=-0.92 DOF Fixed Unfocus Shift Day=-1.12 DOF Fixed Unfocus Shift Interior=-0.78 DOF Fixed Unfocus Blend Night=1.0 @@ -97,8 +97,8 @@ Edgevision Radius=1.0 Enable SSAO=false SSAO Radius=0.05 SSAO Noise=0 -SSAO Fade Contrast Night=0.95 -SSAO Fade Contrast Day=1.11 +SSAO Fade Contrast Night=0.65 +SSAO Fade Contrast Day=0.0 SSAO Fade Contrast Interior=0.89 SSAO Fade Intensity Night=10.5 SSAO Fade Intensity Day=12.5 diff --git a/enbseries/enbeffect.fx b/enbseries/enbeffect.fx index 84ab1f4..82a6fec 100644 --- a/enbseries/enbeffect.fx +++ b/enbseries/enbeffect.fx @@ -1022,7 +1022,7 @@ float2 ScreenFrost( float2 coord ) /*ofs *= max(0.0,coldfactor-warmfactor);*/ float dist = distance(coord,float2(0.5,0.5))*2.0; ofs *= clamp(pow(dist,frostrpow)*frostrmult+frostrbump,0.0,1.0); - return coord+ofs; + return ofs; } /* Old MariENB 0.x screen dirt filter, updated */ @@ -1049,7 +1049,6 @@ float4 PS_Draw( VS_OUTPUT_POST IN, float4 v0 : SV_Position0 ) : SV_Target if ( frostenable ) { float2 ofs = ScreenFrost(coord); - ofs -= coord; float2 ofr, ofg, ofb; ofr = ofs*(1.0-distcha*0.01); ofg = ofs; @@ -1076,7 +1075,7 @@ float4 PS_Draw( VS_OUTPUT_POST IN, float4 v0 : SV_Position0 ) : SV_Target 1.0)*frostblend; float todpow = max(0.0,todx_ind(frostfactor)); dist *= todpow; - /* Weathers not implemented in FO4 ENB as of 0.291 */ + /* Weathers not implemented in FO4 ENB as of 0.316 */ /*dist *= max(0.0,coldfactor-warmfactor);*/ res.rgb *= 1.0+bmp*dist; } diff --git a/enbseries/enbeffect.fx.ini b/enbseries/enbeffect.fx.ini index 305e7a3..6490bd3 100644 --- a/enbseries/enbeffect.fx.ini +++ b/enbseries/enbeffect.fx.ini @@ -2,15 +2,15 @@ TECHNIQUE=1 Fixed ResolutionX=1920 Fixed ResolutionY=1080 -Distortion Chromatic Aberration=9.45 +Distortion Chromatic Aberration=1.29 Enable Screen Frost=true -Frost Contrast=1.24 -Frost Strength=0.05 +Frost Contrast=0.24 +Frost Strength=0.37 Frost Radial Contrast=0.9 Frost Radial Intensity=0.86 Frost Radial Offset=-0.88 -Frost Texture Blend=2.23 -Frost Texture Blend Contrast=1.36 +Frost Texture Blend=2.15 +Frost Texture Blend Contrast=1.45 Frost Texture Size=1.0 Frost Factor Dawn=1.02 Frost Factor Sunrise=0.79 @@ -49,48 +49,48 @@ Uncharted2 Linear Strength Interior=1.41 Uncharted2 Linear Angle Night=0.72 Uncharted2 Linear Angle Day=0.68 Uncharted2 Linear Angle Interior=0.58 -Uncharted2 Toe Strength Night=1.18 +Uncharted2 Toe Strength Night=1.19 Uncharted2 Toe Strength Day=1.14 Uncharted2 Toe Strength Interior=1.35 Uncharted2 Toe Numerator Night=0.21 Uncharted2 Toe Numerator Day=0.28 Uncharted2 Toe Numerator Interior=0.23 -Uncharted2 Toe Denominator Night=1.31 +Uncharted2 Toe Denominator Night=1.35 Uncharted2 Toe Denominator Day=1.32 Uncharted2 Toe Denominator Interior=1.33 Uncharted2 Linear White Night=20.299999 Uncharted2 Linear White Day=24.139999 Uncharted2 Linear White Interior=22.130001 Enable RGB Grading=true -Grading Intensity Night=1.09, 0.98, 0.88 +Grading Intensity Night=1.03, 0.98, 0.88 Grading Intensity Day=1.04, 1, 0.94 Grading Intensity Interior=0.96, 0.93, 1.02 -Grading Contrast Night=1.03, 0.99, 0.88 +Grading Contrast Night=1.03, 0.99, 0.92 Grading Contrast Day=1, 0.98, 0.93 Grading Contrast Interior=0.94, 0.97, 1.02 Enable Vibrance Grading=true -Grading Color Night=-1.04, -0.32, -0.54 +Grading Color Night=-0.82, -0.39, -0.65 Grading Color Day=-0.43, -0.12, -0.7 Grading Color Interior=-0.61, -0.1, -0.43 -Grading Color Factor Night=-0.11 +Grading Color Factor Night=-0.13 Grading Color Factor Day=-0.1 Grading Color Factor Interior=-0.09 Enable HSV Grading=true Grading Saturation Intensity Night=1.09 Grading Saturation Intensity Day=1.13 Grading Saturation Intensity Interior=1.12 -Grading Saturation Contrast Night=1.39 +Grading Saturation Contrast Night=1.34 Grading Saturation Contrast Day=1.28 Grading Saturation Contrast Interior=1.13 -Grading Value Intensity Night=0.84 +Grading Value Intensity Night=0.85 Grading Value Intensity Day=0.92 Grading Value Intensity Interior=0.97 -Grading Value Contrast Night=1.24 +Grading Value Contrast Night=1.21 Grading Value Contrast Day=1.12 Grading Value Contrast Interior=1.16 Colorize After HSV=true Enable LUT Grading=true -LUT Blend Night=0.27 +LUT Blend Night=0.25 LUT Blend Day=0.32 LUT Blend Interior=0.39 Enable Technicolor=true diff --git a/enbseries/enbeffectpostpass.fx.ini b/enbseries/enbeffectpostpass.fx.ini index 7f76874..29860f9 100644 --- a/enbseries/enbeffectpostpass.fx.ini +++ b/enbseries/enbeffectpostpass.fx.ini @@ -15,9 +15,9 @@ Dither Range=0.1 Enable Chroma Key=false Chroma Key Red=0, 1, 0 Chroma Key Depth=0.99 -Enable Blur=false +Enable Blur=true Blur Sampling Range=0.2 -Enable Sharp=false +Enable Sharp=true Sharp Sampling Range=0.41 Sharpening Amount=1.76 Enable Shift=false diff --git a/enbseries/menbfrost.png b/enbseries/menbfrost.png index cb31b6a..78e8f9e 100644 Binary files a/enbseries/menbfrost.png and b/enbseries/menbfrost.png differ