1
Fork 0

MariENB FROST 3.2.6b

This commit is contained in:
Marisa the Magician 2019-04-07 17:52:18 +02:00
commit a7b7d1f31f
9 changed files with 143 additions and 84 deletions

View file

@ -13,7 +13,7 @@ EnableAdaptation=true
EnableBloom=true EnableBloom=true
EnableDepthOfField=true EnableDepthOfField=true
EnableLens=false EnableLens=false
EnableSSAO=false EnableSSAO=true
[COLORCORRECTION] [COLORCORRECTION]
UseProceduralCorrection=true UseProceduralCorrection=true
@ -282,57 +282,57 @@ AmbientLightingIntensityInteriorDay=0.15
AmbientLightingIntensityInteriorNight=0.12 AmbientLightingIntensityInteriorNight=0.12
[SSAO_SSIL] [SSAO_SSIL]
UseIndirectLighting=true UseIndirectLighting=true
ResolutionScale=1.0 ResolutionScale=0.5
SourceTexturesScale=0.5 SourceTexturesScale=0.5
SamplingQuality=0 SamplingQuality=1
SamplingRange=0.25 SamplingRange=0.25
AOIntensity=1.0 AOIntensity=0.91
AOIntensityInterior=1.0 AOIntensityInterior=0.82
AOAmount=0.5 AOAmount=1.22
AOAmountInterior=0.5 AOAmountInterior=1.15
ILAmount=4.0 ILAmount=2.89
ILAmountInterior=4.0 ILAmountInterior=2.78
AOMixingType=0 AOMixingType=2
AOMixingTypeInterior=0 AOMixingTypeInterior=3
[FOG] [FOG]
IgnoreWeatherSystem=true IgnoreWeatherSystem=true
DistanceFadeDawn=1.0 DistanceFadeDawn=0.32
DistanceFadeSunrise=1.0 DistanceFadeSunrise=0.44
DistanceFadeDay=1.0 DistanceFadeDay=0.52
DistanceFadeSunset=1.0 DistanceFadeSunset=0.41
DistanceFadeDusk=1.0 DistanceFadeDusk=0.31
DistanceFadeNight=1.0 DistanceFadeNight=0.26
DistanceFadeInteriorDay=1.0 DistanceFadeInteriorDay=0.43
DistanceFadeInteriorNight=1.0 DistanceFadeInteriorNight=0.33
VerticalFadeDawn=1.0 VerticalFadeDawn=0.25
VerticalFadeSunrise=1.0 VerticalFadeSunrise=0.34
VerticalFadeDay=1.0 VerticalFadeDay=0.45
VerticalFadeSunset=1.0 VerticalFadeSunset=0.37
VerticalFadeDusk=1.0 VerticalFadeDusk=0.24
VerticalFadeNight=1.0 VerticalFadeNight=0.16
VerticalFadeInteriorDay=1.0 VerticalFadeInteriorDay=0.82
VerticalFadeInteriorNight=1.0 VerticalFadeInteriorNight=0.64
SunIntensityDawn=1.0 SunIntensityDawn=0.35
SunIntensitySunrise=1.0 SunIntensitySunrise=0.47
SunIntensityDay=1.0 SunIntensityDay=0.62
SunIntensitySunset=1.0 SunIntensitySunset=0.46
SunIntensityDusk=1.0 SunIntensityDusk=0.33
SunIntensityNight=1.0 SunIntensityNight=0.21
SunIntensityInteriorDay=1.0 SunIntensityInteriorDay=0.75
SunIntensityInteriorNight=1.0 SunIntensityInteriorNight=0.1
SunDesaturationDawn=0.0 SunDesaturationDawn=0.56
SunDesaturationSunrise=0.0 SunDesaturationSunrise=0.47
SunDesaturationDay=0.0 SunDesaturationDay=0.35
SunDesaturationSunset=0.0 SunDesaturationSunset=0.48
SunDesaturationDusk=0.0 SunDesaturationDusk=0.57
SunDesaturationNight=0.0 SunDesaturationNight=0.64
SunDesaturationInteriorDay=0.0 SunDesaturationInteriorDay=0.33
SunDesaturationInteriorNight=0.0 SunDesaturationInteriorNight=0.56
SunColorFilterDawn=1, 1, 1 SunColorFilterDawn=0.812, 0.776, 0.996
SunColorFilterSunrise=1, 1, 1 SunColorFilterSunrise=0.831, 0.871, 0.996
SunColorFilterDay=1, 1, 1 SunColorFilterDay=0.886, 0.957, 0.996
SunColorFilterSunset=1, 1, 1 SunColorFilterSunset=0.859, 0.886, 0.992
SunColorFilterDusk=1, 1, 1 SunColorFilterDusk=0.812, 0.851, 0.992
SunColorFilterNight=1, 1, 1 SunColorFilterNight=0.678, 0.667, 0.957
SunColorFilterInteriorDay=1, 1, 1 SunColorFilterInteriorDay=1, 1, 1
SunColorFilterInteriorNight=1, 1, 1 SunColorFilterInteriorNight=1, 1, 1

