1
Fork 0

MariENB FROST 3.2.3b

This commit is contained in:
Marisa the Magician 2019-04-07 17:51:46 +02:00
commit f6386ceba6
7 changed files with 276 additions and 178 deletions

View file

@ -32,7 +32,7 @@ NightTime=0.0
AdaptationSensitivity=0.2
AdaptationTime=0.65
ForceMinMaxValues=true
AdaptationMin=0.0
AdaptationMin=0.1
AdaptationMax=0.35
[DEPTHOFFIELD]
@ -69,7 +69,7 @@ GradientIntensitySunrise=1.12
GradientIntensityDay=1.18
GradientIntensitySunset=1.100001
GradientIntensityDusk=1.040001
GradientIntensityNight=1.040001
GradientIntensityNight=1.020001
GradientIntensityInteriorDay=1.18
GradientIntensityInteriorNight=1.03
GradientDesaturationDawn=0.04
@ -97,70 +97,70 @@ GradientTopCurveDusk=0.86
GradientTopCurveNight=0.89
GradientTopCurveInteriorDay=0.98
GradientTopCurveInteriorNight=0.82
GradientTopColorFilterDawn=0.886, 0.773, 0.969
GradientTopColorFilterSunrise=0.812, 0.859, 0.953
GradientTopColorFilterDawn=0.949, 0.839, 0.98
GradientTopColorFilterSunrise=0.851, 0.855, 0.961
GradientTopColorFilterDay=0.941, 0.992, 0.996
GradientTopColorFilterSunset=0.839, 0.875, 0.949
GradientTopColorFilterDusk=0.902, 0.824, 0.965
GradientTopColorFilterNight=0.718, 0.702, 0.937
GradientTopColorFilterSunset=0.882, 0.875, 0.961
GradientTopColorFilterDusk=0.914, 0.827, 0.969
GradientTopColorFilterNight=0.827, 0.82, 0.961
GradientTopColorFilterInteriorDay=0.949, 0.996, 0.992
GradientTopColorFilterInteriorNight=0.898, 0.835, 0.906
GradientMiddleIntensityDawn=0.92
GradientMiddleIntensitySunrise=0.95
GradientMiddleIntensityDay=0.99
GradientMiddleIntensityDay=1.02
GradientMiddleIntensitySunset=0.96
GradientMiddleIntensityDusk=0.91
GradientMiddleIntensityNight=0.88
GradientMiddleIntensityInteriorDay=1.0
GradientMiddleIntensityInteriorNight=0.87
GradientMiddleCurveDawn=0.86
GradientMiddleCurveSunrise=0.85
GradientMiddleCurveDay=0.93
GradientMiddleCurveSunset=0.85
GradientMiddleCurveDusk=0.8
GradientMiddleCurveNight=0.76
GradientMiddleCurveInteriorDay=0.9
GradientMiddleCurveInteriorNight=0.73
GradientMiddleColorFilterDawn=0.78, 0.753, 0.988
GradientMiddleColorFilterSunrise=0.729, 0.843, 0.988
GradientMiddleCurveDawn=0.93
GradientMiddleCurveSunrise=0.96
GradientMiddleCurveDay=1.02
GradientMiddleCurveSunset=0.95
GradientMiddleCurveDusk=0.92
GradientMiddleCurveNight=0.88
GradientMiddleCurveInteriorDay=1.05
GradientMiddleCurveInteriorNight=0.87
GradientMiddleColorFilterDawn=0.945, 0.859, 0.992
GradientMiddleColorFilterSunrise=0.886, 0.894, 0.996
GradientMiddleColorFilterDay=0.847, 0.914, 0.957
GradientMiddleColorFilterSunset=0.792, 0.835, 0.973
GradientMiddleColorFilterDusk=0.733, 0.741, 0.984
GradientMiddleColorFilterNight=0.757, 0.871, 0.992
GradientMiddleColorFilterInteriorDay=0.82, 0.878, 0.969
GradientMiddleColorFilterInteriorNight=0.737, 0.733, 0.984
GradientMiddleColorFilterSunset=0.937, 0.914, 0.992
GradientMiddleColorFilterDusk=0.961, 0.875, 0.992
GradientMiddleColorFilterNight=0.847, 0.922, 0.996
GradientMiddleColorFilterInteriorDay=0.898, 0.933, 0.984
GradientMiddleColorFilterInteriorNight=0.867, 0.867, 0.992
GradientHorizonIntensityDawn=0.75
GradientHorizonIntensitySunrise=0.81
GradientHorizonIntensityDay=0.930001
GradientHorizonIntensitySunset=0.83
GradientHorizonIntensityDusk=0.74
GradientHorizonIntensityDusk=0.78
GradientHorizonIntensityNight=0.640001
GradientHorizonIntensityInteriorDay=1.0
GradientHorizonIntensityInteriorNight=0.66
GradientHorizonCurveDawn=0.65
GradientHorizonCurveSunrise=0.84
GradientHorizonCurveDawn=0.82
GradientHorizonCurveSunrise=0.86
GradientHorizonCurveDay=0.92
GradientHorizonCurveSunset=0.85
GradientHorizonCurveDusk=0.6
GradientHorizonCurveNight=0.55
GradientHorizonCurveSunset=0.87
GradientHorizonCurveDusk=0.83
GradientHorizonCurveNight=0.78
GradientHorizonCurveInteriorDay=0.9
GradientHorizonCurveInteriorNight=0.98
GradientHorizonColorFilterDawn=0.757, 0.792, 0.882
GradientHorizonColorFilterSunrise=0.875, 0.929, 0.992
GradientHorizonColorFilterDay=0.89, 0.984, 0.961
GradientHorizonColorFilterSunset=0.757, 0.878, 0.976
GradientHorizonColorFilterDusk=0.882, 0.89, 0.953
GradientHorizonColorFilterNight=0.624, 0.796, 0.976
GradientHorizonColorFilterDawn=0.906, 0.859, 0.929
GradientHorizonColorFilterSunrise=0.902, 0.882, 0.992
GradientHorizonColorFilterDay=0.918, 0.988, 0.973
GradientHorizonColorFilterSunset=0.898, 0.859, 0.984
GradientHorizonColorFilterDusk=0.925, 0.882, 0.953
GradientHorizonColorFilterNight=0.78, 0.882, 0.984
GradientHorizonColorFilterInteriorDay=0.788, 0.91, 0.953
GradientHorizonColorFilterInteriorNight=0.851, 0.863, 0.89
CloudsIntensityDawn=0.71
CloudsIntensityDawn=0.58
CloudsIntensitySunrise=0.950001
CloudsIntensityDay=1.030001
CloudsIntensitySunset=0.920001
CloudsIntensityDusk=0.760001
CloudsIntensitySunset=0.880001
CloudsIntensityDusk=0.550001
CloudsIntensityNight=0.290001
CloudsIntensityInteriorDay=1.0
CloudsIntensityInteriorNight=0.33
@ -168,32 +168,32 @@ CloudsCurveDawn=1.13
CloudsCurveSunrise=1.09
CloudsCurveDay=1.0
CloudsCurveSunset=1.1
CloudsCurveDusk=1.19
CloudsCurveDusk=1.2
CloudsCurveNight=1.25
CloudsCurveInteriorDay=1.02
CloudsCurveInteriorNight=1.2
CloudsDesaturationDawn=0.28
CloudsDesaturationDawn=0.16
CloudsDesaturationSunrise=0.22
CloudsDesaturationDay=0.33
CloudsDesaturationSunset=0.21
CloudsDesaturationDusk=0.26
CloudsDesaturationNight=0.13
CloudsDesaturationDusk=0.19
CloudsDesaturationNight=0.11
CloudsDesaturationInteriorDay=0.31
CloudsDesaturationInteriorNight=0.28
CloudsOpacityDawn=0.81
CloudsOpacitySunrise=0.89
CloudsOpacityDay=0.93
CloudsOpacitySunset=0.89
CloudsOpacityDusk=0.82
CloudsOpacityNight=0.73
CloudsOpacityInteriorDay=0.97
CloudsOpacityInteriorNight=0.71
CloudsColorFilterDawn=0.796, 0.757, 0.992
CloudsColorFilterSunrise=0.792, 0.816, 0.973
CloudsDesaturationInteriorNight=0.12
CloudsOpacityDawn=1.0
CloudsOpacitySunrise=1.0
CloudsOpacityDay=1.0
CloudsOpacitySunset=1.0
CloudsOpacityDusk=1.0
CloudsOpacityNight=1.0
CloudsOpacityInteriorDay=1.0
CloudsOpacityInteriorNight=1.0
CloudsColorFilterDawn=0.984, 0.855, 0.996
CloudsColorFilterSunrise=0.867, 0.882, 0.984
CloudsColorFilterDay=0.937, 0.965, 0.984
CloudsColorFilterSunset=0.729, 0.839, 0.965
CloudsColorFilterDusk=0.773, 0.78, 0.984
CloudsColorFilterNight=0.804, 0.871, 0.976
CloudsColorFilterSunset=0.855, 0.851, 0.984
CloudsColorFilterDusk=0.945, 0.831, 0.988
CloudsColorFilterNight=0.839, 0.886, 0.98
CloudsColorFilterInteriorDay=0.788, 0.886, 0.914
CloudsColorFilterInteriorNight=0.792, 0.808, 0.957
@ -222,14 +222,14 @@ SunColorFilterNight=0.914, 0.145, 0.145
SunColorFilterInteriorDay=0.996, 0.827, 0.706
SunColorFilterInteriorNight=0.816, 0.114, 0.0784
MoonIntensityDawn=1.21
MoonIntensitySunrise=0.95
MoonIntensityDay=0.67
MoonIntensitySunset=0.95
MoonIntensityDusk=1.16
MoonIntensityNight=1.78
MoonIntensityDawn=0.7
MoonIntensitySunrise=0.57
MoonIntensityDay=0.49
MoonIntensitySunset=0.58
MoonIntensityDusk=0.69
MoonIntensityNight=0.83
MoonIntensityInteriorDay=0.57
MoonIntensityInteriorNight=1.84
MoonIntensityInteriorNight=0.89
MoonDesaturationDawn=0.47
MoonDesaturationSunrise=0.41
MoonDesaturationDay=0.36
@ -248,35 +248,35 @@ MoonColorFilterInteriorDay=1, 1, 1
MoonColorFilterInteriorNight=0.455, 0.522, 0.816
[ENVIRONMENT]
IgnoreWeatherSystem=true
DirectLightingIntensityDawn=1.33
DirectLightingIntensitySunrise=1.47
DirectLightingIntensityDay=1.71
DirectLightingIntensitySunset=1.52
DirectLightingIntensityDusk=1.27
DirectLightingIntensityNight=1.13
DirectLightingIntensityDawn=1.38
DirectLightingIntensitySunrise=1.54
DirectLightingIntensityDay=1.73
DirectLightingIntensitySunset=1.54
DirectLightingIntensityDusk=1.38
DirectLightingIntensityNight=1.12
DirectLightingIntensityInteriorDay=1.64
DirectLightingIntensityInteriorNight=1.09
DirectLightingDesaturationDawn=0.16
DirectLightingDesaturationSunrise=0.25
DirectLightingDesaturationDay=0.29
DirectLightingDesaturationSunset=0.18
DirectLightingDesaturationDusk=0.14
DirectLightingDesaturationNight=0.08
DirectLightingDesaturationInteriorDay=0.31
DirectLightingDesaturationInteriorNight=0.07
DirectLightingColorFilterDawn=0.988, 0.761, 0.953
DirectLightingColorFilterSunrise=0.992, 0.741, 0.8
DirectLightingColorFilterDay=0.992, 0.855, 0.812
DirectLightingColorFilterSunset=0.984, 0.804, 0.871
DirectLightingColorFilterDusk=0.965, 0.745, 0.98
DirectLightingColorFilterNight=0.722, 0.71, 0.976
DirectLightingIntensityInteriorNight=1.19
DirectLightingDesaturationDawn=0.06
DirectLightingDesaturationSunrise=0.1
DirectLightingDesaturationDay=0.14
DirectLightingDesaturationSunset=0.11
DirectLightingDesaturationDusk=0.09
DirectLightingDesaturationNight=0.04
DirectLightingDesaturationInteriorDay=0.14
DirectLightingDesaturationInteriorNight=0.04
DirectLightingColorFilterDawn=0.996, 0.886, 0.98
DirectLightingColorFilterSunrise=0.996, 0.878, 0.906
DirectLightingColorFilterDay=0.996, 0.957, 0.902
DirectLightingColorFilterSunset=0.992, 0.906, 0.937
DirectLightingColorFilterDusk=0.976, 0.922, 0.992
DirectLightingColorFilterNight=0.886, 0.882, 0.992
DirectLightingColorFilterInteriorDay=0.98, 0.953, 0.941
DirectLightingColorFilterInteriorNight=0.886, 0.863, 0.996
AmbientLightingIntensityDawn=0.42
AmbientLightingIntensitySunrise=0.71
AmbientLightingIntensityDay=0.9
AmbientLightingIntensitySunset=0.72
AmbientLightingIntensityDusk=0.46
AmbientLightingIntensitySunrise=0.73
AmbientLightingIntensityDay=0.88
AmbientLightingIntensitySunset=0.74
AmbientLightingIntensityDusk=0.48
AmbientLightingIntensityNight=0.28
AmbientLightingIntensityInteriorDay=0.15
AmbientLightingIntensityInteriorNight=0.12
@ -285,7 +285,7 @@ UseIndirectLighting=true
ResolutionScale=1.0
SourceTexturesScale=0.5
SamplingQuality=0
SamplingRange=0.15
SamplingRange=0.25
AOIntensity=1.0
AOIntensityInterior=1.0
AOAmount=0.5

