Move anti-aliasing and FBO to the Video menu instead of Effects

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_settings_effects.c

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 33f045c2f3d1ec9c9c527bf4d6e439516e05d991..ba2fc385b8e44f10c24e6f5c7e30dd63fa9022bb 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -57,13 +57,6 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.addValue(e, "Best", "2");\r
                        e.addValue(e, "Insane", "1");\r
                        e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Antialiasing:"));\r
-               me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples"));\r
-                       e.addValue(e, "Disabled", "1");\r
-                       e.addValue(e, "2x", "2");\r
-                       e.addValue(e, "4x", "4");\r
-                       e.configureVoretTextSliderValues(e);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Texture quality:"));\r
@@ -96,9 +89,14 @@ void fillVoretEffectsSettingsTab(entity me)
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Particle dist.:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(500, 2000, 100, "r_drawparticles_drawdistance"));\r
+       me.TR(me);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_particles_rain", "Weather"));\r
+               makeMulti(e, "cl_particles_snow");\r
        me.TR(me);\r
        me.TR(me);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_decals", "Decals"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "cl_decals", "Decals"));\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_decals_models", "On models"));\r
+                       setDependent(e, "cl_decals", 1, 1);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:"));\r
@@ -124,7 +122,7 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 1.9, e = makeVoretCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));\r
                        setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);\r
        me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_water", "Reflections: *"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_water", "Reflections:"));\r
                        setDependent(e, "vid_gl20", 1, 1);\r
                me.TD(me, 1, 2, e = makeVoretTextSlider("r_water_resolutionmultiplier"));\r
                        e.addValue(e, "Blurred", "0.25");\r
@@ -132,9 +130,6 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.addValue(e, "Sharp", "1");\r
                        e.configureVoretTextSliderValues(e);\r
                        setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1);\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "* may heavily reduce performance"));\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 3, e = makeVoretRadioButton(1, string_null, string_null, "No dynamic lighting"));\r
@@ -160,9 +155,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, "Bloom:"));\r
+               me.TD(me, 1, 2, e = makeVoretSlider(1, 3, 0.1, "r_bloom_brighten"));\r
+               setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1);\r
        me.TR(me);\r
        me.TR(me);\r
                s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur");\r
@@ -171,8 +171,10 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.savedValue = 0.5; // default\r
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_postprocessing", "Damage & Water blur"));\r
-       \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", "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
                me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));\r
 }\r