1
Fork 0

MariENB 1.2015.5.17

This commit is contained in:
Marisa the Magician 2019-04-07 17:17:17 +02:00
commit 3129cbf055
5 changed files with 62 additions and 48 deletions

View file

@ -75,7 +75,7 @@ float4 PS_BloomTexture1(VS_OUTPUT_POST In) : COLOR
float4 PS_BloomTexture2(VS_OUTPUT_POST In) : COLOR float4 PS_BloomTexture2(VS_OUTPUT_POST In) : COLOR
{ {
float2 coord = In.txcoord0.xy; 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; int i;
[unroll] for ( i=-7; i<=7; i++ ) [unroll] for ( i=-7; i<=7; i++ )
res += gauss8[abs(i)]*tex2D(SamplerBloom1,coord+float2(0,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_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); 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 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 = lm/(1.0+lm);
lm *= 1.0-saturate((TempParameters.w-1.0)*0.22); lm *= 1.0-saturate((TempParameters.w-1.0)*bslp);
blu = saturate(blu+(TempParameters.w-1.0)*0.33); blu = saturate(blu+(TempParameters.w-1.0)*bsbp);
res.rgb *= lerp(1.0,blu,lm); res.rgb *= lerp(1.0,blu,lm);
res.a = 1.0; res.a = 1.0;
return res; return res;
@ -100,7 +100,7 @@ float4 PS_AnamPass(VS_OUTPUT_POST In) : COLOR
{ {
if ( !alfenable ) return float4(0,0,0,1); if ( !alfenable ) return float4(0,0,0,1);
float2 coord = In.txcoord0.xy; 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; int i;
[unroll] for ( i=-79; i<=79; i++ ) [unroll] for ( i=-79; i<=79; i++ )
res += gauss80[abs(i)]*tex2D(SamplerBloom1,coord+float2(i,0) 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_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); 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 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); lm = lm/(1.0+lm);
float fbl = lerp(lerp(fbl_n,fbl_d,tod),lerp(fbl_in,fbl_id,tod),ind); 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); float fpw = lerp(lerp(fpw_n,fpw_d,tod),lerp(fpw_in,fpw_id,tod),ind);

View file

@ -250,6 +250,18 @@ float bsi_id
string UIWidget = "Spinner"; string UIWidget = "Spinner";
float UIMin = 0.0; float UIMin = 0.0;
> = {0.5}; > = {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) */ /* anamorphic bloom (very intensive) */
bool alfenable bool alfenable
< <

View file

@ -101,7 +101,7 @@ ForceMinMaxValues=true
AdaptationSensitivity=0.79 AdaptationSensitivity=0.79
AdaptationTime=1.22 AdaptationTime=1.22
AdaptationMin=0.37 AdaptationMin=0.37
AdaptationMax=2.28 AdaptationMax=1.16
[ENVIRONMENT] [ENVIRONMENT]
DirectLightingIntensityDay=2.7 DirectLightingIntensityDay=2.7

View file

@ -1,34 +1,34 @@
[ENBBLOOM.FX] [ENBBLOOM.FX]
TECHNIQUE=0 TECHNIQUE=0
BloomRadius=1.0 BloomRadius=1.0
BloomMix1=0.54 BloomMix1=0.43
BloomMix2=0.7 BloomMix2=0.59
BloomMix3=0.78 BloomMix3=0.71
BloomMix4=0.87 BloomMix4=0.82
BloomMix7=0.92 BloomMix7=0.94
BloomMix8=1.0 BloomMix8=1.09
BloomMixNoBlur=0.0 BloomMixNoBlur=0.0
BloomMixBaseImage=0.0 BloomMixBaseImage=0.0
BloomIntensityNight=0.88 BloomIntensityNight=0.72
BloomIntensityDay=0.81 BloomIntensityDay=0.56
BloomIntensityInteriorNight=0.93 BloomIntensityInteriorNight=0.76
BloomIntensityInteriorDay=0.86 BloomIntensityInteriorDay=0.67
BloomPowerNight=1.03 BloomPowerNight=1.04
BloomPowerDay=1.02 BloomPowerDay=1.01
BloomPowerInteriorNight=1.05 BloomPowerInteriorNight=1.06
BloomPowerInteriorDay=1.02 BloomPowerInteriorDay=1.03
BloomSaturationNight=0.73 BloomSaturationNight=0.78
BloomSaturationDay=0.62 BloomSaturationDay=0.68
BloomSaturationInteriorNight=0.76 BloomSaturationInteriorNight=0.85
BloomSaturationInteriorDay=0.65 BloomSaturationInteriorDay=0.71
BloomBumpNight=-0.41 BloomBumpNight=-0.41
BloomBumpDay=-0.51 BloomBumpDay=-0.51
BloomBumpInteriorNight=-0.38 BloomBumpInteriorNight=-0.38
BloomBumpInteriorDay=-0.46 BloomBumpInteriorDay=-0.46
BloomCapNight=10.0 BloomCapNight=100.0
BloomCapDay=10.0 BloomCapDay=100.0
BloomCapInteriorNight=10.0 BloomCapInteriorNight=100.0
BloomCapInteriorDay=10.0 BloomCapInteriorDay=100.0
BlueShiftColorNightRed=0.7 BlueShiftColorNightRed=0.7
BlueShiftColorNightGreen=0.4 BlueShiftColorNightGreen=0.4
BlueShiftColorNightBlue=1.0 BlueShiftColorNightBlue=1.0
@ -36,20 +36,20 @@ BlueShiftColorDayRed=0.2
BlueShiftColorDayGreen=0.6 BlueShiftColorDayGreen=0.6
BlueShiftColorDayBlue=1.0 BlueShiftColorDayBlue=1.0
BlueShiftColorInteriorNightRed=0.6 BlueShiftColorInteriorNightRed=0.6
BlueShiftColorInteriorNightGreen=0.4 BlueShiftColorInteriorNightGreen=0.3
BlueShiftColorInteriorNightBlue=1.0 BlueShiftColorInteriorNightBlue=1.0
BlueShiftColorInteriorDayRed=0.3 BlueShiftColorInteriorDayRed=0.3
BlueShiftColorInteriorDayGreen=0.7 BlueShiftColorInteriorDayGreen=0.7
BlueShiftColorInteriorDayBlue=1.0 BlueShiftColorInteriorDayBlue=1.0
BlueShiftIntensityNight=0.76 BlueShiftIntensityNight=0.33
BlueShiftIntensityDay=0.55 BlueShiftIntensityDay=0.17
BlueShiftIntensityInteriorNight=0.81 BlueShiftIntensityInteriorNight=0.4
BlueShiftIntensityInteriorDay=0.65 BlueShiftIntensityInteriorDay=0.21
EnableAnamorphicBloom=true EnableAnamorphicBloom=true
AnamBlendNight=0.77 AnamBlendNight=0.28
AnamBlendDay=0.71 AnamBlendDay=0.15
AnamBlendInteriorNight=0.79 AnamBlendInteriorNight=0.33
AnamBlendInteriorDay=0.75 AnamBlendInteriorDay=0.22
AnamBlueShiftColorNightRed=0.35 AnamBlueShiftColorNightRed=0.35
AnamBlueShiftColorNightGreen=0.08 AnamBlueShiftColorNightGreen=0.08
AnamBlueShiftColorNightBlue=1.0 AnamBlueShiftColorNightBlue=1.0
@ -62,14 +62,14 @@ AnamBlueShiftColorInteriorNightBlue=1.0
AnamBlueShiftColorInteriorDayRed=0.21 AnamBlueShiftColorInteriorDayRed=0.21
AnamBlueShiftColorInteriorDayGreen=0.42 AnamBlueShiftColorInteriorDayGreen=0.42
AnamBlueShiftColorInteriorDayBlue=1.0 AnamBlueShiftColorInteriorDayBlue=1.0
AnamBlueShiftIntensityNight=1.11 AnamBlueShiftIntensityNight=4.44
AnamBlueShiftIntensityDay=1.06 AnamBlueShiftIntensityDay=3.21
AnamBlueShiftIntensityInteriorNight=1.15 AnamBlueShiftIntensityInteriorNight=5.88
AnamBlueShiftIntensityInteriorDay=1.07 AnamBlueShiftIntensityInteriorDay=4.03
AnamPowerNight=1.23 AnamPowerNight=1.05
AnamPowerDay=1.2 AnamPowerDay=1.11
AnamPowerInteriorNight=1.26 AnamPowerInteriorNight=1.03
AnamPowerInteriorDay=1.22 AnamPowerInteriorDay=1.08
AnamLengthMultiplier=4.0 AnamLengthMultiplier=4.0
BloomAngle=0.0 BloomAngle=0.0
BloomVertical=false BloomVertical=false
@ -88,3 +88,5 @@ DirtDiffraction=0.26
DirtBumpPower=1.2 DirtBumpPower=1.2
DirtPower=1.23 DirtPower=1.23
DirtFactor=1.369999 DirtFactor=1.369999
BlueShiftLuminanceFactorPass=0.18
BlueShiftColorFactorPass=0.32

View file

@ -17,7 +17,7 @@ UseBox=false
BoxVertical=0.8 BoxVertical=0.8
UseGrain=false UseGrain=false
GrainFrequency=2500.0 GrainFrequency=2500.0
GrainIntensity=0.02 GrainIntensity=0.03
GrainSaturation=0.0 GrainSaturation=0.0
GrainTwoPass=true GrainTwoPass=true
GrainBlend=3 GrainBlend=3
@ -32,7 +32,7 @@ GrainPass1Magnification3=2.22
GrainPass2Magnification1=4.25 GrainPass2Magnification1=4.25
GrainPass2Magnification2=0.42 GrainPass2Magnification2=0.42
GrainPass2Magnification3=6.29 GrainPass2Magnification3=6.29
GrainPower=2.27 GrainPower=2.05
UseCurve=false UseCurve=false
CurveChromaAberration=0.03 CurveChromaAberration=0.03
UseAdaptation=true UseAdaptation=true