From 27f209865bfd5bbe84d4d0aff5118b2830c336c8 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 5 Jul 2011 16:07:33 +0300 Subject: [PATCH] Tweak the Effects menu, and add iris adaptation to it as well. --- data/qcsrc/menu/voret/dialog_settings.c | 2 +- data/qcsrc/menu/voret/dialog_settings_audio.c | 2 +- data/qcsrc/menu/voret/dialog_settings_effects.c | 10 ++++++---- data/qcsrc/menu/voret/dialog_settings_input.c | 2 +- data/qcsrc/menu/voret/dialog_settings_misc.c | 2 +- data/qcsrc/menu/voret/dialog_settings_network.c | 2 +- data/qcsrc/menu/voret/dialog_settings_video.c | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/data/qcsrc/menu/voret/dialog_settings.c b/data/qcsrc/menu/voret/dialog_settings.c index feabe67c..dc0595be 100644 --- a/data/qcsrc/menu/voret/dialog_settings.c +++ b/data/qcsrc/menu/voret/dialog_settings.c @@ -4,7 +4,7 @@ CLASS(VoretSettingsDialog) EXTENDS(VoretDialog) ATTRIB(VoretSettingsDialog, title, string, "Settings") ATTRIB(VoretSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(VoretSettingsDialog, intendedWidth, float, 0.96) - ATTRIB(VoretSettingsDialog, rows, float, 21) + ATTRIB(VoretSettingsDialog, rows, float, 22) ATTRIB(VoretSettingsDialog, columns, float, 6) ENDCLASS(VoretSettingsDialog) #endif diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c index 0fe76e2d..933d6591 100644 --- a/data/qcsrc/menu/voret/dialog_settings_audio.c +++ b/data/qcsrc/menu/voret/dialog_settings_audio.c @@ -3,7 +3,7 @@ CLASS(VoretAudioSettingsTab) EXTENDS(VoretTab) METHOD(VoretAudioSettingsTab, fill, void(entity)) ATTRIB(VoretAudioSettingsTab, title, string, "Audio") ATTRIB(VoretAudioSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretAudioSettingsTab, rows, float, 19) + ATTRIB(VoretAudioSettingsTab, rows, float, 20) ATTRIB(VoretAudioSettingsTab, columns, float, 6.5) ENDCLASS(VoretAudioSettingsTab) entity makeVoretAudioSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index 568c6b4f..19c2be7d 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -3,7 +3,7 @@ CLASS(VoretEffectsSettingsTab) EXTENDS(VoretTab) METHOD(VoretEffectsSettingsTab, fill, void(entity)) ATTRIB(VoretEffectsSettingsTab, title, string, "Effects") ATTRIB(VoretEffectsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretEffectsSettingsTab, rows, float, 19) + ATTRIB(VoretEffectsSettingsTab, rows, float, 20) ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5) ENDCLASS(VoretEffectsSettingsTab) entity makeVoretEffectsSettingsTab(); @@ -163,8 +163,10 @@ void fillVoretEffectsSettingsTab(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Intensity:")); - me.TD(me, 1, 2, e = makeVoretSlider(2, 6, 0.1, "r_bloom_brighten")); + 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"); @@ -173,8 +175,8 @@ void fillVoretEffectsSettingsTab(entity me) e.savedValue = 0.5; // default me.TD(me, 1, 2, s); me.TR(me); - me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Screen blur")); - me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Sharpening")); + me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur")); + me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Powerup sharpen")); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY)); diff --git a/data/qcsrc/menu/voret/dialog_settings_input.c b/data/qcsrc/menu/voret/dialog_settings_input.c index 441a8d74..5e7b8ca2 100644 --- a/data/qcsrc/menu/voret/dialog_settings_input.c +++ b/data/qcsrc/menu/voret/dialog_settings_input.c @@ -3,7 +3,7 @@ CLASS(VoretInputSettingsTab) EXTENDS(VoretTab) METHOD(VoretInputSettingsTab, fill, void(entity)) ATTRIB(VoretInputSettingsTab, title, string, "Input") ATTRIB(VoretInputSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretInputSettingsTab, rows, float, 19) + ATTRIB(VoretInputSettingsTab, rows, float, 20) ATTRIB(VoretInputSettingsTab, columns, float, 6.5) ENDCLASS(VoretInputSettingsTab) entity makeVoretInputSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_misc.c b/data/qcsrc/menu/voret/dialog_settings_misc.c index 4e353d16..0f646e2b 100644 --- a/data/qcsrc/menu/voret/dialog_settings_misc.c +++ b/data/qcsrc/menu/voret/dialog_settings_misc.c @@ -3,7 +3,7 @@ CLASS(VoretMiscSettingsTab) EXTENDS(VoretTab) METHOD(VoretMiscSettingsTab, fill, void(entity)) ATTRIB(VoretMiscSettingsTab, title, string, "Misc") ATTRIB(VoretMiscSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretMiscSettingsTab, rows, float, 19) + ATTRIB(VoretMiscSettingsTab, rows, float, 20) ATTRIB(VoretMiscSettingsTab, columns, float, 6.5) ENDCLASS(VoretMiscSettingsTab) entity makeVoretMiscSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_network.c b/data/qcsrc/menu/voret/dialog_settings_network.c index d705eb11..4b76e7cc 100644 --- a/data/qcsrc/menu/voret/dialog_settings_network.c +++ b/data/qcsrc/menu/voret/dialog_settings_network.c @@ -3,7 +3,7 @@ CLASS(VoretNetworkSettingsTab) EXTENDS(VoretTab) METHOD(VoretNetworkSettingsTab, fill, void(entity)) ATTRIB(VoretNetworkSettingsTab, title, string, "Network") ATTRIB(VoretNetworkSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretNetworkSettingsTab, rows, float, 19) + ATTRIB(VoretNetworkSettingsTab, rows, float, 20) ATTRIB(VoretNetworkSettingsTab, columns, float, 6.5) ENDCLASS(VoretNetworkSettingsTab) entity makeVoretNetworkSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c index ede4ff28..8a32214e 100644 --- a/data/qcsrc/menu/voret/dialog_settings_video.c +++ b/data/qcsrc/menu/voret/dialog_settings_video.c @@ -3,7 +3,7 @@ CLASS(VoretVideoSettingsTab) EXTENDS(VoretTab) METHOD(VoretVideoSettingsTab, fill, void(entity)) ATTRIB(VoretVideoSettingsTab, title, string, "Video") ATTRIB(VoretVideoSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretVideoSettingsTab, rows, float, 19) + ATTRIB(VoretVideoSettingsTab, rows, float, 20) ATTRIB(VoretVideoSettingsTab, columns, float, 6.5) ATTRIB(VoretVideoSettingsTab, name, string, "videosettings") ENDCLASS(VoretVideoSettingsTab) -- 2.39.2