1
Fork 0

MariENB Skyrim 2.2.7

This commit is contained in:
Marisa the Magician 2019-04-07 17:42:52 +02:00
commit eeac0ad0cc
8 changed files with 109 additions and 80 deletions

View file

@ -108,8 +108,8 @@ AdaptationMin=0.0
AdaptationMax=1.0
[ENVIRONMENT]
DirectLightingIntensityDay=1.49
DirectLightingIntensityNight=1.42
DirectLightingIntensityDay=0.95
DirectLightingIntensityNight=1.25
DirectLightingIntensityInterior=1.014688
DirectLightingCurveDay=2.09
DirectLightingCurveNight=2.03
@ -127,10 +127,10 @@ SpecularFromLightDay=0.0
SpecularFromLightNight=0.0
SpecularFromLightInterior=0.0
AmbientLightingIntensityDay=0.28
AmbientLightingIntensityNight=0.09
AmbientLightingIntensityNight=0.23
AmbientLightingIntensityInterior=0.914
AmbientLightingCurveDay=1.01
AmbientLightingCurveNight=1.3
AmbientLightingCurveNight=1.19
AmbientLightingCurveInterior=0.75
AmbientLightingDesaturationDay=0.0
AmbientLightingDesaturationNight=0.0
@ -153,10 +153,10 @@ FogColorCurveInterior=1.0
ColorPowDay=1.0
ColorPowNight=1.0
ColorPowInterior=0.9
DirectLightingIntensitySunrise=1.63
DirectLightingIntensitySunset=1.66
DirectLightingIntensityInteriorDay=1.45
DirectLightingIntensityInteriorNight=1.39
DirectLightingIntensitySunrise=1.19
DirectLightingIntensitySunset=1.22
DirectLightingIntensityInteriorDay=0.9
DirectLightingIntensityInteriorNight=1.03
DirectLightingCurveSunrise=2.21
DirectLightingCurveSunset=2.18
DirectLightingCurveInteriorDay=2.02
@ -180,7 +180,7 @@ SpecularFromLightInteriorNight=0.0
AmbientLightingIntensitySunrise=0.24
AmbientLightingIntensitySunset=0.21
AmbientLightingIntensityInteriorDay=0.28
AmbientLightingIntensityInteriorNight=0.15
AmbientLightingIntensityInteriorNight=0.26
AmbientLightingCurveSunrise=1.03
AmbientLightingCurveSunset=1.09
AmbientLightingCurveInteriorDay=1.11
@ -195,7 +195,7 @@ AmbientColorFilterAmountSunset=0.0
AmbientColorFilterAmountNight=0.0
AmbientColorFilterAmountInteriorDay=0.0
AmbientColorFilterAmountInteriorNight=0.0
AmbientColorFilterTopSunrise=0.494, 0.443, 0.188
AmbientColorFilterTopSunrise=0.494, 0.357, 0.188
AmbientColorFilterTopDay=0.647, 0.627, 0.506
AmbientColorFilterTopSunset=0.42, 0.224, 0.122
AmbientColorFilterTopNight=0.212, 0.22, 0.298
@ -244,15 +244,15 @@ ColorPowSunset=1.0
ColorPowInteriorDay=1.0
ColorPowInteriorNight=1.0
IgnoreWeatherSystem=true
DirectLightingColorFilterSunrise=0.996, 0.682, 0.369
DirectLightingColorFilterSunrise=0.996, 0.765, 0.565
DirectLightingColorFilterDay=1, 0.973, 0.875
DirectLightingColorFilterSunset=0.902, 0.596, 0.29
DirectLightingColorFilterSunset=0.925, 0.753, 0.525
DirectLightingColorFilterNight=0.78, 0.898, 0.937
DirectLightingColorFilterInteriorDay=1, 1, 1
DirectLightingColorFilterInteriorNight=0.835, 0.859, 0.89
FogColorFilterSunrise=0.949, 0.769, 0.533
FogColorFilterSunrise=0.949, 0.706, 0.533
FogColorFilterDay=0.976, 0.965, 0.882
FogColorFilterSunset=0.929, 0.537, 0.325
FogColorFilterSunset=0.871, 0.553, 0.384
FogColorFilterNight=1, 1, 1
FogColorFilterInteriorDay=1, 1, 1
FogColorFilterInteriorNight=1, 1, 1
@ -268,16 +268,16 @@ FogColorFilterAmountSunset=0.0
FogColorFilterAmountNight=0.0
FogColorFilterAmountInteriorDay=0.0
FogColorFilterAmountInteriorNight=0.0
DirectLightingIntensityDawn=1.51
DirectLightingIntensityDusk=1.52
DirectLightingCurveDawn=2.33
DirectLightingIntensityDawn=1.16
DirectLightingIntensityDusk=1.18
DirectLightingCurveDawn=2.3
DirectLightingCurveDusk=2.22
DirectLightingDesaturationDawn=0.36
DirectLightingDesaturationDusk=0.42
DirectLightingColorFilterAmountDawn=0.0
DirectLightingColorFilterAmountDusk=0.0
DirectLightingColorFilterDawn=0.957, 0.698, 0.557
DirectLightingColorFilterDusk=0.929, 0.612, 0.475
DirectLightingColorFilterDawn=0.973, 0.494, 0.235
DirectLightingColorFilterDusk=0.957, 0.486, 0.235
SpecularAmountMultiplierDawn=1.9
SpecularAmountMultiplierDusk=1.92
SpecularPowerMultiplierDawn=0.56
@ -312,8 +312,8 @@ FogColorCurveDawn=1.08
FogColorCurveDusk=1.08
FogColorFilterAmountDawn=0.0
FogColorFilterAmountDusk=0.0
FogColorFilterDawn=0.761, 0.569, 0.4
FogColorFilterDusk=0.792, 0.545, 0.4
FogColorFilterDawn=0.761, 0.494, 0.4
FogColorFilterDusk=0.851, 0.529, 0.341
ColorPowDawn=1.0
ColorPowDusk=1.0
@ -323,7 +323,7 @@ StarsIntensity=1.36
StarsCurve=1.37
AuroraBorealisIntensity=1.14
AuroraBorealisCurve=0.57
CloudsIntensityDay=0.980001
CloudsIntensityDay=1.110001
CloudsIntensityNight=0.340001
CloudsIntensityInterior=1.49
CloudsCurveDay=1.18
@ -334,10 +334,10 @@ CloudsDesaturationNight=0.0
CloudsDesaturationInterior=0.14
CloudsEdgeClamp=0.33
CloudsEdgeIntensity=1.37
GradientIntensityDay=1.050001
GradientIntensityDay=1.080001
GradientIntensityNight=0.830001
GradientIntensityInterior=0.85
GradientDesaturationDay=0.18
GradientDesaturationDay=0.43
GradientDesaturationNight=0.15
GradientDesaturationInterior=0.325
GradientTopIntensityDay=1.320001
@ -346,10 +346,10 @@ GradientTopIntensityInterior=5.6125
GradientTopCurveDay=1.19
GradientTopCurveNight=1.64
GradientTopCurveInterior=2.15
GradientMiddleIntensityDay=1.120001
GradientMiddleIntensityDay=1.200001
GradientMiddleIntensityNight=0.730001
GradientMiddleIntensityInterior=2.4
GradientMiddleCurveDay=1.24
GradientMiddleCurveDay=1.4
GradientMiddleCurveNight=1.3
GradientMiddleCurveInterior=1.65
GradientHorizonIntensityDay=1.01
@ -395,12 +395,12 @@ GradientTopCurveSunrise=1.34
GradientTopCurveSunset=1.3
GradientTopCurveInteriorDay=1.27
GradientTopCurveInteriorNight=1.59
GradientMiddleIntensitySunrise=1.070001
GradientMiddleIntensitySunset=1.09
GradientMiddleIntensitySunrise=1.130001
GradientMiddleIntensitySunset=1.15
GradientMiddleIntensityInteriorDay=1.15
GradientMiddleIntensityInteriorNight=1.09
GradientMiddleCurveSunrise=1.35
GradientMiddleCurveSunset=1.35
GradientMiddleCurveSunset=1.36
GradientMiddleCurveInteriorDay=1.22
GradientMiddleCurveInteriorNight=1.19
GradientHorizonIntensitySunrise=0.82
@ -408,7 +408,7 @@ GradientHorizonIntensitySunset=0.9
GradientHorizonIntensityInteriorDay=1.02
GradientHorizonIntensityInteriorNight=0.81
GradientHorizonCurveSunrise=1.22
GradientHorizonCurveSunset=1.23
GradientHorizonCurveSunset=1.21
GradientHorizonCurveInteriorDay=1.07
GradientHorizonCurveInteriorNight=1.34
SunIntensitySunrise=1.91
@ -423,12 +423,12 @@ SunDesaturationSunset=0.0
SunDesaturationNight=0.0
SunDesaturationInteriorDay=0.0
SunDesaturationInteriorNight=0.0
SunColorFilterSunrise=0.973, 0.537, 0.102
SunColorFilterSunrise=0.984, 0.592, 0.349
SunColorFilterDay=0.992, 0.89, 0.78
SunColorFilterSunset=0.929, 0.357, 0.0275
SunColorFilterNight=0.616, 0.282, 0.0588
SunColorFilterSunset=0.976, 0.494, 0.192
SunColorFilterNight=0.616, 0.0588, 0.0588
SunColorFilterInteriorDay=0.98, 0.937, 0.847
SunColorFilterInteriorNight=0.729, 0.286, 0.0314
SunColorFilterInteriorNight=0.729, 0.0314, 0.0314
SunGlowIntensitySunrise=0.94
SunGlowIntensityDay=0.89
SunGlowIntensitySunset=0.98
@ -468,27 +468,27 @@ CloudsOpacityInteriorNight=1.05
CloudsEdgeFadeRange=0.89
CloudsEdgeMoonMultiplier=2.78
IgnoreWeatherSystem=true
GradientTopColorFilterSunrise=0.988, 0.722, 0.439
GradientTopColorFilterSunrise=0.988, 0.659, 0.439
GradientTopColorFilterDay=1, 1, 1
GradientTopColorFilterSunset=0.992, 0.686, 0.31
GradientTopColorFilterSunset=0.992, 0.502, 0.31
GradientTopColorFilterNight=1, 1, 1
GradientTopColorFilterInteriorDay=1, 1, 1
GradientTopColorFilterInteriorNight=1, 1, 1
GradientMiddleColorFilterSunrise=0.949, 0.639, 0.329
GradientMiddleColorFilterSunrise=0.949, 0.576, 0.329
GradientMiddleColorFilterDay=1, 1, 1
GradientMiddleColorFilterSunset=0.98, 0.463, 0.0941
GradientMiddleColorFilterSunset=0.984, 0.518, 0.318
GradientMiddleColorFilterNight=1, 1, 1
GradientMiddleColorFilterInteriorDay=1, 1, 1
GradientMiddleColorFilterInteriorNight=1, 1, 1
GradientHorizonColorFilterSunrise=0.941, 0.714, 0.502
GradientHorizonColorFilterSunrise=0.91, 0.557, 0.251
GradientHorizonColorFilterDay=1, 1, 1
GradientHorizonColorFilterSunset=0.98, 0.561, 0.259
GradientHorizonColorFilterSunset=0.98, 0.545, 0.235
GradientHorizonColorFilterNight=1, 1, 1
GradientHorizonColorFilterInteriorDay=1, 1, 1
GradientHorizonColorFilterInteriorNight=1, 1, 1
CloudsColorFilterSunrise=0.984, 0.808, 0.545
CloudsColorFilterSunrise=0.973, 0.518, 0.235
CloudsColorFilterDay=1, 1, 1
CloudsColorFilterSunset=0.984, 0.588, 0.388
CloudsColorFilterSunset=0.984, 0.58, 0.325
CloudsColorFilterNight=1, 1, 1
CloudsColorFilterInteriorDay=1, 1, 1
CloudsColorFilterInteriorNight=1, 1, 1
@ -500,8 +500,8 @@ CloudsDesaturationDawn=0.0
CloudsDesaturationDusk=0.0
CloudsOpacityDawn=0.98
CloudsOpacityDusk=0.98
CloudsColorFilterDawn=0.98, 0.573, 0.322
CloudsColorFilterDusk=0.949, 0.396, 0.212
CloudsColorFilterDawn=0.976, 0.412, 0.224
CloudsColorFilterDusk=0.949, 0.298, 0.212
GradientIntensityDawn=0.85
GradientIntensityDusk=0.85
GradientDesaturationDawn=0.38
@ -510,14 +510,14 @@ GradientTopIntensityDawn=1.17
GradientTopIntensityDusk=1.18
GradientTopCurveDawn=1.46
GradientTopCurveDusk=1.47
GradientTopColorFilterDawn=0.933, 0.482, 0.259
GradientTopColorFilterDusk=0.969, 0.325, 0.0902
GradientTopColorFilterDawn=0.933, 0.349, 0.259
GradientTopColorFilterDusk=0.941, 0.314, 0.188
GradientMiddleIntensityDawn=0.88
GradientMiddleIntensityDusk=0.97
GradientMiddleCurveDawn=1.3
GradientMiddleCurveDusk=1.33
GradientMiddleColorFilterDawn=0.961, 0.588, 0.357
GradientMiddleColorFilterDusk=0.933, 0.341, 0.0863
GradientMiddleColorFilterDawn=0.957, 0.431, 0.314
GradientMiddleColorFilterDusk=0.851, 0.376, 0.271
GradientHorizonIntensityDawn=0.800001
GradientHorizonIntensityDusk=0.82
GradientHorizonCurveDawn=1.27
@ -528,8 +528,8 @@ SunIntensityDawn=1.42
SunIntensityDusk=1.55
SunDesaturationDawn=0.0
SunDesaturationDusk=0.0
SunColorFilterDawn=0.984, 0.345, 0.114
SunColorFilterDusk=0.929, 0.224, 0.0275
SunColorFilterDawn=0.984, 0.396, 0.145
SunColorFilterDusk=0.863, 0.208, 0.0941
SunGlowIntensityDawn=0.87
SunGlowIntensityDusk=0.85
SunGlowHazinessDawn=0.03
@ -778,23 +778,23 @@ SpecularPowerMultiplierDawn=0.79
SpecularPowerMultiplierDusk=0.78
[PARTICLE]
IntensitySunrise=0.78
IntensitySunrise=0.57
IntensityDay=1.06
IntensitySunset=0.79
IntensityNight=0.54
IntensityInteriorDay=0.97
IntensityInteriorNight=0.62
LightingInfluenceSunrise=1.02
IntensitySunset=0.48
IntensityNight=0.27
IntensityInteriorDay=0.84
IntensityInteriorNight=0.34
LightingInfluenceSunrise=0.84
LightingInfluenceDay=0.79
LightingInfluenceSunset=1.15
LightingInfluenceNight=1.25
LightingInfluenceSunset=0.89
LightingInfluenceNight=0.98
LightingInfluenceInteriorDay=0.85
LightingInfluenceInteriorNight=0.94
IgnoreWeatherSystem=true
IntensityDawn=0.66
IntensityDusk=0.63
LightingInfluenceDawn=1.12
LightingInfluenceDusk=1.21
IntensityDawn=0.41
IntensityDusk=0.44
LightingInfluenceDawn=0.93
LightingInfluenceDusk=0.91
[REFLECTION]
Quality=1

