From 41ad12cb14391408cbb8e3a411fedec7070fbd67 Mon Sep 17 00:00:00 2001
From: WoMspace <alex0002b@gmail.com>
Date: Thu, 12 Jan 2023 21:28:26 +0000
Subject: [PATCH] Improved DoF

---
 shaders/composite15.fsh    | 373 ++--------------------------------
 shaders/lang/en_us.lang    |  11 +-
 shaders/lib/bokeh.glsl     | 402 +++++++++++++++++++++++++++++++++++++
 shaders/lib/settings.glsl  |   5 +-
 shaders/shaders.properties |   4 +-
 5 files changed, 429 insertions(+), 366 deletions(-)
 create mode 100644 shaders/lib/bokeh.glsl

diff --git a/shaders/composite15.fsh b/shaders/composite15.fsh
index 04fa3e0..60ebfb3 100644
--- a/shaders/composite15.fsh
+++ b/shaders/composite15.fsh
@@ -2,349 +2,16 @@
 //Vignetting, applies bloom, applies exposure and tonemaps the final image
 #extension GL_EXT_gpu_shader4 : enable
 
-#include "lib/settings.glsl"
+#include "/lib/settings.glsl"
 
 #include "/lib/res_params.glsl"
 
-#ifdef DOF
-	//hexagon pattern
-	const vec2 hex_offsets[60] = vec2[60] (	vec2(  0.2165,  0.1250 ),
-											vec2(  0.0000,  0.2500 ),
-											vec2( -0.2165,  0.1250 ),
-											vec2( -0.2165, -0.1250 ),
-											vec2( -0.0000, -0.2500 ),
-											vec2(  0.2165, -0.1250 ),
-											vec2(  0.4330,  0.2500 ),
-											vec2(  0.0000,  0.5000 ),
-											vec2( -0.4330,  0.2500 ),
-											vec2( -0.4330, -0.2500 ),
-											vec2( -0.0000, -0.5000 ),
-											vec2(  0.4330, -0.2500 ),
-											vec2(  0.6495,  0.3750 ),
-											vec2(  0.0000,  0.7500 ),
-											vec2( -0.6495,  0.3750 ),
-											vec2( -0.6495, -0.3750 ),
-											vec2( -0.0000, -0.7500 ),
-											vec2(  0.6495, -0.3750 ),
-											vec2(  0.8660,  0.5000 ),
-											vec2(  0.0000,  1.0000 ),
-											vec2( -0.8660,  0.5000 ),
-											vec2( -0.8660, -0.5000 ),
-											vec2( -0.0000, -1.0000 ),
-											vec2(  0.8660, -0.5000 ),
-											vec2(  0.2163,  0.3754 ),
-											vec2( -0.2170,  0.3750 ),
-											vec2( -0.4333, -0.0004 ),
-											vec2( -0.2163, -0.3754 ),
-											vec2(  0.2170, -0.3750 ),
-											vec2(  0.4333,  0.0004 ),
-											vec2(  0.4328,  0.5004 ),
-											vec2( -0.2170,  0.6250 ),
-											vec2( -0.6498,  0.1246 ),
-											vec2( -0.4328, -0.5004 ),
-											vec2(  0.2170, -0.6250 ),
-											vec2(  0.6498, -0.1246 ),
-											vec2(  0.6493,  0.6254 ),
-											vec2( -0.2170,  0.8750 ),
-											vec2( -0.8663,  0.2496 ),
-											vec2( -0.6493, -0.6254 ),
-											vec2(  0.2170, -0.8750 ),
-											vec2(  0.8663, -0.2496 ),
-											vec2(  0.2160,  0.6259 ),
-											vec2( -0.4340,  0.5000 ),
-											vec2( -0.6500, -0.1259 ),
-											vec2( -0.2160, -0.6259 ),
-											vec2(  0.4340, -0.5000 ),
-											vec2(  0.6500,  0.1259 ),
-											vec2(  0.4325,  0.7509 ),
-											vec2( -0.4340,  0.7500 ),
-											vec2( -0.8665, -0.0009 ),
-											vec2( -0.4325, -0.7509 ),
-											vec2(  0.4340, -0.7500 ),
-											vec2(  0.8665,  0.0009 ),
-											vec2(  0.2158,  0.8763 ),
-											vec2( -0.6510,  0.6250 ),
-											vec2( -0.8668, -0.2513 ),
-											vec2( -0.2158, -0.8763 ),
-											vec2(  0.6510, -0.6250 ),
-											vec2(  0.8668,  0.2513 ));
-
-	const vec2 offsets[60] = vec2[60]  (  vec2( 0.0000, 0.2500 ),
-									vec2( -0.2165, 0.1250 ),
-									vec2( -0.2165, -0.1250 ),
-									vec2( -0.0000, -0.2500 ),
-									vec2( 0.2165, -0.1250 ),
-									vec2( 0.2165, 0.1250 ),
-									vec2( 0.0000, 0.5000 ),
-									vec2( -0.2500, 0.4330 ),
-									vec2( -0.4330, 0.2500 ),
-									vec2( -0.5000, 0.0000 ),
-									vec2( -0.4330, -0.2500 ),
-									vec2( -0.2500, -0.4330 ),
-									vec2( -0.0000, -0.5000 ),
-									vec2( 0.2500, -0.4330 ),
-									vec2( 0.4330, -0.2500 ),
-									vec2( 0.5000, -0.0000 ),
-									vec2( 0.4330, 0.2500 ),
-									vec2( 0.2500, 0.4330 ),
-									vec2( 0.0000, 0.7500 ),
-									vec2( -0.2565, 0.7048 ),
-									vec2( -0.4821, 0.5745 ),
-									vec2( -0.6495, 0.3750 ),
-									vec2( -0.7386, 0.1302 ),
-									vec2( -0.7386, -0.1302 ),
-									vec2( -0.6495, -0.3750 ),
-									vec2( -0.4821, -0.5745 ),
-									vec2( -0.2565, -0.7048 ),
-									vec2( -0.0000, -0.7500 ),
-									vec2( 0.2565, -0.7048 ),
-									vec2( 0.4821, -0.5745 ),
-									vec2( 0.6495, -0.3750 ),
-									vec2( 0.7386, -0.1302 ),
-									vec2( 0.7386, 0.1302 ),
-									vec2( 0.6495, 0.3750 ),
-									vec2( 0.4821, 0.5745 ),
-									vec2( 0.2565, 0.7048 ),
-									vec2( 0.0000, 1.0000 ),
-									vec2( -0.2588, 0.9659 ),
-									vec2( -0.5000, 0.8660 ),
-									vec2( -0.7071, 0.7071 ),
-									vec2( -0.8660, 0.5000 ),
-									vec2( -0.9659, 0.2588 ),
-									vec2( -1.0000, 0.0000 ),
-									vec2( -0.9659, -0.2588 ),
-									vec2( -0.8660, -0.5000 ),
-									vec2( -0.7071, -0.7071 ),
-									vec2( -0.5000, -0.8660 ),
-									vec2( -0.2588, -0.9659 ),
-									vec2( -0.0000, -1.0000 ),
-									vec2( 0.2588, -0.9659 ),
-									vec2( 0.5000, -0.8660 ),
-									vec2( 0.7071, -0.7071 ),
-									vec2( 0.8660, -0.5000 ),
-									vec2( 0.9659, -0.2588 ),
-									vec2( 1.0000, -0.0000 ),
-									vec2( 0.9659, 0.2588 ),
-									vec2( 0.8660, 0.5000 ),
-									vec2( 0.7071, 0.7071 ),
-									vec2( 0.5000, 0.8660 ),
-									vec2( 0.2588, 0.9659 ));
-
-const vec2 shadow_offsets[209] = vec2[209](vec2(0.8886414f , 0.07936136f),
-vec2(0.8190064f , 0.1900164f),
-vec2(0.8614115f , -0.06991258f),
-vec2(0.7685533f , 0.03792081f),
-vec2(0.9970094f , 0.02585129f),
-vec2(0.9686818f , 0.1570935f),
-vec2(0.9854341f , -0.09172997f),
-vec2(0.9330608f , 0.3326486f),
-vec2(0.8329557f , -0.2438523f),
-vec2(0.664771f , -0.0837701f),
-vec2(0.7429124f , -0.1530652f),
-vec2(0.9506453f , -0.2174281f),
-vec2(0.8192949f , 0.3485171f),
-vec2(0.6851269f , 0.2711877f),
-vec2(0.7665657f , 0.5014166f),
-vec2(0.673241f , 0.3793408f),
-vec2(0.6981376f , 0.1465924f),
-vec2(0.6521665f , -0.2384985f),
-vec2(0.5145761f , -0.05752508f),
-vec2(0.5641244f , -0.169443f),
-vec2(0.5916035f , 0.06004957f),
-vec2(0.57079f , 0.234188f),
-vec2(0.509311f , 0.1523665f),
-vec2(0.4204576f , 0.05759521f),
-vec2(0.8200846f , -0.3601041f),
-vec2(0.6893264f , -0.3473432f),
-vec2(0.4775535f , -0.3062558f),
-vec2(0.438106f , -0.1796866f),
-vec2(0.4056528f , -0.08251233f),
-vec2(0.5771964f , 0.5502692f),
-vec2(0.5094061f , 0.4025192f),
-vec2(0.6908483f , 0.572951f),
-vec2(0.5379036f , -0.4542191f),
-vec2(0.8167359f , -0.4793735f),
-vec2(0.6829269f , -0.4557574f),
-vec2(0.5725697f , -0.3477072f),
-vec2(0.5767449f , -0.5782524f),
-vec2(0.3979413f , -0.4172934f),
-vec2(0.4282598f , -0.5145645f),
-vec2(0.938814f , -0.3239739f),
-vec2(0.702452f , -0.5662871f),
-vec2(0.2832307f , -0.1285671f),
-vec2(0.3230537f , -0.2691054f),
-vec2(0.2921676f , -0.3734582f),
-vec2(0.2534037f , -0.4906001f),
-vec2(0.4343273f , 0.5223463f),
-vec2(0.3605334f , 0.3151571f),
-vec2(0.3498518f , 0.451428f),
-vec2(0.3230703f , 0.00287089f),
-vec2(0.1049206f , -0.1476725f),
-vec2(0.2063161f , -0.2608192f),
-vec2(0.7266634f , 0.6725333f),
-vec2(0.4027067f , -0.6185485f),
-vec2(0.2655533f , -0.5912259f),
-vec2(0.4947965f , 0.3025357f),
-vec2(0.5760762f , 0.68844f),
-vec2(0.4909205f , -0.6975324f),
-vec2(0.8609334f , 0.4559f),
-vec2(0.1836646f , 0.03724086f),
-vec2(0.2878554f , 0.178938f),
-vec2(0.3948484f , 0.1618928f),
-vec2(0.3519658f , -0.7628763f),
-vec2(0.6338583f , -0.673193f),
-vec2(0.5511802f , -0.8283072f),
-vec2(0.4090595f , -0.8717521f),
-vec2(0.1482169f , -0.374728f),
-vec2(0.1050598f , -0.2613987f),
-vec2(0.4210334f , 0.6578422f),
-vec2(0.2430464f , 0.4383665f),
-vec2(0.3329675f , 0.5512741f),
-vec2(0.2147711f , 0.3245511f),
-vec2(0.1227196f , 0.2529026f),
-vec2(-0.03937457f , 0.156439f),
-vec2(0.05618772f , 0.06690486f),
-vec2(0.06519571f , 0.3974038f),
-vec2(0.1360903f , 0.1466078f),
-vec2(-0.00170609f , 0.3089452f),
-vec2(0.1357622f , -0.5088975f),
-vec2(0.1604694f , -0.7453476f),
-vec2(0.1245694f , -0.6337074f),
-vec2(0.02542936f , -0.3728781f),
-vec2(0.02222222f , -0.649554f),
-vec2(0.09870815f , 0.5357338f),
-vec2(0.2073958f , 0.5452989f),
-vec2(0.216654f , -0.8935689f),
-vec2(0.2422334f , 0.665805f),
-vec2(0.0574713f , 0.6742729f),
-vec2(0.2021346f , 0.8144029f),
-vec2(0.3086587f , 0.7504997f),
-vec2(0.02122174f , -0.7498575f),
-vec2(-0.1551729f , 0.1809731f),
-vec2(-0.1947583f , 0.06246066f),
-vec2(-0.05754202f , -0.03901273f),
-vec2(-0.1083095f , 0.2952235f),
-vec2(-0.03259534f , -0.492394f),
-vec2(-0.02488567f , -0.2081116f),
-vec2(-0.1820729f , -0.1829884f),
-vec2(-0.1674413f , -0.04529009f),
-vec2(0.04342153f , -0.0368562f),
-vec2(0.801399f , -0.5845526f),
-vec2(0.3158276f , -0.9124843f),
-vec2(-0.05945269f , 0.6727523f),
-vec2(0.07701834f , 0.8579889f),
-vec2(-0.05778154f , 0.5699022f),
-vec2(0.1191713f , 0.7542591f),
-vec2(-0.2578296f , 0.3630984f),
-vec2(-0.1428598f , 0.4557526f),
-vec2(-0.3304029f , 0.5055485f),
-vec2(-0.3227198f , 0.1847367f),
-vec2(-0.4183801f , 0.3412776f),
-vec2(0.2538475f , 0.9317476f),
-vec2(0.406249f , 0.8423664f),
-vec2(0.4718862f , 0.7592828f),
-vec2(0.168472f , -0.06605823f),
-vec2(0.2632498f , -0.7084918f),
-vec2(-0.2816192f , -0.1023492f),
-vec2(-0.3161443f , 0.02489911f),
-vec2(-0.4677814f , 0.08450397f),
-vec2(-0.4156994f , 0.2408664f),
-vec2(-0.237449f , 0.2605326f),
-vec2(-0.0912179f , 0.06491816f),
-vec2(0.01475127f , 0.7670643f),
-vec2(0.1216858f , -0.9368939f),
-vec2(0.07010741f , -0.841011f),
-vec2(-0.1708607f , -0.4152923f),
-vec2(-0.1345006f , -0.5842513f),
-vec2(-0.09419055f , -0.3213732f),
-vec2(-0.2149337f , 0.730642f),
-vec2(-0.1102187f , 0.8425013f),
-vec2(-0.1808572f , 0.6244397f),
-vec2(-0.2414505f , -0.7063725f),
-vec2(-0.2410318f , -0.537854f),
-vec2(-0.1005938f , -0.7635075f),
-vec2(0.1053517f , 0.9678772f),
-vec2(-0.3340288f , 0.6926677f),
-vec2(-0.2363931f , 0.8464488f),
-vec2(-0.4057773f , 0.7786722f),
-vec2(-0.5484858f , 0.1686208f),
-vec2(-0.64842f , 0.02256887f),
-vec2(-0.5544513f , -0.02348978f),
-vec2(-0.492855f , -0.1083694f),
-vec2(-0.4248196f , 0.4674786f),
-vec2(-0.5873146f , 0.4072608f),
-vec2(-0.6439911f , 0.3038489f),
-vec2(-0.6419188f , 0.1293737f),
-vec2(-0.005880734f , 0.4699725f),
-vec2(-0.4239455f , 0.6250131f),
-vec2(-0.1701273f , 0.9506347f),
-vec2(7.665656E-05f , 0.9941212f),
-vec2(-0.7070159f , 0.4426281f),
-vec2(-0.7481344f , 0.3139496f),
-vec2(-0.8330062f , 0.2472693f),
-vec2(-0.7271438f , 0.2024286f),
-vec2(-0.5179888f , 0.3149576f),
-vec2(-0.8258062f , 0.3779382f),
-vec2(-0.8063191f , 0.1262931f),
-vec2(-0.2690676f , -0.4360798f),
-vec2(-0.3714577f , -0.5887412f),
-vec2(-0.3736085f , -0.4018324f),
-vec2(-0.3228985f , -0.2063406f),
-vec2(-0.2414576f , -0.2875458f),
-vec2(-0.4720859f , -0.3823904f),
-vec2(-0.4937642f , -0.2686005f),
-vec2(-0.01500604f , -0.9587054f),
-vec2(-0.08535925f , -0.8820614f),
-vec2(-0.6436375f , -0.3157263f),
-vec2(-0.5736347f , -0.4224878f),
-vec2(-0.5026127f , -0.5516239f),
-vec2(-0.8200902f , 0.5370023f),
-vec2(-0.7196413f , 0.57133f),
-vec2(-0.5849072f , 0.5917885f),
-vec2(-0.1598758f , -0.9739854f),
-vec2(-0.4230629f , -0.01858409f),
-vec2(-0.9403627f , 0.2213769f),
-vec2(-0.685889f , -0.2192711f),
-vec2(-0.6693704f , -0.4884708f),
-vec2(-0.7967147f , -0.3078234f),
-vec2(-0.596441f , -0.1686891f),
-vec2(-0.7366468f , -0.3939891f),
-vec2(-0.7963406f , 0.02246814f),
-vec2(-0.9177913f , 0.0929693f),
-vec2(-0.9284672f , 0.3329005f),
-vec2(-0.6497722f , 0.6851863f),
-vec2(-0.496019f , 0.7013303f),
-vec2(-0.3930301f , -0.6892192f),
-vec2(-0.2122009f , -0.8777389f),
-vec2(-0.3660335f , -0.801644f),
-vec2(-0.386839f , -0.1191898f),
-vec2(-0.7020127f , -0.0776734f),
-vec2(-0.7760845f , -0.1566844f),
-vec2(-0.5444778f , -0.6516482f),
-vec2(-0.5331346f , 0.4946506f),
-vec2(-0.3288236f , 0.9408244f),
-vec2(0.5819826f , 0.8101937f),
-vec2(-0.4894184f , -0.8290837f),
-vec2(-0.5183194f , 0.8454953f),
-vec2(-0.7665774f , -0.5223897f),
-vec2(-0.6703191f , -0.6217513f),
-vec2(-0.8902924f , -0.2446688f),
-vec2(-0.8574848f , -0.09174173f),
-vec2(-0.3544409f , -0.9239591f),
-vec2(-0.969833f , -0.1172272f),
-vec2(-0.8968207f , -0.4079512f),
-vec2(-0.5891477f , 0.7724466f),
-vec2(-0.2146262f , 0.5286855f),
-vec2(-0.3762444f , -0.3014335f),
-vec2(-0.9466863f , -0.008970681f),
-vec2(-0.596356f , -0.7976127f),
-vec2(-0.8877738f , 0.4569088f));
-#endif
 
 flat varying vec4 exposure;
 flat varying vec2 rodExposureDepth;
 varying vec2 texcoord;
 uniform sampler2D colortex4;
