From 0a52e01d58eb73878e86331aeadea831f189cad9 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 7 Apr 2019 17:24:28 +0200 Subject: [PATCH] MariENB 1.2015.10.10 --- enbseries/menbprepassfilters.fx | 7 - enbseries/menbprepasssettings.fx | 12 ++ settings_dust/enbseries.ini | 24 ++-- settings_dust/enbseries/effect.txt.ini | 16 +-- settings_dust/enbseries/enbbloom.fx.ini | 18 +-- settings_dust/enbseries/enbeffect.fx.ini | 4 +- .../enbseries/enbeffectprepass.fx.ini | 126 +++++++++--------- 7 files changed, 108 insertions(+), 99 deletions(-) diff --git a/enbseries/menbprepassfilters.fx b/enbseries/menbprepassfilters.fx index 80d341a..e45e638 100644 --- a/enbseries/menbprepassfilters.fx +++ b/enbseries/menbprepassfilters.fx @@ -21,13 +21,6 @@ VS_OUTPUT_POST VS_Pass( VS_INPUT_POST IN ) /* these are znear/zfar values for Skyrim, but MAY match Fallout too */ float depthlinear( float2 coord ) { - /* - These values seem to be used by pretty much all Skyrim ENB presets. - Since it's practically impossible for me to know the real znear and - zfar values for each game, I'll just use these and hope it goes well - */ - float zNear = 0.0509804; - float zFar = 3098.0392; float z = tex2D(SamplerDepth,coord).x; return (2*zNear)/(zFar+zNear-z*(zFar-zNear)); } diff --git a/enbseries/menbprepasssettings.fx b/enbseries/menbprepasssettings.fx index d6c4ebd..dbcfe7b 100644 --- a/enbseries/menbprepasssettings.fx +++ b/enbseries/menbprepasssettings.fx @@ -25,6 +25,18 @@ float cutoff float UIMin = 0.0; float UIMax = 1000000.0; > = {999949.0}; +float zNear +< + string UIName = "Near Z"; + string UIWidget = "Spinner"; + float UIMin = 0.0; +> = {0.05}; +float zFar +< + string UIName = "Far Z"; + string UIWidget = "Spinner"; + float UIMin = 0.0; +> = {3098.0}; string str_dist = "Distortion Filters"; float distcha < diff --git a/settings_dust/enbseries.ini b/settings_dust/enbseries.ini index 8fe9043..be42647 100644 --- a/settings_dust/enbseries.ini +++ b/settings_dust/enbseries.ini @@ -8,7 +8,7 @@ EnableBloom=true EnableLens=false EnableAdaptation=true EnableDepthOfField=true -EnableAmbientOcclusion=true +EnableAmbientOcclusion=false EnableDetailedShadow=false EnableSunRays=true EnableSunGlare=false @@ -99,10 +99,10 @@ AmbientLightingDesaturationNight=0.0 AmbientLightingDesaturationInterior=0.0 FogColorMultiplierDay=0.85 -FogColorMultiplierNight=0.95 +FogColorMultiplierNight=0.7 FogColorMultiplierInterior=0.85 FogColorCurveDay=1.25 -FogColorCurveNight=1.15 +FogColorCurveNight=1.4 FogColorCurveInterior=1.2 [SKY] @@ -122,25 +122,25 @@ CloudsEdgeClamp=0.25 CloudsEdgeIntensity=0.75 GradientIntensityDay=0.950001 -GradientIntensityNight=0.900001 +GradientIntensityNight=1.0 -GradientDesaturationDay=0.0 -GradientDesaturationNight=0.0 +GradientDesaturationDay=0.05 +GradientDesaturationNight=0.65 GradientTopIntensityDay=0.9 -GradientTopIntensityNight=0.8 +GradientTopIntensityNight=1.0 GradientTopCurveDay=0.75 -GradientTopCurveNight=0.8 +GradientTopCurveNight=0.7 GradientMiddleIntensityDay=0.85 -GradientMiddleIntensityNight=0.900001 +GradientMiddleIntensityNight=1.200001 GradientMiddleCurveDay=0.8 -GradientMiddleCurveNight=1.1 +GradientMiddleCurveNight=0.7 GradientHorizonIntensityDay=1.000001 -GradientHorizonIntensityNight=0.9 +GradientHorizonIntensityNight=1.1 GradientHorizonCurveDay=1.0 -GradientHorizonCurveNight=0.9 +GradientHorizonCurveNight=0.8 SunIntensity=4.0 SunDesaturation=0.0 diff --git a/settings_dust/enbseries/effect.txt.ini b/settings_dust/enbseries/effect.txt.ini index ab8b1e5..c5555d8 100644 --- a/settings_dust/enbseries/effect.txt.ini +++ b/settings_dust/enbseries/effect.txt.ini @@ -9,10 +9,10 @@ Palette Type=4 CGA Palette=4 EGA Palette=0 Dithering Pattern=4 -Contrast Modifier=0.8 +Contrast Modifier=1.0 Saturation Modifier=1.0 -Dither Offset=-0.1 -Dither Range=0.25 +Dither Offset=-0.05 +Dither Range=0.15 Enable ASCII=false ASCII Monochrome=false ASCII Blend=0.0 @@ -23,11 +23,11 @@ Chroma Key Blue=0.0 Chroma Key Depth=0.98 Enable Dot Matrix=false Dot Size=1 -Dot Blend=0.1 +Dot Blend=0.3 Dot Intensity=2.4 Dot Contrast=0.8 Enable Curvature=false -Curve Chromatic Aberration=0.65 -Curve Zooming=54.0 -Curve Distortion=42.0 -Curve Sampling Soften=0.25 +Curve Chromatic Aberration=1.0 +Curve Zooming=50.5 +Curve Distortion=0.0 +Curve Sampling Soften=0.0 diff --git a/settings_dust/enbseries/enbbloom.fx.ini b/settings_dust/enbseries/enbbloom.fx.ini index f5e8708..0422588 100644 --- a/settings_dust/enbseries/enbbloom.fx.ini +++ b/settings_dust/enbseries/enbbloom.fx.ini @@ -1,21 +1,21 @@ [ENBBLOOM.FX] TECHNIQUE=0 Bloom Intensity Night=1.28 -Bloom Intensity Day=1.09 +Bloom Intensity Day=1.17 Bloom Intensity Interior Night=1.39 -Bloom Intensity Interior Day=1.14 +Bloom Intensity Interior Day=1.22 Bloom Contrast Night=0.93 -Bloom Contrast Day=0.83 +Bloom Contrast Day=0.84 Bloom Contrast Interior Night=0.91 Bloom Contrast Interior Day=0.79 Bloom Saturation Night=1.05 Bloom Saturation Day=1.03 Bloom Saturation Interior Night=1.07 Bloom Saturation Interior Day=1.04 -Bloom Offset Night=-0.18 -Bloom Offset Day=-0.23 -Bloom Offset Interior Night=-0.12 -Bloom Offset Interior Day=-0.17 +Bloom Offset Night=-0.14 +Bloom Offset Day=-0.18 +Bloom Offset Interior Night=-0.1 +Bloom Offset Interior Day=-0.16 Bloom Intensity Cap Night=100.0 Bloom Intensity Cap Day=100.0 Bloom Intensity Cap Interior Night=100.0 @@ -83,5 +83,5 @@ Dirt Pass 8 Blend=7.06 Dirt Prepass Blend=0.0 Dirt Base Blend=0.0 Dirt Texture Preserve Aspect=true -Dirt Contrast=0.94 -Dirt Factor=0.57 +Dirt Contrast=0.58 +Dirt Factor=0.39 diff --git a/settings_dust/enbseries/enbeffect.fx.ini b/settings_dust/enbseries/enbeffect.fx.ini index 592b297..0494561 100644 --- a/settings_dust/enbseries/enbeffect.fx.ini +++ b/settings_dust/enbseries/enbeffect.fx.ini @@ -2,7 +2,7 @@ TECHNIQUE=0 Enable Grain=true Grain Speed=2500.0 -Grain Intensity=0.03 +Grain Intensity=0.05 Grain Saturation=0.33 Grain Two-Pass=true Grain Blending Mode=3 @@ -17,7 +17,7 @@ Grain Pass 1 Magnification 3=2.22 Grain Pass 2 Magnification 1=4.25 Grain Pass 2 Magnification 2=0.42 Grain Pass 2 Magnification 3=6.29 -Grain Contrast=1.74 +Grain Contrast=2.59 Enable Adaptation=true Adaptation Min Night=0.38 Adaptation Min Day=0.53 diff --git a/settings_dust/enbseries/enbeffectprepass.fx.ini b/settings_dust/enbseries/enbeffectprepass.fx.ini index 2fbb57a..fbd74cd 100644 --- a/settings_dust/enbseries/enbeffectprepass.fx.ini +++ b/settings_dust/enbseries/enbeffectprepass.fx.ini @@ -16,14 +16,14 @@ Underwater Amplitude 2=0.27 Underwater Amplitude 3=0.29 Underwater Zoom=1.28 Enable Hot Air Refraction=true -Heat Texture Size=1.27 -Heat Speed=1.2 +Heat Texture Size=2.08 +Heat Speed=0.73 Heat Fade Contrast=319.76001 -Heat Fade Intensity=1.16 +Heat Fade Intensity=1.14 Heat Fade Offset=-0.56 -Heat Intensity=0.85 +Heat Intensity=1.08 Heat Contrast=1.64 -Heat Time-of-day Contrast=1.25 +Heat Time-of-day Contrast=2.82 Heat Always Enable=false Enable Focus Triangle=true Display Focus Points=false @@ -36,22 +36,22 @@ Focus Triangle Radius Night=15.0 Focus Triangle Radius Day=20.0 Focus Triangle Radius Interior Night=10.0 Focus Triangle Radius Interior Day=15.0 -Focus Triangle Blending Night=0.6 -Focus Triangle Blending Day=0.5 -Focus Triangle Blending Interior Night=0.6 -Focus Triangle Blending Interior Day=0.5 +Focus Triangle Blending Night=0.2 +Focus Triangle Blending Day=0.3 +Focus Triangle Blending Interior Night=0.15 +Focus Triangle Blending Interior Day=0.25 Focus Maximum Depth Night=990.349976 Focus Maximum Depth Day=994.340027 Focus Maximum Depth Interior Night=984.919983 Focus Maximum Depth Interior Day=989.539978 -DOF Intensity Night=475.899994 -DOF Intensity Day=294.299988 -DOF Intensity Interior Night=480.799988 -DOF Intensity Interior Day=242.300003 -DOF Contrast Night=2.75 -DOF Contrast Day=3.18 -DOF Contrast Interior Night=2.0 -DOF Contrast Interior Day=2.94 +DOF Intensity Night=575.900024 +DOF Intensity Day=494.299988 +DOF Intensity Interior Night=580.799988 +DOF Intensity Interior Day=442.299988 +DOF Contrast Night=1.55 +DOF Contrast Day=2.04 +DOF Contrast Interior Night=1.49 +DOF Contrast Interior Day=1.87 DOF Shift Night=0.0 DOF Shift Day=0.0 DOF Shift Interior Night=0.0 @@ -72,85 +72,89 @@ DOF Fixed Focus Blend Night=0.0 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=2.87 -DOF Fixed Unfocus Intensity Day=1.47 -DOF Fixed Unfocus Intensity Interior Night=2.14 -DOF Fixed Unfocus Intensity Interior Day=1.27 -DOF Fixed Unfocus Contrast Night=956.559998 -DOF Fixed Unfocus Contrast Day=983.109985 -DOF Fixed Unfocus Contrast Interior Night=935.840027 -DOF Fixed Unfocus Contrast Interior Day=968.080017 -DOF Fixed Unfocus Shift Night=0.0 -DOF Fixed Unfocus Shift Day=0.0 -DOF Fixed Unfocus Shift Interior Night=0.0 -DOF Fixed Unfocus Shift Interior Day=0.0 -DOF Fixed Unfocus Blend Night=0.25 -DOF Fixed Unfocus Blend Day=0.25 -DOF Fixed Unfocus Blend Interior Night=0.25 -DOF Fixed Unfocus Blend Interior Day=0.25 +DOF Fixed Unfocus Intensity Night=1.73 +DOF Fixed Unfocus Intensity Day=1.62 +DOF Fixed Unfocus Intensity Interior Night=1.68 +DOF Fixed Unfocus Intensity Interior Day=1.53 +DOF Fixed Unfocus Contrast Night=797.460022 +DOF Fixed Unfocus Contrast Day=814.669983 +DOF Fixed Unfocus Contrast Interior Night=456.339996 +DOF Fixed Unfocus Contrast Interior Day=542.710022 +DOF Fixed Unfocus Shift Night=-0.92 +DOF Fixed Unfocus Shift Day=-0.96 +DOF Fixed Unfocus Shift Interior Night=-0.95 +DOF Fixed Unfocus Shift Interior Day=-0.97 +DOF Fixed Unfocus Blend Night=1.0 +DOF Fixed Unfocus Blend Day=1.0 +DOF Fixed Unfocus Blend Interior Night=1.0 +DOF Fixed Unfocus Blend Interior Day=1.0 Disable DOF=false DOF Bilateral Blur=true DOF Bilateral Factor=5.0 DOF Blur Radius=1.0 DOF Relative to FOV=false Default FOV=75.0 -DOF Relative Factor Night=2.0 -DOF Relative Factor Day=2.0 -DOF Relative Factor Interior Night=2.0 -DOF Relative Factor Interior Day=2.0 +DOF Relative Factor Night=0.0 +DOF Relative Factor Day=0.0 +DOF Relative Factor Interior Night=0.0 +DOF Relative Factor Interior Day=0.0 Debug Depth=false Debug Focus=false Enable Depth Edge Detect=false Edge Fade Contrast Night=1.82 Edge Fade Contrast Day=1.86 -Edge Fade Contrast Interior Night=1.86 -Edge Fade Contrast Interior Day=1.93 +Edge Fade Contrast Interior Night=2.9 +Edge Fade Contrast Interior Day=3.0 Edge Fade Intensity Night=700.0 Edge Fade Intensity Day=800.0 Edge Fade Intensity Interior Night=700.0 Edge Fade Intensity Interior Day=800.0 Edge Contrast=0.25 Edge Intensity=2.0 -Edge Radius=1.0 -Edge Threshold=1.0 +Edge Radius=4.0 +Edge Threshold=0.01 Debug Edge=false Enable Luma Edge Detect=false Cel Radius=1.0 Cel Intensity=4.0 -Cel Contrast=0.5 +Cel Contrast=0.75 Debug Cel=false Enable Edgevision=false Edgevision Fade Contrast Night=1.82 -Edgevision Fade Contrast Day=1.0 -Edgevision Fade Contrast Interior Night=1.86 -Edgevision Fade Contrast Interior Day=1.93 +Edgevision Fade Contrast Day=1.86 +Edgevision Fade Contrast Interior Night=2.9 +Edgevision Fade Contrast Interior Day=3.0 Edgevision Fade Intensity Night=700.0 Edgevision Fade Intensity Day=800.0 -Edgevision Fade Intensity Interior Night=700.0 -Edgevision Fade Intensity Interior Day=800.0 +Edgevision Fade Intensity Interior Night=500.0 +Edgevision Fade Intensity Interior Day=600.0 Edgevision Contrast=0.25 -Edgevision Intensity=8.0 +Edgevision Intensity=32.0 Edgevision Radius=1.0 -Enable SSAO=false -SSAO Radius=0.25 +Enable SSAO=true +SSAO Radius=0.15 SSAO Noise=0 -SSAO Fade Contrast Night=0.11 -SSAO Fade Contrast Day=0.19 -SSAO Fade Contrast Interior Night=0.12 -SSAO Fade Contrast Interior Day=0.18 -SSAO Fade Intensity Night=2.12 -SSAO Fade Intensity Day=2.29 -SSAO Fade Intensity Interior Night=2.08 -SSAO Fade Intensity Interior Day=2.15 +SSAO Fade Contrast Night=0.94 +SSAO Fade Contrast Day=0.23 +SSAO Fade Contrast Interior Night=0.49 +SSAO Fade Contrast Interior Day=0.27 +SSAO Fade Intensity Night=30.59 +SSAO Fade Intensity Day=25.940001 +SSAO Fade Intensity Interior Night=26.41 +SSAO Fade Intensity Interior Day=21.389999 SSAO Intensity=1.0 -SSAO Contrast=1.5 +SSAO Contrast=1.0 SSAO Blending=1.0 SSAO Blur=true -SSAO Bilateral Factor=10000.0 -SSAO Range=1.0 +SSAO Bilateral Factor=5000.0 +SSAO Range=0.25 SSAO Blur Radius=1.0 Debug SSAO=false Sharpen Enable=true Sharpen Radius=1.0 Sharpen Clamp=0.1 Sharpen Blending=4.0 +DOF Fixed Use Cutoff=true +SSAO Use Less Samples=true +Near Z=0.05 +Far Z=64000.0