[nexuiz-commits] r8397 - trunk/data/qcsrc/menu/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Dec 16 11:04:21 EST 2009
Author: div0
Date: 2009-12-16 11:04:18 -0500 (Wed, 16 Dec 2009)
New Revision: 8397
Modified:
trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
Log:
r_glsl to vid_gl20 cvar rename (please test)
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-12-16 14:25:35 UTC (rev 8396)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-12-16 16:04:18 UTC (rev 8397)
@@ -115,23 +115,23 @@
me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 2, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps"));
me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
- setDependentAND(e, "r_glsl", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
+ setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
me.TD(me, 1, 0.7, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
- setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
+ setDependentAND3(e, "vid_gl20", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
me.TR(me);
me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
- setDependent(e, "r_glsl", 1, 1);
+ setDependent(e, "vid_gl20", 1, 1);
me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
- setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
+ setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections:"));
- setDependent(e, "r_glsl", 1, 1);
+ setDependent(e, "vid_gl20", 1, 1);
me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier"));
e.addValue(e, "Blurred", "0.25");
e.addValue(e, "Good", "0.5");
e.addValue(e, "Sharp", "1");
e.configureNexuizTextSliderValues(e);
- setDependentAND(e, "r_glsl", 1, 1, "r_water", 1, 1);
+ setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1);
me.TR(me);
if(cvar("developer"))
me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-12-16 14:25:35 UTC (rev 8396)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-12-16 16:04:18 UTC (rev 8397)
@@ -51,7 +51,7 @@
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "vid_vsync", "Vertical Synchronization"));
me.TR(me);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_glsl", "Use OpenGL 2.0 shaders (GLSL)"));
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "vid_gl20", "Use OpenGL 2.0 shaders (GLSL)"));
me.TR(me);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries"));
me.TR(me);
@@ -92,12 +92,12 @@
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);
+ setDependent(e, "vid_gl20", 1, 1);
me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_glsl_saturation"));
- setDependent(e, "r_glsl", 1, 1);
+ setDependent(e, "vid_gl20", 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);
+ setDependent(e, "vid_gl20", 1, 1);
me.TR(me);
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Ambient:"));
More information about the nexuiz-commits
mailing list