From 24f42ad4687a270d1c9d15a183d8300024409342 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 17 Nov 2011 23:37:01 +0200 Subject: [PATCH] The latest engine no longer uses bloom and HDR separately. Adapt the menu and effect presets to reflect that --- data/defaultVT.cfg | 2 +- data/effects-high.cfg | 1 - data/effects-low.cfg | 1 - data/effects-med.cfg | 1 - data/effects-normal.cfg | 1 - data/effects-omg.cfg | 1 - data/effects-ultimate.cfg | 1 - data/effects-ultra.cfg | 1 - data/qcsrc/menu/voret/dialog_settings_effects.c | 10 ++++------ 9 files changed, 5 insertions(+), 14 deletions(-) diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index f3788f15..4525f07b 100644 --- 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_bloom_blur 16 -r_bloom_brighten 2.75 +r_bloom_brighten 2.5 r_bloom_colorexponent 1 r_bloom_colorscale 1 r_bloom_colorsubtract 0.2 diff --git a/data/effects-high.cfg b/data/effects-high.cfg index 0d9766af..bb04d0ba 100644 --- a/data/effects-high.cfg +++ b/data/effects-high.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 2000 r_glsl_deluxemapping 1 r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 0 -r_hdr 0 r_motionblur 0.5 r_picmipworld 0 r_shadow_gloss 1 diff --git a/data/effects-low.cfg b/data/effects-low.cfg index a627d960..5fd255fd 100644 --- a/data/effects-low.cfg +++ b/data/effects-low.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 500 r_glsl_deluxemapping 0 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 -r_hdr 0 r_motionblur 0 r_picmipworld 1 r_shadow_gloss 0 diff --git a/data/effects-med.cfg b/data/effects-med.cfg index dc779547..e73b44b5 100644 --- a/data/effects-med.cfg +++ b/data/effects-med.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 1000 r_glsl_deluxemapping 0 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 -r_hdr 0 r_motionblur 0 r_picmipworld 0 r_shadow_gloss 0 diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg index b49270d2..7a8c735d 100644 --- a/data/effects-normal.cfg +++ b/data/effects-normal.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 1000 r_glsl_deluxemapping 1 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 -r_hdr 0 r_motionblur 0 r_picmipworld 0 r_shadow_gloss 1 diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg index 0d59ff7a..70a60f0c 100644 --- a/data/effects-omg.cfg +++ b/data/effects-omg.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 250 r_glsl_deluxemapping 0 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 -r_hdr 0 r_motionblur 0 r_picmipworld 1 r_shadow_gloss 0 diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg index 2cd0c4ef..0c74e755 100644 --- a/data/effects-ultimate.cfg +++ b/data/effects-ultimate.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 2000 r_glsl_deluxemapping 1 r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 1 -r_hdr 1 r_motionblur 0.5 r_picmipworld 0 r_shadow_gloss 1 diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg index 782699fc..91b76a45 100644 --- a/data/effects-ultra.cfg +++ b/data/effects-ultra.cfg @@ -19,7 +19,6 @@ r_drawparticles_drawdistance 2000 r_glsl_deluxemapping 1 r_glsl_offsetmapping 1 r_glsl_offsetmapping_reliefmapping 0 -r_hdr 0 r_motionblur 0.5 r_picmipworld 0 r_shadow_gloss 1 diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index f1ac36ec..169c3b60 100644 --- 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")); setDependent(e, "r_coronas", 1, 1); me.TR(me); - me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom")); + me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_bloom", "High Dynamic Range (HDR)")); setDependent(e, "r_hdr", 0, 0); - me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_hdr", "High Dynamic Range (HDR)")); + me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation")); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Intensity:")); + me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Bloom:")); me.TD(me, 1, 2, e = makeVoretSlider(2, 4, 0.1, "r_bloom_brighten")); setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1); - me.TR(me); - me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation")); me.TR(me); me.TR(me); s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur"); @@ -181,7 +179,7 @@ void fillVoretEffectsSettingsTab(entity me) me.TD(me, 1, 2, s); me.TR(me); me.TD(me, 1, 1, e = makeVoretCheckBoxEx(1.5, 0, "hud_cartoon", "Cartoon lines")); - me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur")); + me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Content blur")); me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_saturation", "Armor saturation")); me.gotoRC(me, me.rows - 1, 0); -- 2.39.2