diff --git a/enbseries.ini b/enbseries.ini index b9bd354..0d4b98a 100644 --- a/enbseries.ini +++ b/enbseries.ini @@ -21,11 +21,11 @@ Brightness=1.0 GammaCurve=1.0 [TIMEOFDAY] -DawnDuration=1.0 -SunriseTime=7.5 +DawnDuration=2.0 +SunriseTime=7.0 DayTime=12.0 -SunsetTime=17.5 -DuskDuration=1.0 +SunsetTime=18.0 +DuskDuration=2.0 NightTime=0.0 [ADAPTATION] @@ -33,7 +33,7 @@ AdaptationSensitivity=0.2 AdaptationTime=0.65 ForceMinMaxValues=true AdaptationMin=0.0 -AdaptationMax=0.25 +AdaptationMax=0.35 [DEPTHOFFIELD] FocusingTime=0.4 @@ -69,7 +69,7 @@ GradientIntensitySunrise=1.12 GradientIntensityDay=1.18 GradientIntensitySunset=1.100001 GradientIntensityDusk=1.040001 -GradientIntensityNight=1.010001 +GradientIntensityNight=1.040001 GradientIntensityInteriorDay=1.18 GradientIntensityInteriorNight=1.03 GradientDesaturationDawn=0.04 @@ -131,15 +131,15 @@ GradientMiddleColorFilterNight=0.757, 0.871, 0.992 GradientMiddleColorFilterInteriorDay=0.82, 0.878, 0.969 GradientMiddleColorFilterInteriorNight=0.737, 0.733, 0.984 -GradientHorizonIntensityDawn=0.56 -GradientHorizonIntensitySunrise=0.71 -GradientHorizonIntensityDay=0.870001 -GradientHorizonIntensitySunset=0.71 -GradientHorizonIntensityDusk=0.57 -GradientHorizonIntensityNight=0.110001 +GradientHorizonIntensityDawn=0.75 +GradientHorizonIntensitySunrise=0.81 +GradientHorizonIntensityDay=0.930001 +GradientHorizonIntensitySunset=0.83 +GradientHorizonIntensityDusk=0.74 +GradientHorizonIntensityNight=0.640001 GradientHorizonIntensityInteriorDay=1.0 -GradientHorizonIntensityInteriorNight=0.93 -GradientHorizonCurveDawn=0.62 +GradientHorizonIntensityInteriorNight=0.66 +GradientHorizonCurveDawn=0.65 GradientHorizonCurveSunrise=0.84 GradientHorizonCurveDay=0.92 GradientHorizonCurveSunset=0.85 @@ -161,9 +161,9 @@ CloudsIntensitySunrise=0.950001 CloudsIntensityDay=1.030001 CloudsIntensitySunset=0.920001 CloudsIntensityDusk=0.760001 -CloudsIntensityNight=0.610001 +CloudsIntensityNight=0.290001 CloudsIntensityInteriorDay=1.0 -CloudsIntensityInteriorNight=0.62 +CloudsIntensityInteriorNight=0.33 CloudsCurveDawn=1.13 CloudsCurveSunrise=1.09 CloudsCurveDay=1.0 @@ -201,7 +201,7 @@ SunIntensityDawn=1.91 SunIntensitySunrise=2.45 SunIntensityDay=2.02 SunIntensitySunset=2.43 -SunIntensityDusk=1.95 +SunIntensityDusk=1.97 SunIntensityNight=1.15 SunIntensityInteriorDay=2.02 SunIntensityInteriorNight=1.19 @@ -215,9 +215,9 @@ SunDesaturationInteriorDay=0.35 SunDesaturationInteriorNight=0.22 SunColorFilterDawn=0.992, 0.537, 0.412 SunColorFilterSunrise=0.996, 0.831, 0.729 -SunColorFilterDay=1, 0.894, 0.71 -SunColorFilterSunset=0.992, 0.749, 0.608 -SunColorFilterDusk=0.961, 0.451, 0.396 +SunColorFilterDay=1, 0.898, 0.718 +SunColorFilterSunset=0.992, 0.765, 0.631 +SunColorFilterDusk=0.965, 0.447, 0.4 SunColorFilterNight=0.914, 0.145, 0.145 SunColorFilterInteriorDay=0.996, 0.827, 0.706 SunColorFilterInteriorNight=0.816, 0.114, 0.0784 @@ -253,7 +253,7 @@ DirectLightingIntensitySunrise=1.47 DirectLightingIntensityDay=1.71 DirectLightingIntensitySunset=1.52 DirectLightingIntensityDusk=1.27 -DirectLightingIntensityNight=1.05 +DirectLightingIntensityNight=1.13 DirectLightingIntensityInteriorDay=1.64 DirectLightingIntensityInteriorNight=1.09 DirectLightingDesaturationDawn=0.16 @@ -277,7 +277,7 @@ AmbientLightingIntensitySunrise=0.71 AmbientLightingIntensityDay=0.9 AmbientLightingIntensitySunset=0.72 AmbientLightingIntensityDusk=0.46 -AmbientLightingIntensityNight=0.13 +AmbientLightingIntensityNight=0.28 AmbientLightingIntensityInteriorDay=0.15 AmbientLightingIntensityInteriorNight=0.12 [SSAO_SSIL] diff --git a/enbseries/VERSION b/enbseries/VERSION index d08c1ec..c34bc3d 100644 --- a/enbseries/VERSION +++ b/enbseries/VERSION @@ -1 +1 @@ -3.2.1 BETA "Let Go" +3.2.2 BETA "Let Go" diff --git a/enbseries/enbbloom.fx b/enbseries/enbbloom.fx index 13455ea..485076e 100644 --- a/enbseries/enbbloom.fx +++ b/enbseries/enbbloom.fx @@ -554,7 +554,6 @@ technique11 BloomSimplePass { pass p0 @@ -587,24 +586,7 @@ technique11 BloomSimplePass4 SetPixelShader(CompileShader(ps_5_0,PS_Downsize(RenderTarget256,256.0))); } } -technique11 BloomSimplePass5 -{ - pass p0 - { - SetVertexShader(CompileShader(vs_5_0,VS_Quad())); - SetPixelShader(CompileShader(ps_5_0,PS_Downsize(RenderTarget128,128.0))); - } -} -technique11 BloomSimplePass6 -{ - pass p0 - { - SetVertexShader(CompileShader(vs_5_0,VS_Quad())); - SetPixelShader(CompileShader(ps_5_0,PS_Downsize(RenderTarget64,64.0))); - } -} - -technique11 BloomSimplePass7 +technique11 BloomSimplePass5 { pass p0 { @@ -612,7 +594,7 @@ technique11 BloomSimplePass7 SetPixelShader(CompileShader(ps_5_0,PS_HorizontalBlur(RenderTarget128,128.0))); } } -technique11 BloomSimplePass8 +technique11 BloomSimplePass6 { pass p0 { @@ -620,25 +602,7 @@ technique11 BloomSimplePass8 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,128.0,3.0))); } } - -technique11 BloomSimplePass9 -{ - pass p0 - { - SetVertexShader(CompileShader(vs_5_0,VS_Quad())); - SetPixelShader(CompileShader(ps_5_0,PS_HorizontalBlur(RenderTarget32,32.0))); - } -} -technique11 BloomSimplePass10 -{ - pass p0 - { - SetVertexShader(CompileShader(vs_5_0,VS_Quad())); - SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,32.0,5.0))); - } -} - -technique11 BloomSimplePass11 +technique11 BloomSimplePass7 { pass p0 { @@ -655,7 +619,6 @@ technique11 BloomPass { pass p0 @@ -704,7 +667,6 @@ technique11 BloomPass6 SetPixelShader(CompileShader(ps_5_0,PS_Downsize(RenderTarget64,64.0))); } } - technique11 BloomPass7 { pass p0 @@ -721,7 +683,6 @@ technique11 BloomPass8 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,1024.0,0.0))); } } - technique11 BloomPass9 { pass p0 @@ -738,7 +699,6 @@ technique11 BloomPass10 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,512.0,1.0))); } } - technique11 BloomPass11 { pass p0 @@ -755,7 +715,6 @@ technique11 BloomPass12 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,256.0,2.0))); } } - technique11 BloomPass13 { pass p0 @@ -772,7 +731,6 @@ technique11 BloomPass14 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,128.0,3.0))); } } - technique11 BloomPass15 { pass p0 @@ -789,7 +747,6 @@ technique11 BloomPass16 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,64.0,4.0))); } } - technique11 BloomPass17 { pass p0 @@ -806,7 +763,6 @@ technique11 BloomPass18 SetPixelShader(CompileShader(ps_5_0,PS_VerticalBlur(TextureColor,32.0,5.0))); } } - technique11 BloomPass19 { pass p0 diff --git a/enbseries/enbbloom.fx.ini b/enbseries/enbbloom.fx.ini index 81179c5..87617e6 100644 --- a/enbseries/enbbloom.fx.ini +++ b/enbseries/enbbloom.fx.ini @@ -1,17 +1,17 @@ [ENBBLOOM.FX] TECHNIQUE=2 -Bloom Intensity Night=0.33 -Bloom Intensity Day=0.25 -Bloom Intensity Interior=0.29 -Bloom Contrast Night=0.94 -Bloom Contrast Day=0.98 -Bloom Contrast Interior=0.94 +Bloom Intensity Night=0.4 +Bloom Intensity Day=0.31 +Bloom Intensity Interior=0.35 +Bloom Contrast Night=1.01 +Bloom Contrast Day=1.08 +Bloom Contrast Interior=1.04 Bloom Saturation Night=0.97 Bloom Saturation Day=0.93 Bloom Saturation Interior=0.95 -Bloom Offset Night=-0.03 -Bloom Offset Day=-0.07 -Bloom Offset Interior=-0.04 +Bloom Offset Night=-0.11 +Bloom Offset Day=-0.15 +Bloom Offset Interior=-0.12 Bloom Intensity Cap Night=2.0 Bloom Intensity Cap Day=2.0 Bloom Intensity Cap Interior=2.0 @@ -34,10 +34,10 @@ Anamorphic Bloom Blue Shift Interior=0.537, 0.475, 0.89 Anamorphic Bloom Blue Shift Intensity Night=0.44 Anamorphic Bloom Blue Shift Intensity Day=0.36 Anamorphic Bloom Blue Shift Intensity Interior=0.4 -Anamorphic Bloom Contrast Night=1.4 -Anamorphic Bloom Contrast Day=1.43 -Anamorphic Bloom Contrast Interior=1.44 -Anamorphic Bloom Radius Multiplier=1.0 +Anamorphic Bloom Contrast Night=1.25 +Anamorphic Bloom Contrast Day=1.36 +Anamorphic Bloom Contrast Interior=1.3 +Anamorphic Bloom Radius Multiplier=2.5 Bloom Intensity Interior Night=1.33 Bloom Intensity Interior Day=1.26 Bloom Contrast Interior Night=0.73 @@ -80,12 +80,12 @@ Anamorphic Bloom Blue Shift Interior Night=1.86 Anamorphic Bloom Blue Shift Interior Day=1.86 Anamorphic Bloom Contrast Interior Night=1.12 Anamorphic Bloom Contrast Interior Day=1.22 -Bloom Pass 1 Blend=0.91 -Bloom Pass 2 Blend=0.85 -Bloom Pass 3 Blend=0.76 -Bloom Pass 4 Blend=0.54 -Bloom Pass 5 Blend=0.43 -Bloom Pass 6 Blend=0.35 +Bloom Pass 1 Blend=0.31 +Bloom Pass 2 Blend=0.44 +Bloom Pass 3 Blend=0.61 +Bloom Pass 4 Blend=0.74 +Bloom Pass 5 Blend=1.09 +Bloom Pass 6 Blend=1.35 Enable Lens Dirt=false Dirt Pass 1 Blend=0.08 Dirt Pass 2 Blend=0.25 diff --git a/enbseries/enbeffect.fx.ini b/enbseries/enbeffect.fx.ini index 1a9230e..99b08c4 100644 --- a/enbseries/enbeffect.fx.ini +++ b/enbseries/enbeffect.fx.ini @@ -1,9 +1,9 @@ [ENBEFFECT.FX] TECHNIQUE=1 Enable Grain=true -Grain Speed=25.0 -Grain Intensity=0.6 -Grain Saturation=-0.64 +Grain Speed=15.0 +Grain Intensity=0.38 +Grain Saturation=-0.32 Grain Two-Pass=true Grain Blending Mode=3 Grain Dark Mask Contrast=45.689999 @@ -11,29 +11,29 @@ Grain Two-Pass Factor=0.04 Grain Magnification=13.3, 19.6, 17.4 Grain Pass 1 Magnification=2.05, 3.11, 2.22 Grain Pass 2 Magnification=4.25, 9.42, 6.29 -Grain Contrast=4.27 +Grain Contrast=5.47 Enable Tonemapping=true Tonemap Shoulder Strength Night=0.55 -Tonemap Shoulder Strength Day=0.5 -Tonemap Shoulder Strength Interior=0.66 -Tonemap Linear Strength Night=1.29 -Tonemap Linear Strength Day=1.2 +Tonemap Shoulder Strength Day=0.42 +Tonemap Shoulder Strength Interior=0.61 +Tonemap Linear Strength Night=1.16 +Tonemap Linear Strength Day=1.08 Tonemap Linear Strength Interior=1.14 Tonemap Linear Angle Night=0.53 -Tonemap Linear Angle Day=0.59 -Tonemap Linear Angle Interior=0.35 -Tonemap Toe Strength Night=1.18 -Tonemap Toe Strength Day=1.34 -Tonemap Toe Strength Interior=1.37 -Tonemap Toe Numerator Night=2.43 -Tonemap Toe Numerator Day=2.65 -Tonemap Toe Numerator Interior=2.55 -Tonemap Toe Denominator Night=1.18 -Tonemap Toe Denominator Day=1.22 -Tonemap Toe Denominator Interior=1.11 -Tonemap Linear White Night=2.51 -Tonemap Linear White Day=2.35 -Tonemap Linear White Interior=1.739999 +Tonemap Linear Angle Day=0.74 +Tonemap Linear Angle Interior=0.63 +Tonemap Toe Strength Night=1.56 +Tonemap Toe Strength Day=1.62 +Tonemap Toe Strength Interior=1.42 +Tonemap Toe Numerator Night=2.5 +Tonemap Toe Numerator Day=2.84 +Tonemap Toe Numerator Interior=2.73 +Tonemap Toe Denominator Night=1.27 +Tonemap Toe Denominator Day=1.38 +Tonemap Toe Denominator Interior=1.25 +Tonemap Linear White Night=4.42 +Tonemap Linear White Day=4.69 +Tonemap Linear White Interior=4.779999 Enable RGB Grading=true Grading Intensity Night=0.97, 0.95, 1 Grading Intensity Day=0.97, 0.95, 0.93 @@ -43,29 +43,29 @@ Grading Contrast Day=0.96, 0.95, 0.93 Grading Contrast Interior=0.98, 0.95, 0.88 Enable Vibrance Grading=true Grading Color Night=-0.44, -0.18, -1.02 -Grading Color Day=-0.04, -0.06, -0.74 +Grading Color Day=-0.04, -0.12, -0.89 Grading Color Interior=-0.2, -0.05, -0.82 Grading Color Factor Night=-0.08 -Grading Color Factor Day=-0.11 +Grading Color Factor Day=-0.13 Grading Color Factor Interior=-0.1 Enable HSV Grading=true Grading Saturation Intensity Night=1.13 -Grading Saturation Intensity Day=1.07 +Grading Saturation Intensity Day=1.17 Grading Saturation Intensity Interior=1.09 Grading Saturation Contrast Night=1.28 -Grading Saturation Contrast Day=1.13 +Grading Saturation Contrast Day=1.17 Grading Saturation Contrast Interior=1.17 -Grading Value Intensity Night=0.87 -Grading Value Intensity Day=0.91 -Grading Value Intensity Interior=0.93 -Grading Value Contrast Night=1.15 -Grading Value Contrast Day=1.06 -Grading Value Contrast Interior=1.03 +Grading Value Intensity Night=0.91 +Grading Value Intensity Day=0.97 +Grading Value Intensity Interior=0.96 +Grading Value Contrast Night=1.21 +Grading Value Contrast Day=1.15 +Grading Value Contrast Interior=1.08 Colorize After HSV=true Enable LUT Grading=true LUT Blend Night=0.24 -LUT Blend Day=0.3 -LUT Blend Interior=0.27 +LUT Blend Day=0.29 +LUT Blend Interior=0.19 Enable Post Dither=false Dither Pattern=4 Display Bloom=false @@ -142,9 +142,9 @@ LUT Blend Interior Night=0.39 LUT Blend Interior Day=0.45 Display Adaptation=false Enable Technicolor=true -Technicolor Blend=0.6 +Technicolor Blend=0.65 Apply Grain Before Tone Mapping=true Enable Adaptation=true -Enable Vanilla Tone Mapping=true +Enable Vanilla Tone Mapping=false Enable Vanilla Imagespace=true Use Lighten Blend=false diff --git a/enbseries/enbeffectpostpass.fx b/enbseries/enbeffectpostpass.fx index 5c4c70d..368b1b8 100644 --- a/enbseries/enbeffectpostpass.fx +++ b/enbseries/enbeffectpostpass.fx @@ -143,25 +143,6 @@ float bdmult string UIWidget = "Spinner"; float UIMin = 0.0; > = {0.25}; -/* ASCII art filter */ -string str_ascii = "Luma ASCII Art Filter"; -bool asciienable -< - string UIName = "Enable ASCII"; - string UIWidget = "Checkbox"; -> = {false}; -bool asciimono -< - string UIName = "ASCII Monochrome"; - string UIWidget = "Checkbox"; -> = {true}; -float asciiblend -< - string UIName = "ASCII Blend"; - string UIWidget = "Spinner"; - float UIMin = 0.0; - float UIMax = 1.0; -> = {0.0}; string str_mask = "Depth Chroma Key"; bool maskenable < @@ -180,64 +161,6 @@ float maskd float UIMin = 0.0; float UIMax = 1.0; > = {0.5}; -string str_dot = "RGBI Dot Matrix"; -bool dotenable -< - string UIName = "Enable Dot Matrix"; - string UIWidget = "Checkbox"; -> = {false}; -int dotsize -< - string UIName = "Dot Size"; - string UIWidget = "Spinner"; - int UIMin = 1; -> = {1}; -float dotblend -< - string UIName = "Dot Blend"; - string UIWidget = "Spinner"; - float UIMin = 0.0; - float UIMax = 1.0; -> = {0.4}; -float dotmult -< - string UIName = "Dot Intensity"; - string UIWidget = "Spinner"; - float UIMin = 0.0; -> = {1.0}; -float dotpow -< - string UIName = "Dot Contrast"; - string UIWidget = "Spinner"; - float UIMin = 0.0; -> = {1.0}; -string str_curve = "Lens Curvature"; -bool curveenable -< - string UIName = "Enable Curvature"; - string UIWidget = "Checkbox"; -> = {false}; -float chromaab -< - string UIName = "Curve Chromatic Aberration"; - string UIWidget = "Spinner"; -> = {0.0}; -float lenszoom -< - string UIName = "Curve Zooming"; - string UIWidget = "Spinner"; -> = {50.0}; -float lensdist -< - string UIName = "Curve Distortion"; - string UIWidget = "Spinner"; -> = {0.0}; -float curvesoft -< - string UIName = "Curve Sampling Soften"; - string UIWidget = "Spinner"; - float UIMin = 0.0; -> = {0.0}; /* BlurSharpShift, some people are obsessed with this nonsense */ string str_bss = "BlurSharpShift"; bool bssblurenable diff --git a/enbseries/menblut64.png b/enbseries/menblut64.png index 1c58d5f..82a7894 100644 Binary files a/enbseries/menblut64.png and b/enbseries/menblut64.png differ