+const bool colortex5MipmapEnabled = true;
 uniform sampler2D colortex5;
 uniform sampler2D colortex3;
 uniform sampler2D colortex6;
@@ -373,9 +40,10 @@ uniform mat4 gbufferModelViewInverse;
 uniform mat4 gbufferProjectionInverse;
 vec4 Weather_properties = Moon_Weather_properties;
 
-#include "lib/color_transforms.glsl"
-#include "lib/color_dither.glsl"
+#include "/lib/color_transforms.glsl"
+#include "/lib/color_dither.glsl"
 // #include "lib/biome_specifics.glsl"
+#include "/lib/bokeh.glsl"
 
 float cdist(vec2 coord) {
 	return max(abs(coord.s-0.5),abs(coord.t-0.5))*2.0;
@@ -396,7 +64,7 @@ void main() {
 	float vignette = (1.5-dot(texcoord-0.5,texcoord-0.5)*2.);
 	vec3 col = texture2D(colortex5,texcoord).rgb;
 
-	#ifdef DOF
+	#if DOF_QUALITY >= 0
 		/*--------------------------------*/
 		float z = ld(texture2D(depthtex0, texcoord.st*RENDER_SCALE).r)*far;
 		#ifdef AUTOFOCUS
@@ -416,28 +84,13 @@ void main() {
 		float nb = 0.0;
 		vec2 bcoord = vec2(0.0);
 		/*--------------------------------*/
-		#ifndef HQ_DOF
-		bcolor = col;
-		#ifdef HEXAGONAL_BOKEH
-			for ( int i = 0; i < 60; i++) {
-				bcolor += texture2D(colortex5, texcoord.xy + hex_offsets[i]*pcoc*vec2(1.0,aspectRatio)).rgb;
-			}
-			col = bcolor/61.0;
-		#else
-			for ( int i = 0; i < 60; i++) {
-				bcolor += texture2D(colortex5, texcoord.xy + offsets[i]*pcoc*vec2(0.3,aspectRatio)).rgb;
-			}
-		/*--------------------------------*/
-	col = bcolor/61.0;
-		#endif
-		#endif
-		#ifdef HQ_DOF
-			for ( int i = 0; i < 209; i++) {
-				bcolor += texture2D(colortex5, texcoord.xy + noiseM*shadow_offsets[i]*pcoc*vec2(1.0,aspectRatio)).rgb;
-			}
-			col = bcolor/209.0;
-		#endif
-#endif
+		float dofLodLevel = pcoc * 200.0;
+		for ( int i = 0; i < BOKEH_SAMPLES; i++) {
+			bcolor += texture2DLod(colortex5, texcoord.xy + bokeh_offsets[i]*pcoc*vec2(DOF_ANAMORPHIC_RATIO,aspectRatio), dofLodLevel).rgb;
+		}
+		col = bcolor/BOKEH_SAMPLES;
+	#endif
+
 	vec2 clampedRes = max(vec2(viewWidth,viewHeight),vec2(1920.0,1080.));
 
 
diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang
index 225b5f7..4fc91c8 100644
--- a/shaders/lang/en_us.lang
+++ b/shaders/lang/en_us.lang
@@ -7,4 +7,13 @@ value.indirect_effect.4 = SSDO
 
 option.ambient_colortype = Coloring Type
 value.ambient_colortype.0 = Temperature
-value.ambient_colortype.1 = RGB
\ No newline at end of file
+value.ambient_colortype.1 = RGB
+
+option.DOF_QUALITY=Depth Of Field
+value.DOF_QUALITY.-1=Off
+value.DOF_QUALITY.0=Hexagonal
+value.DOF_QUALITY.1=Low
+value.DOF_QUALITY.2=Medium
+value.DOF_QUALITY.3=High
+value.DOF_QUALITY.4=Ultra
+option.DOF_ANAMORPHIC_RATIO=Anamorphic Ratio
\ No newline at end of file
diff --git a/shaders/lib/bokeh.glsl b/shaders/lib/bokeh.glsl
new file mode 100644
index 0000000..0f51029
--- /dev/null
+++ b/shaders/lib/bokeh.glsl
@@ -0,0 +1,402 @@
+#if DOF_QUALITY == 0 // Original choc hex bokeh
+	#define BOKEH_SAMPLES 60
+	#define HEXAGONAL_BOKEH
+	const vec2 bokeh_offsets[60] = vec2[60] (
+		vec2(  0.2165,  0.1250 ),
+		vec2(  0.0000,  0.2500 ),
+		vec2( -0.2165,  0.1250 ),
+		vec2( -0.2165, -0.1250 ),
+		vec2( -0.0000, -0.2500 ),
+		vec2(  0.2165, -0.1250 ),
+		vec2(  0.4330,  0.2500 ),
+		vec2(  0.0000,  0.5000 ),
+		vec2( -0.4330,  0.2500 ),
+		vec2( -0.4330, -0.2500 ),
+		vec2( -0.0000, -0.5000 ),
+		vec2(  0.4330, -0.2500 ),
+		vec2(  0.6495,  0.3750 ),
+		vec2(  0.0000,  0.7500 ),
+		vec2( -0.6495,  0.3750 ),
+		vec2( -0.6495, -0.3750 ),
+		vec2( -0.0000, -0.7500 ),
+		vec2(  0.6495, -0.3750 ),
+		vec2(  0.8660,  0.5000 ),
+		vec2(  0.0000,  1.0000 ),
+		vec2( -0.8660,  0.5000 ),
+		vec2( -0.8660, -0.5000 ),
+		vec2( -0.0000, -1.0000 ),
+		vec2(  0.8660, -0.5000 ),
+		vec2(  0.2163,  0.3754 ),
+		vec2( -0.2170,  0.3750 ),
+		vec2( -0.4333, -0.0004 ),
+		vec2( -0.2163, -0.3754 ),
+		vec2(  0.2170, -0.3750 ),
+		vec2(  0.4333,  0.0004 ),
+		vec2(  0.4328,  0.5004 ),
+		vec2( -0.2170,  0.6250 ),
+		vec2( -0.6498,  0.1246 ),
+		vec2( -0.4328, -0.5004 ),
+		vec2(  0.2170, -0.6250 ),
+		vec2(  0.6498, -0.1246 ),
+		vec2(  0.6493,  0.6254 ),
+		vec2( -0.2170,  0.8750 ),
+		vec2( -0.8663,  0.2496 ),
+		vec2( -0.6493, -0.6254 ),
+		vec2(  0.2170, -0.8750 ),
+		vec2(  0.8663, -0.2496 ),
+		vec2(  0.2160,  0.6259 ),
+		vec2( -0.4340,  0.5000 ),
+		vec2( -0.6500, -0.1259 ),
+		vec2( -0.2160, -0.6259 ),
+		vec2(  0.4340, -0.5000 ),
+		vec2(  0.6500,  0.1259 ),
+		vec2(  0.4325,  0.7509 ),
+		vec2( -0.4340,  0.7500 ),
+		vec2( -0.8665, -0.0009 ),
+		vec2( -0.4325, -0.7509 ),
+		vec2(  0.4340, -0.7500 ),
+		vec2(  0.8665,  0.0009 ),
+		vec2(  0.2158,  0.8763 ),
+		vec2( -0.6510,  0.6250 ),
+		vec2( -0.8668, -0.2513 ),
+		vec2( -0.2158, -0.8763 ),
+		vec2(  0.6510, -0.6250 ),
+		vec2(  0.8668,  0.2513 ));
+	
+#elif DOF_QUALITY == 1 // Low quality bokeh
+	#define BOKEH_SAMPLES 32
+	const vec2 bokeh_offsets[32] = vec2[32](
+		vec2(0.12064426510477419, 0.015554431411765697),
+		vec2(-0.16400077998918963, 0.16180237012184204),
+		vec2(0.020080498035937415, -0.2628838391620438),
+		vec2(0.19686650437195816, 0.27801320993574674),
+		vec2(-0.37362329188851157, -0.049763799980476156),
+		vec2(0.34544673107582735, -0.20696126421568928),
+		vec2(-0.12135781397691386, 0.4507963336805642),
+		vec2(-0.22749138875333694, -0.41407969197383454),
+		vec2(0.4797593802468298, 0.19235249500691445),
+		vec2(-0.5079968434096749, 0.22345015963708734),
+		vec2(0.23843255951864029, -0.5032700515259672),
+		vec2(0.17505863904522073, 0.587555727235086),
+		vec2(-0.5451127409909945, -0.29782530685850084),
+		vec2(0.6300137885218894, -0.12390992876509886),
+		vec2(-0.391501580064061, 0.5662295575692019),
+		vec2(-0.09379538975841809, -0.6746452122696498),
+		vec2(0.5447160222309757, 0.47831268960533435),
+		vec2(-0.7432342062047558, 0.04610937594275518),
+		vec2(0.5345993903170301, -0.520777903066999),
+		vec2(-0.0404139208253129, 0.7953459466435174),
+		vec2(-0.517173266802963, -0.5989723613060595),
+		vec2(0.8080038585189984, 0.12485626574164435),
+		vec2(-0.6926663754026566, 0.494463047083117),
+		vec2(0.183730322451809, -0.8205069509230769),
+		vec2(0.43067753069940745, 0.7747454863024757),
+		vec2(-0.8548041452377114, -0.25576180722119723),
+		vec2(0.8217466662308877, -0.3661258311820314),
+		vec2(-0.36224393661662146, 0.87070999332353),
+		vec2(-0.32376306917956177, -0.8724793262829371),
+		vec2(0.8455529005007657, 0.46224259051084376),
+		vec2(-0.9483903811252437, 0.2643989345002705),
+		vec2(0.5322400733549763, -0.818975339518135)
+	);
+#elif DOF_QUALITY == 2 // Medium quality bokeh
+	#define BOKEH_SAMPLES 64
+	const vec2 bokeh_offsets[64] = vec2[64](
+		vec2(0.07966914016126773, -0.0005732549414365655),
+		vec2(-0.12160530145582471, 0.10283965425501301),
+		vec2(0.008559818525228833, -0.197458844206032),
+		vec2(0.13356640242431705, 0.18501312713480866),
+		vec2(-0.269830801109193, -0.04676021929400281),
+		vec2(0.23862848827685754, -0.15791561224005177),
+		vec2(-0.09145217101863704, 0.3071892456093635),
+		vec2(-0.16649994145461533, -0.30437045701653237),
+		vec2(0.33360187330480306, 0.12444185472734362),
+		vec2(-0.3648472506019276, 0.14643122426640393),
+		vec2(0.16295804188571, -0.36743756507231173),
+		vec2(0.11814591296857804, 0.40389274018272564),
+		vec2(-0.39109215347150406, -0.22216619295880746),
+		vec2(0.43984778429926974, -0.0991894497563406),
+		vec2(-0.2824726599141313, 0.38881286099524415),
+		vec2(-0.07196259394779835, -0.48861810336110434),
+		vec2(0.3795331553348995, 0.3266462474773111),
+		vec2(-0.5311851850227693, 0.021032353535204915),
+		vec2(0.3723796163057802, -0.3798174856209827),
+		vec2(-0.03421619527550065, 0.5508226133906681),
+		vec2(-0.37133596181036055, -0.43510931729303065),
+		vec2(0.5657057697780938, 0.07671481330934922),
+		vec2(-0.49542832895271105, 0.33806627476843804),
+		vec2(0.12427771910967947, -0.5917579278786026),
+		vec2(0.2988957646566429, 0.536255888187953),
+		vec2(-0.6100770454895419, -0.19242280712483223),
+		vec2(0.5754234023037136, -0.27046195686657265),
+		vec2(-0.2617843818309086, 0.6041130418557645),
+		vec2(-0.2345742995202231, -0.6285079469299325),
+		vec2(0.59225695199046, 0.315282971433257),
+		vec2(-0.6762525075113398, 0.17538638065344198),
+		vec2(0.37071132728294354, -0.5906749150680255),
+		vec2(0.1119798859418661, 0.7017402283731283),
+		vec2(-0.5807270152810202, -0.4435682524557845),
+		vec2(0.7229827225912143, -0.06119326417718071),
+		vec2(-0.5144794788954391, 0.5461387788248901),
+		vec2(-0.005035179534685496, -0.7557546423829214),
+		vec2(0.5055857377426614, 0.5663728829872585),
+		vec2(-0.7810140733390272, -0.07214936952359105),
+		vec2(0.6170681003447506, -0.47552351060683423),
+		vec2(-0.15109977600025168, 0.7820762666899624),
+		vec2(-0.43760314844428994, -0.6821127366950525),
+		vec2(0.7772009255491943, 0.21481487028437787),
+		vec2(-0.742204728724318, 0.3758394044302885),
+		vec2(0.28114246867378123, -0.7824253564882913),
+		vec2(0.3091922614465049, 0.7803683548608),
+		vec2(-0.7789831306606206, -0.36561570268862775),
+		vec2(0.8145440939773348, -0.2543941296975529),
+		vec2(-0.4488757377357506, 0.7504758305912105),
+		vec2(-0.1933624476019976, -0.8604246222601459),
+		vec2(0.7154581485450054, 0.513848417434855),
+		vec2(-0.8988765686147268, 0.11036534262592021),
+		vec2(0.5783350546530844, -0.6902686901177914),
+		vec2(0.024600692161986272, 0.9131155784626814),
+		vec2(-0.6564461645240188, -0.657849672537283),
+		vec2(0.9212949234450745, 0.04697899281368057),
+		vec2(-0.7330423210662792, 0.5978985715758123),
+		vec2(0.12225611512756368, -0.9393399804201348),
+		vec2(0.5334856827883492, 0.7868760176859764),
+		vec2(-0.948368229388031, -0.21678429915641398),
+		vec2(0.8372175428305082, -0.4798472000523386),
+		vec2(-0.31121110469716806, 0.9318623471900049),
+		vec2(-0.41881630178513873, -0.899674402337137),
+		vec2(0.9082566602526256, 0.38845471061254216)
+	);
+#elif DOF_QUALITY == 3 // High quality bokeh
+	#define BOKEH_SAMPLES 96
+	const vec2 bokeh_offsets[96] = vec2[96](
+		vec2(0.07121012932580298, -0.005700790092752472),
+		vec2(-0.09312976408269022, 0.07873549668993801),
+		vec2(0.013149611337887245, -0.16645720056123525),
+		vec2(0.1152170596849477, 0.14582985633924836),
+		vec2(-0.21415537775596927, -0.043412288570053574),
+		vec2(0.20099989356868228, -0.13417028686218047),
+		vec2(-0.06850983617645874, 0.24558623934474322),
+		vec2(-0.1297860841436839, -0.25375016688247776),
+		vec2(0.2785453377231323, 0.09637361951611127),
+		vec2(-0.29173598389867905, 0.1143278645615103),
+		vec2(0.1392152328130355, -0.30524424497902103),
+		vec2(0.10262628276810476, 0.3245443120276563),
+		vec2(-0.3131648573584685, -0.1866306663416654),
+		vec2(0.3652947607876658, -0.08622057598322416),
+		vec2(-0.22447741224677245, 0.3122316422302745),
+		vec2(-0.052596663134391534, -0.4041877401668016),
+		vec2(0.3160480724583331, 0.2614728148450268),
+		vec2(-0.42755033863187675, 0.011940115357288394),
+		vec2(0.3102072322995241, -0.31535240777916773),
+		vec2(-0.021776857676125607, 0.4445120511380856),
+		vec2(-0.29703399441499195, -0.36049799929262627),
+		vec2(0.4680573756135771, 0.05740465338052286),
+		vec2(-0.3983549879059493, 0.27079722808233325),
+		vec2(0.1076328815172257, -0.4884010542428246),
+		vec2(0.25020791867460324, 0.432618369814755),
+		vec2(-0.4919652729660237, -0.1623452935030104),
+		vec2(0.47599178934545766, -0.22606399244564834),
+		vec2(-0.20758550392653913, 0.4880235037760105),
+		vec2(-0.1853685647531024, -0.5184073191472642),
+		vec2(0.48973632510956305, 0.2521947388069187),
+		vec2(-0.5459973114481342, 0.13796965075175446),
+		vec2(0.3088450800163787, -0.48751677798588744),
+		vec2(0.0975917427828865, 0.5677357677730314),
+		vec2(-0.46800107365064036, -0.3674046909313041),
+		vec2(0.5964734698442213, -0.05519682036954475),
+		vec2(-0.4139101866969282, 0.4406877162294968),
+		vec2(0.002049341904248123, -0.6223038109189813),
+		vec2(0.41896957501138105, 0.45720879309620605),
+		vec2(-0.6315347717590759, -0.06414244292517278),
+		vec2(0.5099945429097319, -0.39349604995429904),
+		vec2(-0.11721190170447472, 0.6333298683840053),
+		vec2(-0.3511409257292949, -0.5621754467118343),
+		vec2(0.6407424471834575, 0.17016287772655794),
+		vec2(-0.59984707457312, 0.3016388593021738),
+		vec2(0.23571241320439879, -0.6440803577969166),
+		vec2(0.25861497309905895, 0.6319353642149682),
+		vec2(-0.6298765140060968, -0.3037567005718222),
+		vec2(0.6712330165260425, -0.21294466649920604),
+		vec2(-0.36034495634397506, 0.6075282203535491),
+		vec2(-0.15171922856817155, -0.707766491614509),
+		vec2(0.5903296808625542, 0.4143227465576124),
+		vec2(-0.7277690961712949, 0.08488019551391128),
+		vec2(0.4783691435335692, -0.5688347547957064),
+		vec2(0.02624692981739339, 0.7403230184135525),
+		vec2(-0.529825500118305, -0.5423647377841855),
+		vec2(0.7583947037976506, 0.033125457614728814),
+		vec2(-0.5923660000472654, 0.48294941004015257),
+		vec2(0.1059822487778383, -0.772200611734827),
+		vec2(0.44174978474925664, 0.6372488486615551),
+		vec2(-0.7681788679771326, -0.18223636845309496),
+		vec2(0.6897458099924982, -0.3970263276035467),
+		vec2(-0.2479422541533022, 0.755629690982855),
+		vec2(-0.33580152966568444, -0.7398138028495373),
+		vec2(0.7477490064797803, 0.31193921366734034),
+		vec2(-0.7736080489368817, 0.26795577022080547),
+		vec2(0.3868886663966537, -0.7349923110069412),
+		vec2(0.2072555967697858, 0.8001249720762448),
+		vec2(-0.7040443194892538, -0.4626423043345493),
+		vec2(0.8322384822401724, -0.1447122942561253),
+		vec2(-0.5252166762643815, 0.664457295558192),
+		vec2(-0.06754632697534207, -0.8600666846898691),
+		vec2(0.6296824993369153, 0.5834370562363421),
+		vec2(-0.869944526760866, -0.014179400625216068),
+		vec2(0.6499749876116837, -0.590431834076035),
+		vec2(-0.08653298327805949, 0.8710652567467342),
+		vec2(-0.5336452473653825, -0.7147165352819029),
+		vec2(0.8765151038515352, 0.15835652829089225),
+		vec2(-0.7637367481190092, 0.46912680629507475),
+		vec2(0.24230314452308632, -0.8766382336302021),
+		vec2(0.41057390183400766, 0.8059431929582904),
+		vec2(-0.8580075067207172, -0.32820494707410347),
+		vec2(0.8541129534247509, -0.3489366841323772),
+		vec2(-0.4020475845121665, 0.8300639316319863),
+		vec2(-0.271383304434805, -0.8982601300128057),
+		vec2(0.806149237823113, 0.4726141519370287),
+		vec2(-0.9246093490373926, 0.18793390244305297),
+		vec2(0.5525228823894455, -0.7768686415915086),
+		vec2(0.11248781322457736, 0.9422381490453825),
+		vec2(-0.7290593513744651, -0.6315956494365766),
+		vec2(0.9641126469581356, -0.03618111342429133),
+		vec2(-0.6958327822205611, 0.6724277225888768),
+		vec2(0.05364990040181975, -0.9804535309203316),
+		vec2(0.6205795080163646, 0.7540570525272473),
+		vec2(-0.9777078995622647, -0.14683634641243257),
+		vec2(0.8189512244871316, -0.564380296276503),
+		vec2(-0.22935101607289898, 0.965189829782074)
+	);
+#elif DOF_QUALITY == 4 // Ultra quality bokeh
+	#define BOKEH_SAMPLES 128
+	const vec2 bokeh_offsets[128] = vec2[128](
+		vec2(0.0663717288408725, -0.0013834293391071473),
+		vec2(-0.07595079370610941, 0.07174054001593103),
+		vec2(0.016089845306454117, -0.1406025646260119),
+		vec2(0.10448284847446448, 0.12984595992288336),
+		vec2(-0.18076204965577036, -0.03404254503522808),
+		vec2(0.1787729618263991, -0.11264127715283463),
+		vec2(-0.05462931069997152, 0.2162375217952921),
+		vec2(-0.10769609808818306, -0.21620049103190728),
+		vec2(0.24592928641190032, 0.08701560245846723),
+		vec2(-0.24794882541635205, 0.10256443477355368),
+		vec2(0.12526587604780554, -0.26079567080797356),
+		vec2(0.09357891581109577, 0.284617218572553),
+		vec2(-0.26650677420701185, -0.15807329847424043),
+		vec2(0.3210564905494301, -0.07111560942753943),
+		vec2(-0.18970119374354508, 0.27395413373961097),
+		vec2(-0.040848098590723636, -0.3464832511798149),
+		vec2(0.27840760740397325, 0.22999569975767717),
+		vec2(-0.3655675068138925, 0.013894042926387594),
+		vec2(0.27334929144700043, -0.2695495965784895),
+		vec2(-0.014157364124171042, 0.38851232827676874),
+		vec2(-0.25253703711299613, -0.3086468256980197),
+		vec2(0.4100515255479846, 0.053267487825832176),
+		vec2(-0.3402835914128429, 0.2380708784965685),
+		vec2(0.09791475751438991, -0.41941412050652843),
+		vec2(0.22138836163818915, 0.3782120981062479),
+		vec2(-0.4213524763303703, -0.13704154865558862),
+		vec2(0.4169229294039292, -0.1922235606360057),
+		vec2(-0.1750723720198253, 0.42619435161677505),
+		vec2(-0.15583193830129546, -0.44540030818645854),
+		vec2(0.42882604653886824, 0.22196065021043188),
+		vec2(-0.46814559427413643, 0.12303882220514525),
+		vec2(0.2721696329659735, -0.41864831480405745),
+		vec2(0.08921887628752824, 0.4952271972313669),
+		vec2(-0.4005988709418946, -0.3146281961132203),
+		vec2(0.5212631254064987, -0.04424824894529297),
+		vec2(-0.35375478872674765, 0.3852003570933512),
+		vec2(0.006476729988070734, -0.5353773094248466),
+		vec2(0.36754024321057777, 0.3995080293577968),
+		vec2(-0.542223207878615, -0.0519953853311339),
+		vec2(0.44637017778921256, -0.33722397584639424),
+		vec2(-0.09680653666400772, 0.5520333546988624),
+		vec2(-0.29939501415200226, -0.4833046185334542),
+		vec2(0.5596011843818348, 0.1509189745951235),
+		vec2(-0.5147808571281486, 0.26478051462710167),
+		vec2(0.20883488566029573, -0.5542363522278412),
+		vec2(0.22866908434076613, 0.5508256786627931),
+		vec2(-0.5407871145385126, -0.2595074195620819),
+		vec2(0.5860067920083645, -0.18086189108585835),
+		vec2(-0.30736593848152494, 0.5296884720449828),
+		vec2(-0.1266907583446624, -0.6093901619826914),
+		vec2(0.5159424480728841, 0.3623676235874931),
+		vec2(-0.6255645775356298, 0.07706200529609625),
+		vec2(0.41898177852462715, -0.4890717485057145),
+		vec2(0.027432455831161814, 0.6446921406553703),
+		vec2(-0.4541403948372952, -0.46614804133513105),
+		vec2(0.6614910274222918, 0.032241087509198955),
+		vec2(-0.5083020565411538, 0.42180005754033856),
+		vec2(0.0964852676297621, -0.6651917468773848),
+		vec2(0.3872684835471157, 0.5554272911761509),
+		vec2(-0.6605604664806174, -0.15426772487094212),
+		vec2(0.6020393414453297, -0.34028128597305507),
+		vec2(-0.21002234293038552, 0.6579481079477967),
+		vec2(-0.2861107074822046, -0.6371439476352124),
+		vec2(0.6522715831040163, 0.2737008831753178),
+		vec2(-0.6652622751135028, 0.2356101038047024),
+		vec2(0.3397573613737368, -0.6329684132153847),
+		vec2(0.1841905597170904, 0.6964821517232016),
+		vec2(-0.6050183182298694, -0.39710638871623194),
+		vec2(0.7254416154649453, -0.12177092336287425),
+		vec2(-0.45014903629822983, 0.5789904973861583),
+		vec2(-0.05379488725502444, -0.7412859981872281),
+		vec2(0.5500229885821982, 0.5088249119127414),
+		vec2(-0.7486921122201893, -0.008726121449014926),
+		vec2(0.5675967989341455, -0.5077753678100256),
+		vec2(-0.07023781394610165, 0.7579182403995453),
+		vec2(-0.45744839298930007, -0.6154090763560658),
+		vec2(0.7637862945741366, 0.14069437605788096),
+		vec2(-0.656713477836827, 0.4098293315506553),
+		vec2(0.21454262641179686, -0.7556373805496136),
+		vec2(0.36026937695710076, 0.7015208788118822),
+		vec2(-0.7383543496199366, -0.28068022211104154),
+		vec2(0.7443854632051411, -0.29863443306808585),
+		vec2(-0.34348147387975525, 0.7224100512613486),
+		vec2(-0.23032288796555528, -0.7743624920949431),
+		vec2(0.7028476670342306, 0.4128494614683644),
+		vec2(-0.7960332370050228, 0.16630913345088935),
+		vec2(0.48320080015941314, -0.6692343793188953),
+		vec2(0.10211925170659499, 0.8195557731909884),
+		vec2(-0.6266819713189401, -0.5434242776289469),
+		vec2(0.839647992213555, -0.027780163659783332),
+		vec2(-0.5979069183510588, 0.5858930896737415),
+		vec2(0.05116412449643274, -0.8455440653042995),
+		vec2(0.5421395668481722, 0.656586163094272),
+		vec2(-0.8420179306636936, -0.12361040648919945),
+		vec2(0.7139345127041803, -0.4852140742679803),
+		vec2(-0.19392185846495172, 0.8394325117685132),
+		vec2(-0.4204487200571126, -0.7589178553865392),
+		vec2(0.8327210388300782, 0.27198001249322223),
+		vec2(-0.7960210362439597, 0.35875934008010707),
+		vec2(0.3521694740750743, -0.8113417187989848),
+		vec2(0.2956218966152538, 0.8352993597773058),
+		vec2(-0.7802993418734316, -0.4233366042943169),
+		vec2(0.8713623792816834, -0.22102227243790618),
+		vec2(-0.4898157243847507, 0.7501925472112333),
+		vec2(-0.1404730904953662, -0.8933311986231547),
+		vec2(0.7161931362879647, 0.5614815300362244),
+		vec2(-0.9058628529093994, 0.06505632357778653),
+		vec2(0.6327340635903044, -0.6679986961411009),
+		vec2(-0.009601876744475778, 0.9192004679524599),
+		vec2(-0.6108521377052276, -0.6924574614793783),
+		vec2(0.9281555629938579, 0.09338283007560376),
+		vec2(-0.7450460329935668, 0.555586889447176),
+		vec2(0.18065981280216364, -0.9220637339884982),
+		vec2(0.4976041523666884, 0.8004563576254236),
+		vec2(-0.9058072969449353, -0.26025660300795816),
+		vec2(0.8531917506909307, -0.4268234961929668),
+		vec2(-0.33647364470405444, 0.8898636052739477),
+		vec2(-0.3487004193922513, -0.8922603177419213),
+		vec2(0.8692854206244577, 0.4191405201257309),
+		vec2(-0.922200158608347, 0.27426963027794127),
+		vec2(0.5026010788472942, -0.8336545903450451),
+		vec2(0.19912047190109702, 0.953130414632473),
+		vec2(-0.7881026276127884, -0.575672440830542),
+		vec2(0.9797345166178452, -0.1133457865497118),
+		vec2(-0.6426714284056454, 0.743356925293099),
+		vec2(-0.022557857722768027, -0.9912168632834627),
+		vec2(0.694719000547024, 0.7134671125059463),
+		vec2(-0.992326501717018, -0.062069798758671524)
+	);
+#endif
\ No newline at end of file
diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl
index c977b36..e6b1844 100644
--- a/shaders/lib/settings.glsl
+++ b/shaders/lib/settings.glsl
@@ -84,9 +84,8 @@
 #define Purkinje_G 0.7 // [0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0]
 #define Purkinje_B 1.0 // [0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0]
 #define Purkinje_Multiplier 5.0 // How much the purkinje effect increases brightness [0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1.0 1.05 1.1 1.15 1.2 1.25 1.3 1.35 1.4 1.45 1.5 1.55 1.6 1.65 1.7 1.75 1.8 1.85 1.9 1.95 2.0 2.05 2.1 2.15 2.2 2.25 2.3 2.35 2.4 2.45 2.5 2.55 2.6 2.65 2.7 2.75 2.8 2.85 2.9 2.95 3.0 3.05 3.1 3.15 3.2 3.25 3.3 3.35 3.4 3.45 3.5 3.55 3.6 3.65 3.7 3.75 3.8 3.85 3.9 3.95 4.0 4.05 4.1 4.15 4.2 4.25 4.3 4.35 4.4 4.45 4.5 4.55 4.6 4.65 4.7 4.75 4.8 4.85 4.9 4.95 5.0 5.05 5.1 5.15 5.2 5.25 5.3 5.35 5.4 5.45 5.5 5.55 5.6 5.65 5.7 5.75 5.8 5.85 5.9 5.95 6.0 6.05 6.1 6.15 6.2 6.25 6.3 6.35 6.4 6.45 6.5 6.55 6.6 6.65 6.7 6.75 6.8 6.85 6.9 6.95 7.0 7.05 7.1 7.15 7.2 7.25 7.3 7.35 7.4 7.45 7.5 7.55 7.6 7.65 7.7 7.75 7.8 7.85 7.9 7.95 8.0 8.05 8.1 8.15 8.2 8.25 8.3 8.35 8.4 8.45 8.5 8.55 8.6 8.65 8.7 8.75 8.8 8.85 8.9 8.95 9.0 9.05 9.1 9.15 9.2 9.25 9.3 9.35 9.4 9.45 9.5 9.55 9.6 9.65 9.7 9.75 9.8 9.85 9.9 9.95 ]
-//#define DOF							//enable depth of field (blur on non-focused objects)
-//#define HQ_DOF						//Slow! Forces circular bokeh!  Uses 4 times more samples with noise in order to remove sampling artifacts at great blur sizes.
-//#define HEXAGONAL_BOKEH			//disabled : circular blur shape - enabled : hexagonal blur shape
+#define DOF_QUALITY -1 // [-1 0 1 2 3 4]
+#define DOF_ANAMORPHIC_RATIO 1.0 // [0.3 0.6 1.0]
 #define AUTOFOCUS // THE BRIGHTNESS SLIDER CAN CONTROL THE MANUAL FOCUS DISTANCE
 //#define FAR_BLUR_ONLY // Removes DoF on objects closer to the camera than the focus point
 //lens properties
diff --git a/shaders/shaders.properties b/shaders/shaders.properties
index 8d1920d..7f86797 100644
--- a/shaders/shaders.properties
+++ b/shaders/shaders.properties
@@ -45,7 +45,7 @@ alphaTest.gbuffers_hand=true
 # profile.high   = shadowMapResolution=2048 Sub_surface_scattering  Variable_Penumbra_Shadows shadowDistance=69. VPS_Search_Samples=15 SHADOW_FILTER_SAMPLE_COUNT=15 SCREENSPACE_CONTACT_SHADOWS  SSAO ambientOcclusionLevel=0.15 !TAA_UPSCALING RENDER_SCALE_X=0.7 RENDER_SCALE_Y=0.7 SHARPENING= 0.35  VOLUMETRIC_CLOUDS rain_clouds=1.0 cloudCoverage=0.36 cloud_LevelOfDetail=1  cloud_ShadowLevelOfDetail=0  CLOUDS_QUALITY=0.5  minRayMarchSteps=20 maxRayMarchSteps=30  High_Altitude_Clouds reflection_quality=35 Roughness_Strength=3  Screen_Space_Reflections  Sky_reflection
 # profile.ultra  = shadowMapResolution=4096 Sub_surface_scattering  Variable_Penumbra_Shadows shadowDistance=80 VPS_Search_Samples=15 SHADOW_FILTER_SAMPLE_COUNT=25  SCREENSPACE_CONTACT_SHADOWS  SSAO ambientOcclusionLevel=0.15 !TAA_UPSCALING RENDER_SCALE_X=0.7 RENDER_SCALE_Y=0.7 SHARPENING= 0.2   VOLUMETRIC_CLOUDS rain_clouds=1.0 cloudCoverage=0.36 cloud_LevelOfDetail=2  cloud_ShadowLevelOfDetail=2  CLOUDS_QUALITY=0.5  minRayMarchSteps=20 maxRayMarchSteps=50  High_Altitude_Clouds reflection_quality=35 Roughness_Strength=3  Screen_Space_Reflections  Sky_reflection
 
-sliders = WeatherDay Summer_Leaf_R Summer_Leaf_G Summer_Leaf_B Fall_Leaf_R Fall_Leaf_G Fall_Leaf_B Winter_Leaf_R Winter_Leaf_G Winter_Leaf_B Spring_Leaf_R Spring_Leaf_G Spring_Leaf_B Summer_R Summer_G Summer_B Fall_R Fall_G Fall_B Winter_R Winter_G Winter_B Spring_R Spring_G Spring_B Season_Length CaveFogFallOff CaveFogColor_R CaveFogColor_G CaveFogColor_B indirect_effect GI_Strength Cloud_Height Dynamic_sky_day ambient_brightness  AmbientLight_R AmbientLight_G AmbientLight_B cloud_speed Rain_coverage  override_R override_G override_B override_Cloudy_Fog_Density override_cloudyfog_fade override_fog override_Uniform_Fog_Density override_uniformfog_fade override_Bloomy_Fog override_Sun_Strength     Moon_temp Haze_amount UniformFog_amount CloudyFog_amount TimeOfDayFog_multiplier RainFog_amount CaveFog_amount  uniformfog_fade cloudyfog_fade cloudray_amount Swamp_cloudyfog_height  Jungle_cloudyfog_fade Swamp_uniformfog_height Jungle_uniformfog_fade noise_mode Distant_shadow_quality ambient_temp Sun_temp Puddle_Size Cloud_Size LabSSS_Curve Emissive_Curve Emissive_Brightness AO_Strength Swamp_Sun_Strength Jungle_Sun_Strength Swamp_Bloomy_Fog Jungle_Bloomy_Fog Swamp_Mie Jungle_Mie Swamp_cloudyfog_Density Jungle_Cloudy_Fog_Density Swamp_UniformFog_Density Jungle_Uniform_Fog_Density Swamp_Bloomy_Fog Jungle_Bloomy_Fog Swamp_Mie Jungle_Mie Swamp_R Swamp_G Swamp_B Jungle_R Jungle_G Jungle_B Jungle_fog_strength Swamp_fog_strength  Lush_fog_strength Snells_Window_Width self_shadow_samples Shadow_brightness Cloud_top_cutoff Cloud_base_cutoff Cloud_fade_amount BLOOMY_FOG FOG_RAIN_MULTIPLIER FOG_TOD_MULTIPLIER CLOUDY_FOG_AMOUNT BASE_FOG_AMOUNT WAVY_SPEED WAVY_STRENGTH ANTI_GHOSTING BLOOM_STRENGTH     shadowDistance shadowDistanceRenderMul FinalR FinalG FinalB Ambient_Mult Sky_Brightness fog_coefficientMieR fog_coefficientMieG fog_coefficientMieB sun_illuminance sunColorG sunColorB sunColorR sky_mieg sky_coefficientMieB sky_coefficientMieG sky_coefficientMieR sky_coefficientRayleighB sky_coefficientRayleighG sky_coefficientRayleighR CLOUDS_QUALITY EXPOSURE_MULTIPLIER MIN_LIGHT_AMOUNT TORCH_R TORCH_G TORCH_B TORCH_AMOUNT shadowMapResolution sunPathRotation SKY_BRIGHTNESS_DAY SKY_BRIGHTNESS_NIGHT BLEND_FACTOR FLICKER_REDUCTION MOTION_REJECTION VL_SAMPLES Exposure_Speed POM_MAP_RES POM_DEPTH MAX_ITERATIONS MAX_DIST SSR_STEPS ambientOcclusionLevel SEA_LEVEL ATMOSPHERIC_DENSITY CLOUDS_SHADOWS_STRENGTH moon_illuminance moonColorR moonColorG moonColorB fog_mieg1 fog_mieg2 fog_coefficientRayleighR fog_coefficientRayleighG SATURATION Manual_exposure_value focal aperture MANUAL_FOCUS SHADOW_FILTER_SAMPLE_COUNT Max_Filter_Depth VPS_Search_Samples Min_Shadow_Filter_Radius Max_Shadow_Filter_Radius SSAO_SAMPLES Water_Top_Layer fog_coefficientRayleighB SHARPENING rayMarchSampleCount Dirt_Mie_Phase Dirt_Amount Dirt_Scatter_R Dirt_Scatter_G Dirt_Scatter_B Dirt_Absorb_R Dirt_Absorb_G Dirt_Absorb_B Water_Absorb_R Water_Absorb_G Water_Absorb_B Purkinje_strength Purkinje_strength Purkinje_R Purkinje_G Purkinje_B Texture_MipMap_Bias DoF_Adaptation_Speed Purkinje_Multiplier CROSSTALK RENDER_SCALE_X RENDER_SCALE_Y VL_RENDER_RESOLUTION BLOOM_QUALITY VL_RENDER_RESOLUTION RAY_COUNT STEPS STEP_LENGTH cloud_LevelOfDetail cloud_ShadowLevelOfDetail cloud_LevelOfDetailLQ cloud_ShadowLevelOfDetailLQ minRayMarchSteps maxRayMarchSteps minRayMarchStepsLQ maxRayMarchStepsLQ cloudDensity cloudCoverage fbmAmount fbmPower1 fbmPower2 cloudMieG cloudMieG2 cloudMie2Multiplier Strong_SSS_strength  Medium_SSS_strength  Weak_SSS_strength Shadow_brightness Roughness_Threshold Sun_specular_Strength reflection_quality Roughness_Strength SSS_mode
+sliders = WeatherDay Summer_Leaf_R Summer_Leaf_G Summer_Leaf_B Fall_Leaf_R Fall_Leaf_G Fall_Leaf_B Winter_Leaf_R Winter_Leaf_G Winter_Leaf_B Spring_Leaf_R Spring_Leaf_G Spring_Leaf_B Summer_R Summer_G Summer_B Fall_R Fall_G Fall_B Winter_R Winter_G Winter_B Spring_R Spring_G Spring_B Season_Length CaveFogFallOff CaveFogColor_R CaveFogColor_G CaveFogColor_B indirect_effect GI_Strength Cloud_Height Dynamic_sky_day ambient_brightness  AmbientLight_R AmbientLight_G AmbientLight_B cloud_speed Rain_coverage  override_R override_G override_B override_Cloudy_Fog_Density override_cloudyfog_fade override_fog override_Uniform_Fog_Density override_uniformfog_fade override_Bloomy_Fog override_Sun_Strength     Moon_temp Haze_amount UniformFog_amount CloudyFog_amount TimeOfDayFog_multiplier RainFog_amount CaveFog_amount  uniformfog_fade cloudyfog_fade cloudray_amount Swamp_cloudyfog_height  Jungle_cloudyfog_fade Swamp_uniformfog_height Jungle_uniformfog_fade noise_mode Distant_shadow_quality ambient_temp Sun_temp Puddle_Size Cloud_Size LabSSS_Curve Emissive_Curve Emissive_Brightness AO_Strength Swamp_Sun_Strength Jungle_Sun_Strength Swamp_Bloomy_Fog Jungle_Bloomy_Fog Swamp_Mie Jungle_Mie Swamp_cloudyfog_Density Jungle_Cloudy_Fog_Density Swamp_UniformFog_Density Jungle_Uniform_Fog_Density Swamp_Bloomy_Fog Jungle_Bloomy_Fog Swamp_Mie Jungle_Mie Swamp_R Swamp_G Swamp_B Jungle_R Jungle_G Jungle_B Jungle_fog_strength Swamp_fog_strength  Lush_fog_strength Snells_Window_Width self_shadow_samples Shadow_brightness Cloud_top_cutoff Cloud_base_cutoff Cloud_fade_amount BLOOMY_FOG FOG_RAIN_MULTIPLIER FOG_TOD_MULTIPLIER CLOUDY_FOG_AMOUNT BASE_FOG_AMOUNT WAVY_SPEED WAVY_STRENGTH ANTI_GHOSTING BLOOM_STRENGTH     shadowDistance shadowDistanceRenderMul FinalR FinalG FinalB Ambient_Mult Sky_Brightness fog_coefficientMieR fog_coefficientMieG fog_coefficientMieB sun_illuminance sunColorG sunColorB sunColorR sky_mieg sky_coefficientMieB sky_coefficientMieG sky_coefficientMieR sky_coefficientRayleighB sky_coefficientRayleighG sky_coefficientRayleighR CLOUDS_QUALITY EXPOSURE_MULTIPLIER MIN_LIGHT_AMOUNT TORCH_R TORCH_G TORCH_B TORCH_AMOUNT shadowMapResolution sunPathRotation SKY_BRIGHTNESS_DAY SKY_BRIGHTNESS_NIGHT BLEND_FACTOR FLICKER_REDUCTION MOTION_REJECTION VL_SAMPLES Exposure_Speed POM_MAP_RES POM_DEPTH MAX_ITERATIONS MAX_DIST SSR_STEPS ambientOcclusionLevel SEA_LEVEL ATMOSPHERIC_DENSITY CLOUDS_SHADOWS_STRENGTH moon_illuminance moonColorR moonColorG moonColorB fog_mieg1 fog_mieg2 fog_coefficientRayleighR fog_coefficientRayleighG SATURATION Manual_exposure_value focal aperture MANUAL_FOCUS SHADOW_FILTER_SAMPLE_COUNT Max_Filter_Depth VPS_Search_Samples Min_Shadow_Filter_Radius Max_Shadow_Filter_Radius SSAO_SAMPLES Water_Top_Layer fog_coefficientRayleighB SHARPENING rayMarchSampleCount Dirt_Mie_Phase Dirt_Amount Dirt_Scatter_R Dirt_Scatter_G Dirt_Scatter_B Dirt_Absorb_R Dirt_Absorb_G Dirt_Absorb_B Water_Absorb_R Water_Absorb_G Water_Absorb_B Purkinje_strength Purkinje_strength Purkinje_R Purkinje_G Purkinje_B Texture_MipMap_Bias DoF_Adaptation_Speed Purkinje_Multiplier CROSSTALK RENDER_SCALE_X RENDER_SCALE_Y VL_RENDER_RESOLUTION BLOOM_QUALITY VL_RENDER_RESOLUTION RAY_COUNT STEPS STEP_LENGTH cloud_LevelOfDetail cloud_ShadowLevelOfDetail cloud_LevelOfDetailLQ cloud_ShadowLevelOfDetailLQ minRayMarchSteps maxRayMarchSteps minRayMarchStepsLQ maxRayMarchStepsLQ cloudDensity cloudCoverage fbmAmount fbmPower1 fbmPower2 cloudMieG cloudMieG2 cloudMie2Multiplier Strong_SSS_strength  Medium_SSS_strength  Weak_SSS_strength Shadow_brightness Roughness_Threshold Sun_specular_Strength reflection_quality Roughness_Strength SSS_mode DOF_QUALITY DOF_ANAMORPHIC_RATIO
 # screen=[Atmospherics] [TAA_OPTIONS] [Lighting] [Camera] [Shading] [Wavy_stuff] [Water_and_transparencies] [Xonk_settings]  
 
 
@@ -171,7 +171,7 @@ screen = [Direct_Light] [Ambient_light] [World] [Atmospherics] [Post_Processing]
             screen.TAA_OPTIONS= SCREENSHOT_MODE SPLIT_RENDER TAA BLEND_FACTOR <skip> TAA_UPSCALING RENDER_SCALE_X RENDER_SCALE_Y 
         ### DOF  
             screen.DepthOfField.columns = 1
-            screen.DepthOfField = DOF HEXAGONAL_BOKEH AUTOFOCUS focal aperture MANUAL_FOCUS  DoF_Adaptation_Speed FAR_BLUR_ONLY
+            screen.DepthOfField = DOF_QUALITY DOF_ANAMORPHIC_RATIO AUTOFOCUS focal aperture MANUAL_FOCUS  DoF_Adaptation_Speed FAR_BLUR_ONLY
         ### EXPOSURE
             screen.Exposure.columns = 1
             screen.Exposure = AUTO_EXPOSURE EXPOSURE_MULTIPLIER Exposure_Speed  Manual_exposure_value