View file

@ -1 +1 @@
3.2.2 BETA "Let Go"
3.2.3 BETA "Let Go"

View file

@ -1,20 +1,20 @@
[ENBBLOOM.FX]
TECHNIQUE=2
Bloom Intensity Night=0.4
Bloom Intensity Day=0.31
Bloom Intensity Interior=0.35
Bloom Contrast Night=1.01
Bloom Intensity Night=0.3
Bloom Intensity Day=0.23
Bloom Intensity Interior=0.27
Bloom Contrast Night=1.05
Bloom Contrast Day=1.08
Bloom Contrast Interior=1.04
Bloom Saturation Night=0.97
Bloom Saturation Day=0.93
Bloom Saturation Day=0.98
Bloom Saturation Interior=0.95
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
Bloom Offset Day=-0.19
Bloom Offset Interior=-0.15
Bloom Intensity Cap Night=25.0
Bloom Intensity Cap Day=25.0
Bloom Intensity Cap Interior=25.0
Bloom Blur Radius=1.0
Blue Shift Night=0.294, 0.424, 0.859
Blue Shift Day=0.22, 0.537, 0.855
@ -25,19 +25,19 @@ Blue Shift Intensity Interior=0.14
Blue Shift Luminance Factor Per-pass=0.61
Blue Shift Color Factor Per-pass=0.79
Enable Anamorphic Bloom=true
Anamorphic Bloom Blend Night=0.37
Anamorphic Bloom Blend Day=0.29
Anamorphic Bloom Blend Interior=0.34
Anamorphic Bloom Blend Night=0.53
Anamorphic Bloom Blend Day=0.46
Anamorphic Bloom Blend Interior=0.51
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 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.25
Anamorphic Bloom Blue Shift Intensity Night=0.38
Anamorphic Bloom Blue Shift Intensity Day=0.28
Anamorphic Bloom Blue Shift Intensity Interior=0.34
Anamorphic Bloom Contrast Night=1.2
Anamorphic Bloom Contrast Day=1.36
Anamorphic Bloom Contrast Interior=1.3
Anamorphic Bloom Radius Multiplier=2.5
Anamorphic Bloom Contrast Interior=1.36
Anamorphic Bloom Radius Multiplier=1.0
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.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
Bloom Pass 1 Blend=1.31
Bloom Pass 2 Blend=1.15
Bloom Pass 3 Blend=0.96
Bloom Pass 4 Blend=0.87
Bloom Pass 5 Blend=0.66
Bloom Pass 6 Blend=0.5
Enable Lens Dirt=false
Dirt Pass 1 Blend=0.08
Dirt Pass 2 Blend=0.25