View file

@ -1 +1 @@
2.2.6-1 "Waifus And Lore"
2.2.7-1 "Color by Technicolor"

View file

@ -5,14 +5,14 @@ Emulated Resolution Width=0.0
Emulated Resolution Height=0.0
Zoom Factor X=0.0
Zoom Factor Y=0.0
Palette Type=1
Palette Type=3
CGA Palette=0
EGA Palette=0
Dithering Pattern=2
Contrast Modifier=0.9
Saturation Modifier=1.5
Dither Offset=0.0
Dither Range=0.2
Contrast Modifier=0.8
Saturation Modifier=1.0
Dither Offset=-0.05
Dither Range=0.1
Enable ASCII=false
ASCII Monochrome=false
ASCII Blend=0.0

View file

@ -13,9 +13,9 @@ Bloom Saturation Day=1.07
Bloom Saturation Interior Night=1.05
Bloom Saturation Interior Day=1.04
Bloom Offset Night=-0.04
Bloom Offset Day=-0.05
Bloom Offset Interior Night=-0.04
Bloom Offset Interior Day=-0.06
Bloom Offset Day=-0.08
Bloom Offset Interior Night=-0.05
Bloom Offset Interior Day=-0.07
Bloom Intensity Cap Night=10.0
Bloom Intensity Cap Day=10.0
Bloom Intensity Cap Interior Night=10.0

