The latest engine no longer uses bloom and HDR separately. Adapt the menu and effect...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index f3788f15ef2bc57256bca5b3c960a66f9835785e..4525f07bee29aa544f8f992027026537d451d775 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -202,7 +202,7 @@ v_iyaw_cycle 4 "v_idlescale yaw speed"
 v_iyaw_level 0.3 "v_idlescale yaw amount"\r
 \r
 r_bloom_blur 16\r
-r_bloom_brighten 2.75\r
+r_bloom_brighten 2.5\r
 r_bloom_colorexponent 1\r
 r_bloom_colorscale 1\r
 r_bloom_colorsubtract 0.2\r

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index 0d9766afd18aee7191a28612c51db74e629ae19b..bb04d0baf914acde15299191c7c80aa790d510de 100644 (file)
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1\r
 r_glsl_offsetmapping 1\r
 r_glsl_offsetmapping_reliefmapping 0\r
-r_hdr 0\r
 r_motionblur 0.5\r
 r_picmipworld 0\r
 r_shadow_gloss 1\r

diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index a627d960802a3bc00a75108fd430098f4a76c4c3..5fd255fd4c4b337f4b40836a1f1d1deebcd22a58 100644 (file)
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 500
 r_glsl_deluxemapping 0\r
 r_glsl_offsetmapping 0\r
 r_glsl_offsetmapping_reliefmapping 0\r
-r_hdr 0\r
 r_motionblur 0\r
 r_picmipworld 1\r
 r_shadow_gloss 0\r

diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index dc779547376db9f858f40f4d45d88491f578669d..e73b44b5ed3fd82c1f1b4428bf5d6d81e21a546a 100644 (file)
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 1000
 r_glsl_deluxemapping 0\r
 r_glsl_offsetmapping 0\r
 r_glsl_offsetmapping_reliefmapping 0\r
-r_hdr 0\r
 r_motionblur 0\r
 r_picmipworld 0\r
 r_shadow_gloss 0\r

diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index b49270d2f48e57ff5705835daac83ee11654eb73..7a8c735d6fa5880f5d83fd1916b71af19b534d94 100644 (file)
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 1000
 r_glsl_deluxemapping 1\r
 r_glsl_offsetmapping 0\r
 r_glsl_offsetmapping_reliefmapping 0\r
-r_hdr 0\r
 r_motionblur 0\r
 r_picmipworld 0\r
 r_shadow_gloss 1\r

diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 0d59ff7a3fe3f4bd2e7d529f0b034cdd6f402f56..70a60f0c20f2120c0f6e85b277464b52a895f227 100644 (file)
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 250
 r_glsl_deluxemapping 0\r
 r_glsl_offsetmapping 0\r
 r_glsl_offsetmapping_reliefmapping 0\r
-r_hdr 0\r
 r_motionblur 0\r
 r_picmipworld 1\r
 r_shadow_gloss 0\r

diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index 2cd0c4ef4cdd8671ca07f16b2f183cd47c3b9e0e..0c74e755905287301e1621df3e91eed486a71f8e 100644 (file)
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1\r
 r_glsl_offsetmapping 1\r
 r_glsl_offsetmapping_reliefmapping 1\r
-r_hdr 1\r
 r_motionblur 0.5\r
 r_picmipworld 0\r
 r_shadow_gloss 1\r

diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index 782699fc4c8d4a13adf1c8d65898e43175a20585..91b76a45eb78b0dd5c58c5be4edbce7b9a4c3b6a 100644 (file)
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -19,7 +19,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1\r
 r_glsl_offsetmapping 1\r
 r_glsl_offsetmapping_reliefmapping 0\r
-r_hdr 0\r
 r_motionblur 0.5\r
 r_picmipworld 0\r
 r_shadow_gloss 1\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index f1ac36ec53952526b0248ad187aaa3217300c363..169c3b60e02ba720b3ae3f89508b7a6d6710d588 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -162,16 +162,14 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries"));\r
                        setDependent(e, "r_coronas", 1, 1);\r
        me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_bloom", "High Dynamic Range (HDR)"));\r
                        setDependent(e, "r_hdr", 0, 0);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Intensity:"));\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Bloom:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(2, 4, 0.1, "r_bloom_brighten"));\r
                setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1);\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation"));\r
        me.TR(me);\r
        me.TR(me);\r
                s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur");\r
@@ -181,7 +179,7 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretCheckBoxEx(1.5, 0, "hud_cartoon", "Cartoon lines"));\r
-               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Content blur"));\r
                me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_saturation", "Armor saturation"));\r
 \r
        me.gotoRC(me, me.rows - 1, 0);\r