View file

@ -482,18 +482,35 @@ float doffixedfocusblend_n
string UIName = "DOF Fixed Focus Blend Night";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedfocusblend_d
<
string UIName = "DOF Fixed Focus Blend Day";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedfocusblend_i
<
string UIName = "DOF Fixed Focus Blend Interior";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedfocusdepth
<
string UIName = "DOF Fixed Focus Depth";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedfocuscap
<
string UIName = "DOF Fixed Focus Cap";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
/* fixed unfocused depth factors */
float doffixedunfocusmult_n
@ -552,18 +569,28 @@ float doffixedunfocusblend_n
string UIName = "DOF Fixed Unfocus Blend Night";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedunfocusblend_d
<
string UIName = "DOF Fixed Unfocus Blend Day";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedunfocusblend_i
<
string UIName = "DOF Fixed Unfocus Blend Interior";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
float doffixedunfocusdepth
<
string UIName = "DOF Fixed Unfocus Depth";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {0.0};
/* prevents fixed dof from blurring the skybox */
bool doffixedcut
@ -1095,18 +1122,19 @@ float4 PS_DoFPrepass( VS_OUTPUT_POST IN, float4 v0 : SV_Position0 ) : SV_Target
/* cheap tilt */
foc = foc+0.01*doftiltx*(doftiltxcenter-coord.x)
+0.01*doftilty*(doftiltycenter-coord.y);
float dfc = abs(dep-foc);
float dff = abs(dep);
float dfu = dff;
if ( doffixedcut && (dep >= cutoff*0.000001) ) dfu *= 0;
dfc = clamp(pow(dfc,dofpow)*dofmult+dofbump,0.0,1.0);
float dff = abs(dep-doffixedfocusdepth);
dff = clamp(pow(dff,doffixedfocuspow)*doffixedfocusmult
+doffixedfocusbump,0.0,1.0);
if ( dep > doffixedfocuscap ) dff = 1.0;
float dfu = abs(dep-doffixedunfocusdepth);
dfu = clamp(pow(dfu,doffixedunfocuspow)*doffixedunfocusmult
+doffixedunfocusbump,0.0,1.0);
dfc *= lerp(1.0,dff,doffixedfocusblend);
if ( doffixedcut && (dep >= cutoff*0.000001) ) dfu *= 0;
float dfc = abs(dep-foc);
dfc = clamp(pow(dfc,dofpow)*dofmult+dofbump,0.0,1.0);
dfc += lerp(0.0,dfu,doffixedunfocusblend);
return max(0.0,dfc);
dfc *= lerp(1.0,dff,doffixedfocusblend);
return clamp(dfc,0.0,1.0);
}
/* apply SSAO to screen */