View file

@ -24,9 +24,9 @@ Adaptation Min Day=0.94
Adaptation Min Interior Night=0.95
Adaptation Min Interior Day=0.93
Adaptation Max Night=1.17
Adaptation Max Day=1.18
Adaptation Max Day=1.39
Adaptation Max Interior Night=1.18
Adaptation Max Interior Day=1.21
Adaptation Max Interior Day=1.28
Enable Tonemapping=true
Tonemap Shoulder Strength Night=0.87
Tonemap Shoulder Strength Day=0.84
@ -52,10 +52,10 @@ Tonemap Toe Denominator Night=0.99
Tonemap Toe Denominator Day=0.9
Tonemap Toe Denominator Interior Night=1.04
Tonemap Toe Denominator Interior Day=1.04
Tonemap Linear White Night=1.03
Tonemap Linear White Day=1.07
Tonemap Linear White Interior Night=1.04
Tonemap Linear White Interior Day=1.04
Tonemap Linear White Night=1.12
Tonemap Linear White Day=1.26
Tonemap Linear White Interior Night=1.11
Tonemap Linear White Interior Day=1.21
Tonemap Before Compensate=false
Enable Compensate=false
Compensate Factor Night=0.14
@ -151,3 +151,5 @@ Enable Vanilla Imagespace=true
Vanilla Vibrance Blend=1.0
Vanilla Contrast Blend=1.0
Use Lighten Blend=true
Enable Technicolor=true
Technicolor Blend=1.0

