[nexuiz-commits] r8148 - in trunk/data: . qcsrc/common qcsrc/menu qcsrc/menu/nexuiz qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Oct 17 13:41:41 EDT 2009
Author: div0
Date: 2009-10-17 13:41:40 -0400 (Sat, 17 Oct 2009)
New Revision: 8148
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/effects-high.cfg
trunk/data/effects-low.cfg
trunk/data/effects-med.cfg
trunk/data/effects-normal.cfg
trunk/data/effects-omg.cfg
trunk/data/effects-ultimate.cfg
trunk/data/effects-ultra.cfg
trunk/data/qcsrc/common/util.qh
trunk/data/qcsrc/menu/menu.qh
trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
trunk/data/qcsrc/menu/nexuiz/util.qc
trunk/data/qcsrc/menu/nexuiz/util.qh
trunk/data/qcsrc/server/defs.qh
Log:
shadowmapping menu option
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/defaultNexuiz.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -1658,8 +1658,6 @@
seta cl_noantilag 0 "turn this on if you believe antilag is bad"
-r_shadow_shadowmapping 1
-
set sv_pitch_min -35 "minimum aiming angle for shooting direction display of the gun"
set sv_pitch_max 35 "maximum aiming angle for shooting direction display of the gun"
set sv_pitch_fixyaw 1 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0"
Modified: trunk/data/effects-high.cfg
===================================================================
--- trunk/data/effects-high.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-high.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_shadows 0
+r_shadow_shadowmapping 0
r_shadow_usenormalmap 1
r_showsurfaces 0
r_subdivisions_tolerance 3
Modified: trunk/data/effects-low.cfg
===================================================================
--- trunk/data/effects-low.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-low.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_shadows 0
+r_shadow_shadowmapping 0
r_shadow_usenormalmap 0
r_showsurfaces 0
r_subdivisions_tolerance 8
Modified: trunk/data/effects-med.cfg
===================================================================
--- trunk/data/effects-med.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-med.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_shadows 0
+r_shadow_shadowmapping 0
r_shadow_usenormalmap 0
r_showsurfaces 0
r_subdivisions_tolerance 4
Modified: trunk/data/effects-normal.cfg
===================================================================
--- trunk/data/effects-normal.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-normal.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_shadows 0
+r_shadow_shadowmapping 0
r_shadow_usenormalmap 1
r_showsurfaces 0
r_subdivisions_tolerance 3
Modified: trunk/data/effects-omg.cfg
===================================================================
--- trunk/data/effects-omg.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-omg.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_shadows 0
+r_shadow_shadowmapping 0
r_shadow_usenormalmap 0
r_showsurfaces 3
r_subdivisions_tolerance 16
Modified: trunk/data/effects-ultimate.cfg
===================================================================
--- trunk/data/effects-ultimate.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-ultimate.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 1
r_shadow_realtime_world 1
r_shadow_realtime_world_shadows 1
+r_shadow_shadowmapping 1
r_shadow_usenormalmap 1
r_showsurfaces 0
r_subdivisions_tolerance 1
Modified: trunk/data/effects-ultra.cfg
===================================================================
--- trunk/data/effects-ultra.cfg 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/effects-ultra.cfg 2009-10-17 17:41:40 UTC (rev 8148)
@@ -21,6 +21,7 @@
r_shadow_realtime_dlight_shadows 1
r_shadow_realtime_world 1
r_shadow_realtime_world_shadows 1
+r_shadow_shadowmapping 1
r_shadow_usenormalmap 1
r_showsurfaces 0
r_subdivisions_tolerance 2
Modified: trunk/data/qcsrc/common/util.qh
===================================================================
--- trunk/data/qcsrc/common/util.qh 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/qcsrc/common/util.qh 2009-10-17 17:41:40 UTC (rev 8148)
@@ -194,3 +194,7 @@
void WriteInt24_t(float dest, float val);
#endif
#endif
+
+// the NULL function
+const var void func_null(void);
+const var string string_null;
Modified: trunk/data/qcsrc/menu/menu.qh
===================================================================
--- trunk/data/qcsrc/menu/menu.qh 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/qcsrc/menu/menu.qh 2009-10-17 17:41:40 UTC (rev 8148)
@@ -5,7 +5,6 @@
// constants
-const string string_null;
const vector eX = '1 0 0';
const vector eY = '0 1 0';
const vector eZ = '0 0 1';
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-10-17 17:41:40 UTC (rev 8148)
@@ -18,6 +18,17 @@
return me;
}
+float someShadowCvarIsEnabled(entity box)
+{
+ if(cvar("r_shadow_realtime_dlight"))
+ if(cvar("r_shadow_realtime_dlight_shadows"))
+ return TRUE;
+ if(cvar("r_shadow_realtime_world"))
+ if(cvar("r_shadow_realtime_world_shadows"))
+ return TRUE;
+ return FALSE;
+}
+
void fillNexuizEffectsSettingsTab(entity me)
{
entity e;
@@ -138,8 +149,10 @@
setDependent(e, "r_shadow_realtime_world", 1, 1);
me.TR(me);
me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));
+ me.TD(me, 1, 1.8, e = makeNexuizCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));
setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_shadow_shadowmapping", "Soft shadows"));
+ setDependentWeird(e, someShadowCvarIsEnabled);
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_coronas", "Coronas"));
me.TR(me);
@@ -158,6 +171,6 @@
setDependent(e, "r_motionblur", 0, 1);
me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_conwidth $menu_vid_conwidth; vid_conheight $menu_vid_conheight; vid_restart", COMMANDBUTTON_APPLY));
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qc 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/qcsrc/menu/nexuiz/util.qc 2009-10-17 17:41:40 UTC (rev 8148)
@@ -103,12 +103,17 @@
.float op_setDependent;
.string cvarString_setDependent;
.string cvarValue_setDependent;
+.float(entity) func_setDependent;
void setDependent_Check(entity e)
{
float f;
string s;
- if(e.cvarString_setDependent)
+ if(e.func_setDependent)
{
+ e.disabled = !(e.func_setDependent(e));
+ }
+ else if(e.cvarString_setDependent)
+ {
s = cvar_string(e.cvarString_setDependent);
e.disabled = (cvar_string(e.cvarString_setDependent) == e.cvarValue_setDependent);
}
@@ -153,6 +158,7 @@
e.cvarMax_setDependent = theCvarMax;
e.cvar2_setDependent = string_null;
e.cvar3_setDependent = string_null;
+ e.func_setDependent = func_null;
e.draw = setDependent_Draw;
setDependent_Check(e);
}
@@ -164,6 +170,7 @@
e.cvar_setDependent = string_null;
e.cvar2_setDependent = string_null;
e.cvar3_setDependent = string_null;
+ e.func_setDependent = func_null;
e.draw = setDependent_Draw;
setDependent_Check(e);
}
@@ -178,6 +185,7 @@
e.cvar2Max_setDependent = theCvar2Max;
e.cvar3_setDependent = string_null;
e.op_setDependent = 0;
+ e.func_setDependent = func_null;
e.draw = setDependent_Draw;
setDependent_Check(e);
}
@@ -192,6 +200,7 @@
e.cvar2Max_setDependent = theCvar2Max;
e.cvar3_setDependent = string_null;
e.op_setDependent = 1;
+ e.func_setDependent = func_null;
e.draw = setDependent_Draw;
setDependent_Check(e);
}
@@ -208,9 +217,17 @@
e.cvar3Min_setDependent = theCvar3Min;
e.cvar3Max_setDependent = theCvar3Max;
e.op_setDependent = 0;
+ e.func_setDependent = func_null;
e.draw = setDependent_Draw;
setDependent_Check(e);
}
+void setDependentWeird(entity e, float(entity) func)
+{
+ e.draw_setDependent = e.draw;
+ e.func_setDependent = func;
+ e.draw = setDependent_Draw;
+ setDependent_Check(e);
+}
// EXTRESPONSE SYSTEM ////////////////////////////////////////////////////////
Modified: trunk/data/qcsrc/menu/nexuiz/util.qh
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qh 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/qcsrc/menu/nexuiz/util.qh 2009-10-17 17:41:40 UTC (rev 8148)
@@ -10,6 +10,7 @@
void setDependentOR(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max);
void setDependentAND3(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max, string theCvar3Name, float theCvar3Min, float theCvar3Max);
void setDependentStringNotEqual(entity e, string theCvarName, string theCvarValue);
+void setDependentWeird(entity e, float(entity) func);
float tooltipdb;
void loadTooltips();
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2009-10-17 14:41:10 UTC (rev 8147)
+++ trunk/data/qcsrc/server/defs.qh 2009-10-17 17:41:40 UTC (rev 8148)
@@ -47,8 +47,6 @@
float sv_foginterval;
entity activator;
-string string_null;
-const var void(void) func_null;
float player_count;
float currentbots;
More information about the nexuiz-commits
mailing list