View file

@ -1 +1 @@
3.2.5 BETA "Let Go" 3.2.6 BETA "Let Go"

View file

@ -1,8 +1,8 @@
[ENBBLOOM.FX] [ENBBLOOM.FX]
TECHNIQUE=2 TECHNIQUE=2
Bloom Intensity Night=0.12 Bloom Intensity Night=0.14
Bloom Intensity Day=0.08 Bloom Intensity Day=0.1
Bloom Intensity Interior=0.11 Bloom Intensity Interior=0.18
Bloom Contrast Night=1.02 Bloom Contrast Night=1.02
Bloom Contrast Day=1.04 Bloom Contrast Day=1.04
Bloom Contrast Interior=1.03 Bloom Contrast Interior=1.03
@ -27,7 +27,7 @@ Blue Shift Color Factor Per-pass=0.79
Enable Anamorphic Bloom=true Enable Anamorphic Bloom=true
Anamorphic Bloom Blend Night=0.44 Anamorphic Bloom Blend Night=0.44
Anamorphic Bloom Blend Day=0.33 Anamorphic Bloom Blend Day=0.33
Anamorphic Bloom Blend Interior=0.37 Anamorphic Bloom Blend Interior=0.36
Anamorphic Bloom Blue Shift Night=0.553, 0.404, 0.851 Anamorphic Bloom Blue Shift Night=0.553, 0.404, 0.851
Anamorphic Bloom Blue Shift Day=0.424, 0.384, 0.831 Anamorphic Bloom Blue Shift Day=0.424, 0.384, 0.831
Anamorphic Bloom Blue Shift Interior=0.537, 0.475, 0.89 Anamorphic Bloom Blue Shift Interior=0.537, 0.475, 0.89
@ -36,7 +36,7 @@ Anamorphic Bloom Blue Shift Intensity Day=0.28
Anamorphic Bloom Blue Shift Intensity Interior=0.34 Anamorphic Bloom Blue Shift Intensity Interior=0.34
Anamorphic Bloom Contrast Night=1.27 Anamorphic Bloom Contrast Night=1.27
Anamorphic Bloom Contrast Day=1.36 Anamorphic Bloom Contrast Day=1.36
Anamorphic Bloom Contrast Interior=1.36 Anamorphic Bloom Contrast Interior=1.19
Anamorphic Bloom Radius Multiplier=1.0 Anamorphic Bloom Radius Multiplier=1.0
Bloom Intensity Interior Night=1.33 Bloom Intensity Interior Night=1.33
Bloom Intensity Interior Day=1.26 Bloom Intensity Interior Day=1.26

View file

