From 3129cbf0558337f04de9013d0e657ef2a1bee44e Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 7 Apr 2019 17:17:17 +0200 Subject: [PATCH] MariENB 1.2015.5.17 --- enbseries/menbbloomfilters.fx | 12 ++-- enbseries/menbbloomsettings.fx | 12 ++++ settings_skyrim/enbseries.ini | 2 +- settings_skyrim/enbseries/enbbloom.fx.ini | 80 +++++++++++----------- settings_skyrim/enbseries/enbeffect.fx.ini | 4 +- 5 files changed, 62 insertions(+), 48 deletions(-) diff --git a/enbseries/menbbloomfilters.fx b/enbseries/menbbloomfilters.fx index e8ab7b4..c67c1d0 100644 --- a/enbseries/menbbloomfilters.fx +++ b/enbseries/menbbloomfilters.fx @@ -75,7 +75,7 @@ float4 PS_BloomTexture1(VS_OUTPUT_POST In) : COLOR float4 PS_BloomTexture2(VS_OUTPUT_POST In) : COLOR { float2 coord = In.txcoord0.xy; - float4 res = float4(0,0,0,0), base = tex2D(SamplerBloom1,coord); + float4 res = float4(0,0,0,0), base = tex2D(SamplerBloom5,coord); int i; [unroll] for ( i=-7; i<=7; i++ ) res += gauss8[abs(i)]*tex2D(SamplerBloom1,coord+float2(0,i) @@ -87,10 +87,10 @@ float4 PS_BloomTexture2(VS_OUTPUT_POST In) : COLOR float3 blu_id = float3(blu_id_r,blu_id_g,blu_id_b); float3 blu = lerp(lerp(blu_n,blu_d,tod),lerp(blu_in,blu_id,tod),ind); float bsi = lerp(lerp(bsi_n,bsi_d,tod),lerp(bsi_in,bsi_id,tod),ind); - float lm = max(0,luminance(res.rgb)-luminance(base.rgb))*10*bsi; + float lm = max(0,luminance(res.rgb)-luminance(base.rgb))*bsi; lm = lm/(1.0+lm); - lm *= 1.0-saturate((TempParameters.w-1.0)*0.22); - blu = saturate(blu+(TempParameters.w-1.0)*0.33); + lm *= 1.0-saturate((TempParameters.w-1.0)*bslp); + blu = saturate(blu+(TempParameters.w-1.0)*bsbp); res.rgb *= lerp(1.0,blu,lm); res.a = 1.0; return res; @@ -100,7 +100,7 @@ float4 PS_AnamPass(VS_OUTPUT_POST In) : COLOR { if ( !alfenable ) return float4(0,0,0,1); float2 coord = In.txcoord0.xy; - float4 res = float4(0,0,0,0), base = tex2D(SamplerBloom1,coord); + float4 res = float4(0,0,0,0), base = tex2D(SamplerBloom5,coord); int i; [unroll] for ( i=-79; i<=79; i++ ) res += gauss80[abs(i)]*tex2D(SamplerBloom1,coord+float2(i,0) @@ -112,7 +112,7 @@ float4 PS_AnamPass(VS_OUTPUT_POST In) : COLOR float3 flu_id = float3(flu_id_r,flu_id_g,flu_id_b); float3 flu = lerp(lerp(flu_n,flu_d,tod),lerp(flu_in,flu_id,tod),ind); float fsi = lerp(lerp(fsi_n,fsi_d,tod),lerp(fsi_in,fsi_id,tod),ind); - float lm = max(0,luminance(res.rgb)-luminance(base.rgb))*10*fsi; + float lm = max(0,luminance(res.rgb)-luminance(base.rgb))*fsi; lm = lm/(1.0+lm); float fbl = lerp(lerp(fbl_n,fbl_d,tod),lerp(fbl_in,fbl_id,tod),ind); float fpw = lerp(lerp(fpw_n,fpw_d,tod),lerp(fpw_in,fpw_id,tod),ind); diff --git a/enbseries/menbbloomsettings.fx b/enbseries/menbbloomsettings.fx index 5da979b..9da1b84 100644 --- a/enbseries/menbbloomsettings.fx +++ b/enbseries/menbbloomsettings.fx @@ -250,6 +250,18 @@ float bsi_id string UIWidget = "Spinner"; float UIMin = 0.0; > = {0.5}; +float bslp +< + string UIName = "BlueShiftLuminanceFactorPass"; + string UIWidget = "Spinner"; + float UIMin = 0.0; +> = {0.22}; +float bsbp +< + string UIName = "BlueShiftColorFactorPass"; + string UIWidget = "Spinner"; + float UIMin = 0.0; +> = {0.33}; /* anamorphic bloom (very intensive) */ bool alfenable < diff --git a/settings_skyrim/enbseries.ini b/settings_skyrim/enbseries.ini index f63dd6e..e1f3d69 100644 --- a/settings_skyrim/enbseries.ini +++ b/settings_skyrim/enbseries.ini @@ -101,7 +101,7 @@ ForceMinMaxValues=true AdaptationSensitivity=0.79 AdaptationTime=1.22 AdaptationMin=0.37 -AdaptationMax=2.28 +AdaptationMax=1.16 [ENVIRONMENT] DirectLightingIntensityDay=2.7 diff --git a/settings_skyrim/enbseries/enbbloom.fx.ini b/settings_skyrim/enbseries/enbbloom.fx.ini index df2e838..985b37d 100644 --- a/settings_skyrim/enbseries/enbbloom.fx.ini +++ b/settings_skyrim/enbseries/enbbloom.fx.ini @@ -1,34 +1,34 @@ [ENBBLOOM.FX] TECHNIQUE=0 BloomRadius=1.0 -BloomMix1=0.54 -BloomMix2=0.7 -BloomMix3=0.78 -BloomMix4=0.87 -BloomMix7=0.92 -BloomMix8=1.0 +BloomMix1=0.43 +BloomMix2=0.59 +BloomMix3=0.71 +BloomMix4=0.82 +BloomMix7=0.94 +BloomMix8=1.09 BloomMixNoBlur=0.0 BloomMixBaseImage=0.0 -BloomIntensityNight=0.88 -BloomIntensityDay=0.81 -BloomIntensityInteriorNight=0.93 -BloomIntensityInteriorDay=0.86 -BloomPowerNight=1.03 -BloomPowerDay=1.02 -BloomPowerInteriorNight=1.05 -BloomPowerInteriorDay=1.02 -BloomSaturationNight=0.73 -BloomSaturationDay=0.62 -BloomSaturationInteriorNight=0.76 -BloomSaturationInteriorDay=0.65 +BloomIntensityNight=0.72 +BloomIntensityDay=0.56 +BloomIntensityInteriorNight=0.76 +BloomIntensityInteriorDay=0.67 +BloomPowerNight=1.04 +BloomPowerDay=1.01 +BloomPowerInteriorNight=1.06 +BloomPowerInteriorDay=1.03 +BloomSaturationNight=0.78 +BloomSaturationDay=0.68 +BloomSaturationInteriorNight=0.85 +BloomSaturationInteriorDay=0.71 BloomBumpNight=-0.41 BloomBumpDay=-0.51 BloomBumpInteriorNight=-0.38 BloomBumpInteriorDay=-0.46 -BloomCapNight=10.0 -BloomCapDay=10.0 -BloomCapInteriorNight=10.0 -BloomCapInteriorDay=10.0 +BloomCapNight=100.0 +BloomCapDay=100.0 +BloomCapInteriorNight=100.0 +BloomCapInteriorDay=100.0 BlueShiftColorNightRed=0.7 BlueShiftColorNightGreen=0.4 BlueShiftColorNightBlue=1.0 @@ -36,20 +36,20 @@ BlueShiftColorDayRed=0.2 BlueShiftColorDayGreen=0.6 BlueShiftColorDayBlue=1.0 BlueShiftColorInteriorNightRed=0.6 -BlueShiftColorInteriorNightGreen=0.4 +BlueShiftColorInteriorNightGreen=0.3 BlueShiftColorInteriorNightBlue=1.0 BlueShiftColorInteriorDayRed=0.3 BlueShiftColorInteriorDayGreen=0.7 BlueShiftColorInteriorDayBlue=1.0 -BlueShiftIntensityNight=0.76 -BlueShiftIntensityDay=0.55 -BlueShiftIntensityInteriorNight=0.81 -BlueShiftIntensityInteriorDay=0.65 +BlueShiftIntensityNight=0.33 +BlueShiftIntensityDay=0.17 +BlueShiftIntensityInteriorNight=0.4 +BlueShiftIntensityInteriorDay=0.21 EnableAnamorphicBloom=true -AnamBlendNight=0.77 -AnamBlendDay=0.71 -AnamBlendInteriorNight=0.79 -AnamBlendInteriorDay=0.75 +AnamBlendNight=0.28 +AnamBlendDay=0.15 +AnamBlendInteriorNight=0.33 +AnamBlendInteriorDay=0.22 AnamBlueShiftColorNightRed=0.35 AnamBlueShiftColorNightGreen=0.08 AnamBlueShiftColorNightBlue=1.0 @@ -62,14 +62,14 @@ AnamBlueShiftColorInteriorNightBlue=1.0 AnamBlueShiftColorInteriorDayRed=0.21 AnamBlueShiftColorInteriorDayGreen=0.42 AnamBlueShiftColorInteriorDayBlue=1.0 -AnamBlueShiftIntensityNight=1.11 -AnamBlueShiftIntensityDay=1.06 -AnamBlueShiftIntensityInteriorNight=1.15 -AnamBlueShiftIntensityInteriorDay=1.07 -AnamPowerNight=1.23 -AnamPowerDay=1.2 -AnamPowerInteriorNight=1.26 -AnamPowerInteriorDay=1.22 +AnamBlueShiftIntensityNight=4.44 +AnamBlueShiftIntensityDay=3.21 +AnamBlueShiftIntensityInteriorNight=5.88 +AnamBlueShiftIntensityInteriorDay=4.03 +AnamPowerNight=1.05 +AnamPowerDay=1.11 +AnamPowerInteriorNight=1.03 +AnamPowerInteriorDay=1.08 AnamLengthMultiplier=4.0 BloomAngle=0.0 BloomVertical=false @@ -88,3 +88,5 @@ DirtDiffraction=0.26 DirtBumpPower=1.2 DirtPower=1.23 DirtFactor=1.369999 +BlueShiftLuminanceFactorPass=0.18 +BlueShiftColorFactorPass=0.32 diff --git a/settings_skyrim/enbseries/enbeffect.fx.ini b/settings_skyrim/enbseries/enbeffect.fx.ini index 3b34596..ac1657a 100644 --- a/settings_skyrim/enbseries/enbeffect.fx.ini +++ b/settings_skyrim/enbseries/enbeffect.fx.ini @@ -17,7 +17,7 @@ UseBox=false BoxVertical=0.8 UseGrain=false GrainFrequency=2500.0 -GrainIntensity=0.02 +GrainIntensity=0.03 GrainSaturation=0.0 GrainTwoPass=true GrainBlend=3 @@ -32,7 +32,7 @@ GrainPass1Magnification3=2.22 GrainPass2Magnification1=4.25 GrainPass2Magnification2=0.42 GrainPass2Magnification3=6.29 -GrainPower=2.27 +GrainPower=2.05 UseCurve=false CurveChromaAberration=0.03 UseAdaptation=true