View file

@ -37,7 +37,7 @@ Frost Always Enable=true
Enable Focus Triangle=true
Display Focus Points=false
Enable Manual Focus=false
Manual Focus Depth=0.8
Manual Focus Depth=1.0
Focus Point Center=0.5, 0.48, 0
Focus Triangle Angle=0.5
Focus Triangle Radius Night=9.0
@ -52,21 +52,21 @@ Focus Maximum Depth Interior=988.0
DOF Intensity Night=471.689972
DOF Intensity Day=421.940002
DOF Intensity Interior=438.609985
DOF Contrast Night=3.31
DOF Contrast Night=3.45
DOF Contrast Day=3.76
DOF Contrast Interior=3.52
DOF Shift Night=0.0
DOF Shift Day=0.0
DOF Shift Interior=0.0
DOF Fixed Focus Intensity Night=1.0
DOF Fixed Focus Intensity Day=1.0
DOF Fixed Focus Intensity Interior=1.0
DOF Fixed Focus Contrast Night=1.0
DOF Fixed Focus Contrast Day=1.0
DOF Fixed Focus Contrast Interior=1.0
DOF Fixed Focus Shift Night=-0.01
DOF Fixed Focus Shift Day=-0.01
DOF Fixed Focus Shift Interior=-0.01
DOF Fixed Focus Intensity Night=388.769989
DOF Fixed Focus Intensity Day=411.829987
DOF Fixed Focus Intensity Interior=377.649994
DOF Fixed Focus Contrast Night=0.93
DOF Fixed Focus Contrast Day=0.98
DOF Fixed Focus Contrast Interior=0.87
DOF Fixed Focus Shift Night=0.0
DOF Fixed Focus Shift Day=0.0
DOF Fixed Focus Shift Interior=0.0
DOF Fixed Focus Blend Night=1.0
DOF Fixed Focus Blend Day=1.0
DOF Fixed Focus Blend Interior=1.0
@ -191,3 +191,9 @@ Focus Plane Vertical Tilt Center=0.5
Focus Plane Horizontal Tilt=0.0
Focus Plane Vertical Tilt=0.0
Focus Mode=1
DOF Fixed Focus Depth Night=0.01
DOF Fixed Focus Depth Day=0.01
DOF Fixed Focus Depth Interior=0.01
DOF Fixed Focus Depth=0.01
DOF Fixed Focus Cap=0.01
DOF Fixed Unfocus Depth=0.0

