[nexuiz-commits] r6880 - in trunk/data: . qcsrc/menu qcsrc/menu/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jun 6 06:44:57 EDT 2009
Author: div0
Date: 2009-06-06 06:44:57 -0400 (Sat, 06 Jun 2009)
New Revision: 6880
Modified:
trunk/data/qcsrc/menu/menu.qc
trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
trunk/data/tooltips.db
Log:
menu: add saturation slider, fix warning about fteqcc miscompiling menu tolltip code
Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc 2009-06-06 10:08:13 UTC (rev 6879)
+++ trunk/data/qcsrc/menu/menu.qc 2009-06-06 10:44:57 UTC (rev 6880)
@@ -297,21 +297,17 @@
while(it.instanceOfContainer)
{
+ while(it.instanceOfNexposee && it.focusedChild)
+ {
+ it = it.focusedChild;
+ pos = globalToBox(pos, it.Container_origin, it.Container_size);
+ }
if(it.instanceOfNexposee)
{
- if(it.focusedChild)
- {
- it = it.focusedChild;
- pos = globalToBox(pos, it.Container_origin, it.Container_size);
- continue; // don't show dialog tooltips when the dialog is open
- }
- else
- {
- it = it.itemFromPoint(it, pos);
- if(it.tooltip)
- best = it;
- break;
- }
+ it = it.itemFromPoint(it, pos);
+ if(it.tooltip)
+ best = it;
+ it = world;
}
else if(it.instanceOfModalController)
it = it.focusedChild;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-06-06 10:08:13 UTC (rev 6879)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-06-06 10:44:57 UTC (rev 6880)
@@ -80,6 +80,11 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Contrast boost:"));
me.TD(me, 1, 2, e = makeNexuizSlider(1.0, 5.0, 0.1, "v_contrastboost"));
me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Saturation:"));
+ setDependent(e, "r_glsl", 1, 1);
+ me.TD(me, 1, 2, e = makeNexuizSlider(0.0, 2.0, 0.1, "r_glsl_saturation"));
+ setDependent(e, "r_glsl", 1, 1);
+ me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_glslgamma", "Use GLSL to handle color control"));
setDependent(e, "r_glsl", 1, 1);
me.TR(me);
Modified: trunk/data/tooltips.db
===================================================================
--- trunk/data/tooltips.db 2009-06-06 10:08:13 UTC (rev 6879)
+++ trunk/data/tooltips.db 2009-06-06 10:44:57 UTC (rev 6880)
@@ -115,6 +115,7 @@
\v_contrast\Brightness of white
\v_gamma\Inverse gamma correction value, a brightness effect that does not affect white or black
\v_contrastboost\By how much to multiply the contrast in dark areas
+\r_glsl_saturation\Saturation adjustment (0 = gray, 1 = normal, 2 = oversaturated), note that it might decrease performance by a lot to set this to anything other than 1
\v_glslgamma\Enable use of GLSL to apply gamma correction, note that it might decrease performance by a lot (default: disabled)
\r_ambient\Ambient lighting, if set too high it tends to make light on maps look dull and flat (default: 4)
\r_hdr_scenebrightness\Global rendering brightness (default: 1)
More information about the nexuiz-commits
mailing list