@ -557,9 +557,23 @@ float lutblend_i
string UIWidget = "Spinner"; string UIWidget = "Spinner";
> = {1.0}; > = {1.0};
#ifdef LUTMODE_LEGACY #ifdef LUTMODE_LEGACY
int clut int clut_n
< <
string UIName = "LUT Preset"; string UIName = "LUT Preset Night";
string UIWidget = "Spinner";
int UIMin = 0;
int UIMax = 63;
> = {1};
int clut_d
<
string UIName = "LUT Preset Day";
string UIWidget = "Spinner";
int UIMin = 0;
int UIMax = 63;
> = {1};
int clut_i
<
string UIName = "LUT Preset Interior";
string UIWidget = "Spinner"; string UIWidget = "Spinner";
int UIMin = 0; int UIMin = 0;
int UIMax = 63; int UIMax = 63;
@ -668,18 +682,40 @@ Texture2D TextureNoise3
< <
string ResourceName = "menbnoise2.png"; string ResourceName = "menbnoise2.png";
>; >;
#ifdef LUTMODE_LEGACY
Texture2D TextureLUT Texture2D TextureLUT
< <
#ifdef LUTMODE_LEGACY
string ResourceName = "menblutpreset.png"; string ResourceName = "menblutpreset.png";
#endif >;
#else
Texture2D TextureLUTN
<
#ifdef LUTMODE_16 #ifdef LUTMODE_16
string ResourceName = "menblut16.png"; string ResourceName = "menblut16_night.png";
#endif #endif
#ifdef LUTMODE_64 #ifdef LUTMODE_64
string ResourceName = "menblut64.png"; string ResourceName = "menblut64_night.png";
#endif #endif
>; >;
Texture2D TextureLUTD
<
#ifdef LUTMODE_16
string ResourceName = "menblut16_day.png";
#endif
#ifdef LUTMODE_64
string ResourceName = "menblut64_day.png";
#endif
>;
Texture2D TextureLUTI
<
#ifdef LUTMODE_16
string ResourceName = "menblut16_interior.png";
#endif
#ifdef LUTMODE_64
string ResourceName = "menblut64_interior.png";
#endif
>;
#endif
Texture2D TextureTonemap Texture2D TextureTonemap
< <
string ResourceName = "menbfilmlut.png"; string ResourceName = "menbfilmlut.png";
@ -919,12 +955,25 @@ float3 GradingLUT( float3 res )
float3 tcol = clamp(res,0.0001,0.9999); float3 tcol = clamp(res,0.0001,0.9999);
tcol.rg = tcol.rg*0.5+0.25; tcol.rg = tcol.rg*0.5+0.25;
#ifdef LUTMODE_LEGACY #ifdef LUTMODE_LEGACY
float2 lc1 = float2(tcol.r/16.0+floor(tcol.b*16.0)/16.0,tcol.g/64.0 float2 lc1 = float2(tcol.r/16.0+floor(tcol.b*16.0)/16.0,tcol.g/64.0);
+clut/64.0); float2 lc2 = float2(tcol.r/16.0+ceil(tcol.b*16.0)/16.0,tcol.g/64.0);
float2 lc2 = float2(tcol.r/16.0+ceil(tcol.b*16.0)/16.0,tcol.g/64.0
+clut/64.0);
float dec = (ceil(tcol.b*16.0)==16.0)?(0.0):frac(tcol.b*16.0); float dec = (ceil(tcol.b*16.0)==16.0)?(0.0):frac(tcol.b*16.0);
#endif /* night samples */
float3 tcl1_n = TextureLUT.Sample(SamplerLUT,lc1
+float2(0,clut_n/64.0)).rgb;
float3 tcl2_n = TextureLUT.Sample(SamplerLUT,lc2
+float2(0,clut_n/64.0)).rgb;
/* day samples */
float3 tcl1_d = TextureLUT.Sample(SamplerLUT,lc1
+float2(0,clut_d/64.0)).rgb;
float3 tcl2_d = TextureLUT.Sample(SamplerLUT,lc2
+float2(0,clut_d/64.0)).rgb;
/* interior samples */
float3 tcl1_i = TextureLUT.Sample(SamplerLUT,lc1
+float2(0,clut_i/64.0)).rgb;
float3 tcl2_i = TextureLUT.Sample(SamplerLUT,lc2
+float2(0,clut_i/64.0)).rgb;
#else
#ifdef LUTMODE_16 #ifdef LUTMODE_16
float2 lc1 = float2(tcol.r,tcol.g/16.0+floor(tcol.b*16.0)/16.0); float2 lc1 = float2(tcol.r,tcol.g/16.0+floor(tcol.b*16.0)/16.0);
float2 lc2 = float2(tcol.r,tcol.g/16.0+ceil(tcol.b*16.0)/16.0); float2 lc2 = float2(tcol.r,tcol.g/16.0+ceil(tcol.b*16.0)/16.0);
@ -935,8 +984,18 @@ float3 GradingLUT( float3 res )
float2 lc2 = float2(tcol.r,tcol.g/64.0+ceil(tcol.b*64.0)/64.0); float2 lc2 = float2(tcol.r,tcol.g/64.0+ceil(tcol.b*64.0)/64.0);
float dec = (ceil(tcol.b*64.0)==64.0)?(0.0):frac(tcol.b*64.0); float dec = (ceil(tcol.b*64.0)==64.0)?(0.0):frac(tcol.b*64.0);
#endif #endif
float3 tcl1 = TextureLUT.Sample(SamplerLUT,lc1).rgb; /* night samples */
float3 tcl2 = TextureLUT.Sample(SamplerLUT,lc2).rgb; float3 tcl1_n = TextureLUTN.Sample(SamplerLUT,lc1).rgb;
float3 tcl2_n = TextureLUTN.Sample(SamplerLUT,lc2).rgb;
/* day samples */
float3 tcl1_d = TextureLUTD.Sample(SamplerLUT,lc1).rgb;
float3 tcl2_d = TextureLUTD.Sample(SamplerLUT,lc2).rgb;
/* interior samples */
float3 tcl1_i = TextureLUTI.Sample(SamplerLUT,lc1).rgb;
float3 tcl2_i = TextureLUTI.Sample(SamplerLUT,lc2).rgb;
#endif
float3 tcl1 = tod_ind(tcl1);
float3 tcl2 = tod_ind(tcl2);
tcol = lerp(tcl1,tcl2,dec); tcol = lerp(tcl1,tcl2,dec);
float lutblend = tod_ind(lutblend); float lutblend = tod_ind(lutblend);
return lerp(res,tcol,lutblend); return lerp(res,tcol,lutblend);

