From f49baf5e03963c9e0a2ceb1b55d38db271c7deb9 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 15 Mar 2012 00:40:18 +0200 Subject: [PATCH] Move anti-aliasing and FBO to the Video menu instead of Effects --- 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 | 11 ----------- data/qcsrc/menu/voret/dialog_settings_video.c | 12 ++++++++++++ docs/TODO.txt | 4 ---- 10 files changed, 12 insertions(+), 22 deletions(-) diff --git a/data/effects-high.cfg b/data/effects-high.cfg index bb04d0ba..31164a5a 100644 --- a/data/effects-high.cfg +++ b/data/effects-high.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 3 r_water 1 r_water_resolutionmultiplier 0.5 r_hdr_irisadaptation 1 -vid_samples 2 menu_sync diff --git a/data/effects-low.cfg b/data/effects-low.cfg index 5fd255fd..160899b2 100644 --- a/data/effects-low.cfg +++ b/data/effects-low.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 8 r_water 0 r_water_resolutionmultiplier 0.5 r_hdr_irisadaptation 0 -vid_samples 1 menu_sync diff --git a/data/effects-med.cfg b/data/effects-med.cfg index e73b44b5..4c72d37e 100644 --- a/data/effects-med.cfg +++ b/data/effects-med.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 4 r_water 0 r_water_resolutionmultiplier 0.5 r_hdr_irisadaptation 0 -vid_samples 1 menu_sync diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg index 7a8c735d..38428c77 100644 --- a/data/effects-normal.cfg +++ b/data/effects-normal.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 3 r_water 0 r_water_resolutionmultiplier 0.5 r_hdr_irisadaptation 1 -vid_samples 1 menu_sync diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg index 70a60f0c..7cf611cf 100644 --- a/data/effects-omg.cfg +++ b/data/effects-omg.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 16 r_water 0 r_water_resolutionmultiplier 0.5 r_hdr_irisadaptation 0 -vid_samples 1 menu_sync diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg index 0c74e755..6181467b 100644 --- a/data/effects-ultimate.cfg +++ b/data/effects-ultimate.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 1 r_water 1 r_water_resolutionmultiplier 1 r_hdr_irisadaptation 1 -vid_samples 4 menu_sync diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg index 91b76a45..f5c0177f 100644 --- a/data/effects-ultra.cfg +++ b/data/effects-ultra.cfg @@ -33,6 +33,5 @@ r_subdivisions_tolerance 2 r_water 1 r_water_resolutionmultiplier 0.5 r_hdr_irisadaptation 1 -vid_samples 4 menu_sync diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index cb920e6e..ba2fc385 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -57,17 +57,6 @@ void fillVoretEffectsSettingsTab(entity me) e.addValue(e, "Best", "2"); e.addValue(e, "Insane", "1"); e.configureVoretTextSliderValues(e); - me.TR(me); - me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Antialiasing:")); - me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples")); - e.addValue(e, "Disabled", "1"); - e.addValue(e, "2x", "2"); - e.addValue(e, "4x", "4"); - e.configureVoretTextSliderValues(e); - setDependent(e, "r_viewfbo", 0, 0); - me.TR(me); - me.TD(me, 1, 3, e = makeVoretCheckBoxEx(2, 0, "r_viewfbo", _("High-quality frame buffer"))); - setDependent(e, "vid_samples", 1, 1); me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Texture quality:")); diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c index dbba1315..4a0a59d6 100644 --- a/data/qcsrc/menu/voret/dialog_settings_video.c +++ b/data/qcsrc/menu/voret/dialog_settings_video.c @@ -50,6 +50,18 @@ void fillVoretVideoSettingsTab(entity me) me.TD(me, 1, 1, e = makeVoretCheckBox(0, "vid_fullscreen", "Full screen")); me.TD(me, 1, 2, e = makeVoretCheckBox(0, "vid_vsync", "Vertical Synchronization")); me.TR(me); + me.TR(me); + me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Antialiasing:")); + me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples")); + e.addValue(e, "Disabled", "1"); + e.addValue(e, "2x", "2"); + e.addValue(e, "4x", "4"); + e.configureVoretTextSliderValues(e); + setDependent(e, "r_viewfbo", 0, 0); + me.TR(me); + me.TD(me, 1, 3, e = makeVoretCheckBoxEx(2, 0, "r_viewfbo", _("High-quality frame buffer"))); + setDependent(e, "vid_samples", 1, 1); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeVoretCheckBox(0, "vid_gl20", "Use OpenGL 2.0 shaders (GLSL)")); me.TR(me); diff --git a/docs/TODO.txt b/docs/TODO.txt index 8ff7e2b6..7c87f7ee 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -82,12 +82,8 @@ - +0.8: Add icons to indicate live prey + dead prey + items -- 0.7: Create missing player / map / skin preview images - - 0.7 | 0.8: Make sure the new blood leaves stains -- 0.7: Does r_viewfbo belong in the effect presets too? - - 0.7 | 0.8: Add cubemap reflections for eX and trak5 - 0.7 | 0.8: Maybe find better footstep sounds? -- 2.39.2