View file

@ -418,6 +418,51 @@ bool vgradeenable
string UIName = "Enable Vanilla Imagespace";
string UIWidget = "Checkbox";
> = {true};
float vtintpow
<
string UIName = "Vanilla Tint Contrast";
string UIWidget = "Spinner";
float UIMin = 0.0;
> = {1.0};
float vtintmul
<
string UIName = "Vanilla Tint Strength";
string UIWidget = "Spinner";
float UIMin = 0.0;
> = {1.0};
float vtintblend
<
string UIName = "Vanilla Tint Blend";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {1.0};
float vsatpow
<
string UIName = "Vanilla Vibrance Contrast";
string UIWidget = "Spinner";
float UIMin = 0.0;
> = {1.0};
float vsatmul
<
string UIName = "Vanilla Vibrance Strength";
string UIWidget = "Spinner";
float UIMin = 0.0;
> = {1.0};
float vsatblend
<
string UIName = "Vanilla Vibrance Blend";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {1.0};
float vconblend
<
string UIName = "Vanilla Contrast Blend";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {1.0};
string str_debug = "Debugging";
bool bloomdebug
<
@ -692,23 +737,35 @@ float3 FilmGrain( float3 res, float2 coord )
/* identical between games, the only difference is parameter indices */
float3 GradingGame( float3 res, float adapt )
{
float val = luminance(res);
float3 tint;
res -= val;
float satv, tintv, conv, brtv;
float3 tintc;
#ifdef SKYRIMSE
res = Params01[3].x*res+val;
tint = Params01[4].xyz*val-res;
res = Params01[4].w*tint+res;
res = Params01[3].w*res-adapt;
res = Params01[3].z*res+adapt;
satv = Params01[3].x;
tintc = Params01[4].xyz;
tintv = Params01[4].w;
conv = Params01[3].w;
brtv = Params01[3].z;
#else
res = Params01[2].x*res+val;
tint = Params01[3].xyz*val-res;
res = Params01[3].w*tint+res;
res = Params01[2].w*res-adapt;
res = Params01[2].z*res+adapt;
satv = Params01[2].x;
tintc = Params01[3].xyz;
tintv = Params01[3].w;
conv = Params01[2].w;
brtv = Params01[2].z;
#endif
return res;
float val = luminance(res);
float3 tcol = res-val;
satv = (satv<0.0)?(-pow(abs(satv),vsatpow)*vsatmul)
:(pow(max(satv,0.0),vsatpow)*vsatmul);
tcol = satv*tcol+val;
tcol = lerp(res,tcol,vsatblend);
float3 tint = tintc*val-tcol;
tintv = (tintv<0.0)?(-pow(abs(tintv),vtintpow)*vtintmul)
:(pow(max(tintv,0.0),vtintpow)*vtintmul);
tcol = tintv*tint+tcol;
tcol = lerp(res,tcol,vtintblend);
tcol = conv*tcol-adapt;
tcol = brtv*tcol+adapt;
return lerp(res,tcol,vconblend);
}
/* Vanilla tonemap is weird */

