Tweak the Effects menu, and add iris adaptation to it as well.

[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..19c2be7df38467788bceb5ac15bba4bd0f1c4c47 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -124,7 +124,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.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
                        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 +132,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
                        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
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 3, e = makeVoretRadioButton(1, string_null, string_null, "No dynamic lighting"));\r


@@ -163,6 +160,13 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom"));\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_bloom", "Bloom"));\r
                        setDependent(e, "r_hdr", 0, 0);\r
                me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));\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, 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
        me.TR(me);\r
        me.TR(me);\r
                s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur");\r


@@ -171,8 +175,9 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.savedValue = 0.5; // default\r
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
                        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, 2, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Powerup sharpen"));\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
        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