View file

@ -73,7 +73,7 @@ DOF Fixed Focus Blend Day=0.0
DOF Fixed Focus Blend Interior Night=0.0
DOF Fixed Focus Blend Interior Day=0.0
DOF Fixed Unfocus Intensity Night=1.16
DOF Fixed Unfocus Intensity Day=1.12
DOF Fixed Unfocus Intensity Day=1.2
DOF Fixed Unfocus Intensity Interior Night=1.18
DOF Fixed Unfocus Intensity Interior Day=1.14
DOF Fixed Unfocus Contrast Night=99.099998
@ -97,8 +97,8 @@ DOF Relative to FOV=true
Default FOV=75.0
DOF Relative Factor Night=2.76
DOF Relative Factor Day=2.9
DOF Relative Factor Interior Night=2.65
DOF Relative Factor Interior Day=2.73
DOF Relative Factor Interior Night=2.8
DOF Relative Factor Interior Day=2.93
Debug Depth=false
Debug Focus=false
Enable Depth Edge Detect=false

View file

@ -364,6 +364,16 @@ float3 GradingPal( float3 res )
palt.b = tex2D(_s7,coord).b;
return lerp(res,palt,palblend);
}
/* I think this Technicolor implementation is correct... maybe */
float3 Technicolor( float3 res )
{
res = clamp(res,0.0,1.0);
float red = 1.0-(res.r-(res.g+res.b)*0.5);
float green = 1.0-(res.g-(res.r+res.b)*0.5);
float blue = 1.0-(res.b-(res.r+res.g)*0.5);
float3 tint = float3(green*blue,red*blue,red*green)*res;
return lerp(res,res+0.5*(tint-res),techblend);
}
/* post-pass dithering, something apparently only my ENB does */
float3 Dither( float3 res, float2 coord )
{
@ -455,6 +465,7 @@ float4 PS_Mari( VS_OUTPUT_POST IN, float2 vPos : VPOS ) : COLOR
else res.rgb += bcol;
if ( lutenable ) res.rgb = GradingLUT(res.rgb);
if ( palenable ) res.rgb = GradingPal(res.rgb);
if ( techenable ) res.rgb = Technicolor(res.rgb);
if ( ne ) res.rgb = FilmGrain(res.rgb,coord);
#ifdef FALLOUT
res.rgb = _r5.rgb*_r5.a + res.rgb*(1.0-_r5.a);

View file

@ -708,6 +708,22 @@ float palblend
<
string UIName = "Palette Blend";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {1.0};
/* technicolor shader */
string str_tech = "Technicolor";
bool techenable
<
string UIName = "Enable Technicolor";
string UIWidget = "Checkbox";
> = {false};
float techblend
<
string UIName = "Technicolor Blend";
string UIWidget = "Spinner";
float UIMin = 0.0;
float UIMax = 1.0;
> = {1.0};
string str_dither = "Dithering";
bool dodither