View file

@ -1,17 +1,17 @@
[ENBEFFECT.FX]
TECHNIQUE=1
Enable Grain=true
Grain Speed=15.0
Grain Intensity=0.38
Grain Saturation=-0.32
Grain Speed=25.0
Grain Intensity=0.380001
Grain Saturation=-0.35
Grain Two-Pass=true
Grain Blending Mode=3
Grain Dark Mask Contrast=45.689999
Grain Dark Mask Contrast=22.160013
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=5.47
Grain Contrast=5.86
Enable Tonemapping=true
Tonemap Shoulder Strength Night=0.55
Tonemap Shoulder Strength Day=0.42
@ -31,41 +31,41 @@ 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 Night=4.48
Tonemap Linear White Day=4.68
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
Grading Intensity Interior=0.97, 0.95, 0.94
Grading Intensity Night=1.02, 1, 1.05
Grading Intensity Day=1.04, 1.02, 1
Grading Intensity Interior=1.03, 1.01, 1
Grading Contrast Night=0.98, 0.95, 0.94
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.12, -0.89
Grading Color Interior=-0.2, -0.05, -0.82
Grading Color Night=-0.23, -0.08, -0.71
Grading Color Day=-0.04, -0.17, -0.88
Grading Color Interior=-0.26, -0.06, -0.43
Grading Color Factor Night=-0.08
Grading Color Factor Day=-0.13
Grading Color Factor Interior=-0.1
Grading Color Factor Day=-0.1
Grading Color Factor Interior=-0.06
Enable HSV Grading=true
Grading Saturation Intensity Night=1.13
Grading Saturation Intensity Day=1.17
Grading Saturation Intensity Interior=1.09
Grading Saturation Contrast Night=1.28
Grading Saturation Contrast Day=1.17
Grading Saturation Contrast Interior=1.17
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
Grading Saturation Intensity Night=1.21
Grading Saturation Intensity Day=1.28
Grading Saturation Intensity Interior=1.25
Grading Saturation Contrast Night=1.05
Grading Saturation Contrast Day=1.14
Grading Saturation Contrast Interior=1.12
Grading Value Intensity Night=1.06
Grading Value Intensity Day=1.02
Grading Value Intensity Interior=1.05
Grading Value Contrast Night=1.25
Grading Value Contrast Day=1.21
Grading Value Contrast Interior=1.18
Colorize After HSV=true
Enable LUT Grading=true
LUT Blend Night=0.24
LUT Blend Day=0.29
LUT Blend Interior=0.19
LUT Blend Night=0.21
LUT Blend Day=0.25
LUT Blend Interior=0.16
Enable Post Dither=false
Dither Pattern=4
Display Bloom=false
@ -142,9 +142,16 @@ LUT Blend Interior Night=0.39
LUT Blend Interior Day=0.45
Display Adaptation=false
Enable Technicolor=true
Technicolor Blend=0.65
Technicolor Blend=0.5
Apply Grain Before Tone Mapping=true
Enable Adaptation=true
Enable Vanilla Tone Mapping=false
Enable Vanilla Imagespace=true
Use Lighten Blend=false
Vanilla Tint Contrast=0.8
Vanilla Tint Strength=1.8
Vanilla Tint Blend=0.95
Vanilla Vibrance Contrast=1.2
Vanilla Vibrance Strength=1.0
Vanilla Vibrance Blend=0.9
Vanilla Contrast Blend=0.75