From 0e69aeb0bcba6b6fc9b12aaeff5f9fe13200541e Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 7 Apr 2019 17:16:05 +0200
Subject: [PATCH] MariENB 1.2015.5.1

---
 enbseries/menbeffectfilters.fx             | 15 +--------------
 enbseries/menbeffectsettings.fx            | 12 ------------
 enbseries/menbprepassinternals.fx          |  4 ----
 settings_skyrim/enbseries/enbbloom.fx.ini  | 10 +++++-----
 settings_skyrim/enbseries/enbeffect.fx.ini |  5 +++++
 5 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/enbseries/menbeffectfilters.fx b/enbseries/menbeffectfilters.fx
index 29c2325..d8be1fa 100644
--- a/enbseries/menbeffectfilters.fx
+++ b/enbseries/menbeffectfilters.fx
@@ -300,30 +300,17 @@ float3 FilmGrain( float3 res, float2 coord )
 	}
 	return lerp(res,nt,ni);
 }
-/* REVOLUTIONARY ULTRA-AWESOME FILTER */
-float3 Aberration( sampler2D smp, float2 coord )
-{
-	float3 eta = float3(1+chromaab*0.09,1+chromaab*0.06,1+chromaab*0.03);
-	float2 mid = coord-0.5;
-	float2 rc = eta.r*(1.0-chromaab*0.1)*mid+0.5;
-	float2 gc = eta.g*(1.0-chromaab*0.1)*mid+0.5;
-	float2 bc = eta.b*(1.0-chromaab*0.1)*mid+0.5;
-	float3 ab = float3(tex2D(smp,rc).r,tex2D(smp,gc).g,tex2D(smp,bc).b);
-	return ab;
-}
 /* MariENB shader */
 float4 PS_Mari( VS_OUTPUT_POST IN, float2 vPos : VPOS ) : COLOR
 {
 	float2 coord = IN.txcoord0.xy;
 	float4 res = tex2D(_s0,coord);
-	if ( usecurve ) res.rgb = Aberration(_s0,coord);
 	if ( aenable ) res.rgb = Adaptation(res.rgb);
 	if ( tmapenable && tmapbeforecomp ) res.rgb = Tonemap(res.rgb);
 	if ( compenable ) res.rgb = Compensate(res.rgb);
 	if ( tmapenable && !tmapbeforecomp ) res.rgb = Tonemap(res.rgb);
 	if ( bloomdebug	) res.rgb *= 0;
-	if ( usecurve ) res.rgb += Aberration(_s3,coord)*EBloomAmount;
-	else res += tex2D(_s3,coord)*EBloomAmount;
+	res.rgb += tex2D(_s3,coord).rgb*EBloomAmount;
 	if ( tintbeforegrade && tintenable ) res.rgb = Tint(res.rgb);
 	if ( vgradeenable ) res.rgb = GradingGame(res.rgb);
 	if ( gradeenable1 ) res.rgb = GradingRGB(res.rgb);
diff --git a/enbseries/menbeffectsettings.fx b/enbseries/menbeffectsettings.fx
index 893e924..e852951 100644
--- a/enbseries/menbeffectsettings.fx
+++ b/enbseries/menbeffectsettings.fx
@@ -205,18 +205,6 @@ float nj
 	string UIWidget = "Spinner";
 	float UIMin = 0.0;
 > = {2.0};
-/* use curvature + chromatic aberration filter */
-bool usecurve
-<
-	string UIName = "UseCurve";
-	string UIWidget = "Checkbox";
-> = {false};
-/* this is a stupid filter and you should feel bad for using it */
-float chromaab
-<
-	string UIName = "CurveChromaAberration";
-	string UIWidget = "Spinner";
-> = {0.05};
 /* "adaptation" factors */
 bool aenable
 <
diff --git a/enbseries/menbprepassinternals.fx b/enbseries/menbprepassinternals.fx
index f311f5f..e505c42 100644
--- a/enbseries/menbprepassinternals.fx
+++ b/enbseries/menbprepassinternals.fx
@@ -85,10 +85,6 @@ texture2D texNoise3
 <
 	string ResourceName = "menbnoise2.png";
 >;
-texture2D texWater
-<
-	string ResourceName = "menbwater.png";
->;
 texture2D texHeat
 <
 	string ResourceName = "menbheat.png";
diff --git a/settings_skyrim/enbseries/enbbloom.fx.ini b/settings_skyrim/enbseries/enbbloom.fx.ini
index 8a11542..91d3999 100644
--- a/settings_skyrim/enbseries/enbbloom.fx.ini
+++ b/settings_skyrim/enbseries/enbbloom.fx.ini
@@ -17,10 +17,10 @@ BloomPowerNight=0.74
 BloomPowerDay=0.78
 BloomPowerInteriorNight=0.76
 BloomPowerInteriorDay=0.72
-BloomSaturationNight=0.76
-BloomSaturationDay=0.66
-BloomSaturationInteriorNight=0.8
-BloomSaturationInteriorDay=0.72
+BloomSaturationNight=0.7
+BloomSaturationDay=0.64
+BloomSaturationInteriorNight=0.74
+BloomSaturationInteriorDay=0.68
 BloomBumpNight=-0.37
 BloomBumpDay=-0.52
 BloomBumpInteriorNight=-0.35
@@ -74,7 +74,7 @@ AnamLengthMultiplier=4.0
 BloomAngle=0.0
 BloomVertical=false
 BloomHQBlur=false
-EnableLensDirt=true
+EnableLensDirt=false
 DirtMix1=0.04
 DirtMix2=0.08
 DirtMix3=0.21
diff --git a/settings_skyrim/enbseries/enbeffect.fx.ini b/settings_skyrim/enbseries/enbeffect.fx.ini
index 82443b4..720646f 100644
--- a/settings_skyrim/enbseries/enbeffect.fx.ini
+++ b/settings_skyrim/enbseries/enbeffect.fx.ini
@@ -158,3 +158,8 @@ DitherPattern=4
 DebugRegisters=false
 DebugRegistersScale=5.0
 DebugBloom=false
+UseChromaAberration=false
+ChromaAberration=0.01
+ChromaAberrationOverbright=0.0
+ChromaAberrationOverbrightMax=4.0
+ChromaAberrationOverbrightMin=0.8