View file

@ -2,34 +2,34 @@
TECHNIQUE=1 TECHNIQUE=1
Enable Grain=true Enable Grain=true
Grain Speed=25.0 Grain Speed=25.0
Grain Intensity=0.470001 Grain Intensity=0.650001
Grain Saturation=-0.35 Grain Saturation=-0.35
Grain Two-Pass=true Grain Two-Pass=true
Grain Blending Mode=3 Grain Blending Mode=3
Grain Dark Mask Contrast=22.160013 Grain Dark Mask Contrast=22.140013
Grain Two-Pass Factor=0.04 Grain Two-Pass Factor=0.04
Grain Magnification=13.3, 19.6, 17.4 Grain Magnification=13.3, 19.6, 17.4
Grain Pass 1 Magnification=2.05, 3.11, 2.22 Grain Pass 1 Magnification=2.05, 3.11, 2.22
Grain Pass 2 Magnification=4.25, 9.42, 6.29 Grain Pass 2 Magnification=4.25, 9.42, 6.29
Grain Contrast=5.86 Grain Contrast=8.450001
Tonemapping Method=3 Tonemapping Method=3
Uncharted2 Shoulder Strength Night=0.28 Uncharted2 Shoulder Strength Night=0.28
Uncharted2 Shoulder Strength Day=0.23 Uncharted2 Shoulder Strength Day=0.21
Uncharted2 Shoulder Strength Interior=0.25 Uncharted2 Shoulder Strength Interior=0.25
Uncharted2 Linear Strength Night=0.37 Uncharted2 Linear Strength Night=0.37
Uncharted2 Linear Strength Day=0.43 Uncharted2 Linear Strength Day=0.36
Uncharted2 Linear Strength Interior=0.41 Uncharted2 Linear Strength Interior=0.41
Uncharted2 Linear Angle Night=0.37 Uncharted2 Linear Angle Night=0.37
Uncharted2 Linear Angle Day=0.49 Uncharted2 Linear Angle Day=0.46
Uncharted2 Linear Angle Interior=0.42 Uncharted2 Linear Angle Interior=0.42
Uncharted2 Toe Strength Night=0.22 Uncharted2 Toe Strength Night=0.22
Uncharted2 Toe Strength Day=0.29 Uncharted2 Toe Strength Day=0.33
Uncharted2 Toe Strength Interior=0.26 Uncharted2 Toe Strength Interior=0.26
Uncharted2 Toe Numerator Night=0.0 Uncharted2 Toe Numerator Night=0.0
Uncharted2 Toe Numerator Day=0.0 Uncharted2 Toe Numerator Day=0.0
Uncharted2 Toe Numerator Interior=0.0 Uncharted2 Toe Numerator Interior=0.0
Uncharted2 Toe Denominator Night=0.44 Uncharted2 Toe Denominator Night=0.44
Uncharted2 Toe Denominator Day=0.39 Uncharted2 Toe Denominator Day=0.48
Uncharted2 Toe Denominator Interior=0.42 Uncharted2 Toe Denominator Interior=0.42
Uncharted2 Linear White Night=13.179999 Uncharted2 Linear White Night=13.179999
Uncharted2 Linear White Day=15.59 Uncharted2 Linear White Day=15.59
@ -49,23 +49,23 @@ Grading Color Factor Night=-0.08
Grading Color Factor Day=-0.1 Grading Color Factor Day=-0.1
Grading Color Factor Interior=-0.06 Grading Color Factor Interior=-0.06
Enable HSV Grading=true Enable HSV Grading=true
Grading Saturation Intensity Night=1.17 Grading Saturation Intensity Night=1.18
Grading Saturation Intensity Day=1.34 Grading Saturation Intensity Day=1.15
Grading Saturation Intensity Interior=1.23 Grading Saturation Intensity Interior=1.23
Grading Saturation Contrast Night=1.17 Grading Saturation Contrast Night=1.17
Grading Saturation Contrast Day=1.09 Grading Saturation Contrast Day=1.22
Grading Saturation Contrast Interior=1.13 Grading Saturation Contrast Interior=1.12
Grading Value Intensity Night=0.98 Grading Value Intensity Night=0.98
Grading Value Intensity Day=0.94 Grading Value Intensity Day=0.94
Grading Value Intensity Interior=0.96 Grading Value Intensity Interior=0.96
Grading Value Contrast Night=1.18 Grading Value Contrast Night=1.18
Grading Value Contrast Day=1.21 Grading Value Contrast Day=1.27
Grading Value Contrast Interior=1.22 Grading Value Contrast Interior=1.22
Colorize After HSV=true Colorize After HSV=true
Enable LUT Grading=true Enable LUT Grading=true
LUT Blend Night=0.21 LUT Blend Night=0.36
LUT Blend Day=0.25 LUT Blend Day=0.27
LUT Blend Interior=0.19 LUT Blend Interior=0.44
Enable Post Dither=false Enable Post Dither=false
Dither Pattern=4 Dither Pattern=4
Display Bloom=false Display Bloom=false
@ -178,7 +178,7 @@ Tonemap Linear White Night=4.48
Tonemap Linear White Day=4.68 Tonemap Linear White Day=4.68
Tonemap Linear White Interior=4.769999 Tonemap Linear White Interior=4.769999
Tonemap Exposure Night=0.79 Tonemap Exposure Night=0.79
Tonemap Exposure Day=0.63 Tonemap Exposure Day=0.64
Tonemap Exposure Interior=0.68 Tonemap Exposure Interior=0.68
Tonemap Blend Night=1.0 Tonemap Blend Night=1.0
Tonemap Blend Day=1.0 Tonemap Blend Day=1.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
enbseries/menblut64_day.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB