diff --git a/src/Configuration.Chimera.cs b/src/Configuration.Chimera.cs index 9064efc7e..1e09cdbc3 100644 --- a/src/Configuration.Chimera.cs +++ b/src/Configuration.Chimera.cs @@ -28,7 +28,7 @@ namespace SPV3 { public class ConfigurationChimera : INotifyPropertyChanged { - private bool _anisotropicFiltering = true; + private bool _anisotropicFiltering = false; private bool _blockLOD = false; private int _interpolation = 8; private bool _uncapCinematic = true; diff --git a/src/Configuration.OpenSauce.cs b/src/Configuration.OpenSauce.cs index abff8e645..08174110f 100644 --- a/src/Configuration.OpenSauce.cs +++ b/src/Configuration.OpenSauce.cs @@ -30,7 +30,7 @@ public partial class Configuration { public class ConfigurationOpenSauce : INotifyPropertyChanged { - private bool _bloom = true; + private bool _bloom = false; private bool _detailedMaps = true; private double _fieldOfView; private bool _gBuffer = true; diff --git a/src/Configuration.Shaders.cs b/src/Configuration.Shaders.cs index 3add1379e..97abdbd7e 100644 --- a/src/Configuration.Shaders.cs +++ b/src/Configuration.Shaders.cs @@ -32,16 +32,16 @@ public class ConfigurationShaders : INotifyPropertyChanged { private readonly Kernel.Configuration _configuration = new Kernel.Configuration(Paths.Kernel); - private int _dof = 2; - private bool _dynamicLensFlares = true; - private bool _filmGrain = true; + private int _dof = 0; + private bool _dynamicLensFlares = false; + private bool _filmGrain = false; private bool _hudVisor = true; - private bool _lensDirt = true; - private int _motionBlur = 3; - private int _mxao = 2; - private bool _volumetricLighting = true; - private bool _ssr = true; - private bool _deband = true; + private bool _lensDirt = false; + private int _motionBlur = 0; + private int _mxao = 0; + private bool _volumetricLighting = false; + private bool _ssr = false; + private bool _deband = false; public bool ModeIsSPV33() { diff --git a/src/Configuration.UserControl.xaml.cs b/src/Configuration.UserControl.xaml.cs index 22ac5f41a..3f3ab7389 100644 --- a/src/Configuration.UserControl.xaml.cs +++ b/src/Configuration.UserControl.xaml.cs @@ -82,98 +82,110 @@ private void GBufferUnchecked(object sender, RoutedEventArgs e) private void PresetVeryLow(object sender, RoutedEventArgs e) { - _configuration.OpenSauce.GBuffer = false; - _configuration.Shaders.FilmGrain = false; - _configuration.Shaders.VolumetricLighting = false; - _configuration.Shaders.LensDirt = false; - _configuration.Shaders.DynamicLensFlares = false; - _configuration.Shaders.MotionBlur = 0; - _configuration.Shaders.DOF = 0; - _configuration.Shaders.MXAO = 0; - _configuration.Shaders.SSR = false; - _configuration.Shaders.Deband = false; - _configuration.Chimera.Interpolation = 8; - _configuration.Chimera.BlockLOD = false; + _configuration.OpenSauce.GBuffer = false; + _configuration.Shaders.FilmGrain = false; + _configuration.Shaders.VolumetricLighting = false; + _configuration.Shaders.LensDirt = false; + _configuration.Shaders.DynamicLensFlares = false; + _configuration.Shaders.MotionBlur = 0; + _configuration.Shaders.DOF = 0; + _configuration.Shaders.MXAO = 0; + _configuration.Shaders.SSR = false; + _configuration.Shaders.Deband = false; + _configuration.OpenSauce.Bloom = false; + _configuration.Chimera.Interpolation = 0; + _configuration.Chimera.AnisotropicFiltering = false; + _configuration.Chimera.BlockLOD = false; } private void PresetLow(object sender, RoutedEventArgs e) { - _configuration.OpenSauce.GBuffer = true; - _configuration.Shaders.FilmGrain = false; - _configuration.Shaders.VolumetricLighting = true; - _configuration.Shaders.LensDirt = true; - _configuration.Shaders.DynamicLensFlares = false; - _configuration.Shaders.MotionBlur = 0; - _configuration.Shaders.DOF = 0; - _configuration.Shaders.MXAO = 0; - _configuration.Shaders.SSR = false; - _configuration.Shaders.Deband = false; - _configuration.Chimera.Interpolation = 8; - _configuration.Chimera.BlockLOD = false; + _configuration.OpenSauce.GBuffer = true; + _configuration.Shaders.FilmGrain = false; + _configuration.Shaders.VolumetricLighting = true; + _configuration.Shaders.LensDirt = true; + _configuration.Shaders.DynamicLensFlares = false; + _configuration.Shaders.MotionBlur = 0; + _configuration.Shaders.DOF = 0; + _configuration.Shaders.MXAO = 0; + _configuration.Shaders.SSR = false; + _configuration.Shaders.Deband = false; + _configuration.OpenSauce.Bloom = false; + _configuration.Chimera.Interpolation = 8; + _configuration.Chimera.AnisotropicFiltering = false; + _configuration.Chimera.BlockLOD = false; } private void PresetMedium(object sender, RoutedEventArgs e) { - _configuration.OpenSauce.GBuffer = true; - _configuration.Shaders.FilmGrain = false; - _configuration.Shaders.VolumetricLighting = true; - _configuration.Shaders.LensDirt = true; - _configuration.Shaders.DynamicLensFlares = false; - _configuration.Shaders.MotionBlur = 1; - _configuration.Shaders.DOF = 1; - _configuration.Shaders.MXAO = 0; - _configuration.Shaders.SSR = false; - _configuration.Shaders.Deband = true; - _configuration.Chimera.Interpolation = 8; - _configuration.Chimera.BlockLOD = false; + _configuration.OpenSauce.GBuffer = true; + _configuration.Shaders.FilmGrain = false; + _configuration.Shaders.VolumetricLighting = true; + _configuration.Shaders.LensDirt = true; + _configuration.Shaders.DynamicLensFlares = false; + _configuration.Shaders.MotionBlur = 1; + _configuration.Shaders.DOF = 1; + _configuration.Shaders.MXAO = 0; + _configuration.Shaders.SSR = false; + _configuration.Shaders.Deband = true; + _configuration.OpenSauce.Bloom = true; + _configuration.Chimera.Interpolation = 8; + _configuration.Chimera.AnisotropicFiltering = true; + _configuration.Chimera.BlockLOD = false; } private void PresetHigh(object sender, RoutedEventArgs e) { - _configuration.OpenSauce.GBuffer = true; - _configuration.Shaders.FilmGrain = true; - _configuration.Shaders.VolumetricLighting = true; - _configuration.Shaders.LensDirt = true; - _configuration.Shaders.DynamicLensFlares = false; - _configuration.Shaders.MotionBlur = 2; - _configuration.Shaders.DOF = 1; - _configuration.Shaders.MXAO = 1; - _configuration.Shaders.SSR = false; - _configuration.Shaders.Deband = true; - _configuration.Chimera.Interpolation = 8; - _configuration.Chimera.BlockLOD = false; + _configuration.OpenSauce.GBuffer = true; + _configuration.Shaders.FilmGrain = true; + _configuration.Shaders.VolumetricLighting = true; + _configuration.Shaders.LensDirt = true; + _configuration.Shaders.DynamicLensFlares = false; + _configuration.Shaders.MotionBlur = 2; + _configuration.Shaders.DOF = 1; + _configuration.Shaders.MXAO = 1; + _configuration.Shaders.SSR = false; + _configuration.Shaders.Deband = true; + _configuration.OpenSauce.Bloom = true; + _configuration.Chimera.Interpolation = 8; + _configuration.Chimera.AnisotropicFiltering = true; + _configuration.Chimera.BlockLOD = false; } private void PresetVeryHigh(object sender, RoutedEventArgs e) { - _configuration.OpenSauce.GBuffer = true; - _configuration.Shaders.FilmGrain = true; - _configuration.Shaders.VolumetricLighting = true; - _configuration.Shaders.LensDirt = true; - _configuration.Shaders.DynamicLensFlares = false; - _configuration.Shaders.MotionBlur = 3; - _configuration.Shaders.DOF = 2; - _configuration.Shaders.MXAO = 2; - _configuration.Shaders.Deband = true; - _configuration.Shaders.SSR = false; - _configuration.Chimera.Interpolation = 8; - _configuration.Chimera.BlockLOD = false; + _configuration.OpenSauce.GBuffer = true; + _configuration.Shaders.FilmGrain = true; + _configuration.Shaders.VolumetricLighting = true; + _configuration.Shaders.LensDirt = true; + _configuration.Shaders.DynamicLensFlares = false; + _configuration.Shaders.MotionBlur = 3; + _configuration.Shaders.DOF = 2; + _configuration.Shaders.MXAO = 2; + _configuration.Shaders.Deband = true; + _configuration.Shaders.SSR = false; + _configuration.OpenSauce.Bloom = true; + _configuration.Chimera.Interpolation = 8; + _configuration.Chimera.AnisotropicFiltering = true; + _configuration.Chimera.BlockLOD = false; } private void PresetUltra(object sender, RoutedEventArgs e) { - _configuration.OpenSauce.GBuffer = true; - _configuration.Shaders.FilmGrain = true; - _configuration.Shaders.VolumetricLighting = true; - _configuration.Shaders.LensDirt = true; - _configuration.Shaders.DynamicLensFlares = true; - _configuration.Shaders.MotionBlur = 3; - _configuration.Shaders.DOF = 2; - _configuration.Shaders.MXAO = 2; - _configuration.Shaders.SSR = true; - _configuration.Shaders.Deband = true; - _configuration.Chimera.Interpolation = 8; - _configuration.Chimera.BlockLOD = false; + _configuration.OpenSauce.GBuffer = true; + _configuration.Shaders.FilmGrain = true; + _configuration.Shaders.VolumetricLighting = true; + _configuration.Shaders.LensDirt = true; + _configuration.Shaders.DynamicLensFlares = true; + _configuration.Shaders.MotionBlur = 3; + _configuration.Shaders.DOF = 2; + _configuration.Shaders.MXAO = 2; + _configuration.Shaders.SSR = true; + _configuration.Shaders.Deband = true; + _configuration.OpenSauce.Bloom = true; + _configuration.Chimera.Interpolation = 8; + _configuration.Chimera.AnisotropicFiltering = true; + _configuration.Chimera.BlockLOD = false; } } } \ No newline at end of file diff --git a/src/Main.Load.cs b/src/Main.Load.cs index 1c072daae..6785d41fc 100644 --- a/src/Main.Load.cs +++ b/src/Main.Load.cs @@ -96,7 +96,7 @@ public void Invoke() else { chimera.Interpolation = 8; - chimera.AnisotropicFiltering = true; + chimera.AnisotropicFiltering = false; chimera.UncapCinematic = true; chimera.BlockLOD = false; }