qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-02 04:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cvar cleanup.

Browse source 
gl_smooth is now gl_dlight_smooth
gl_smoothdlights was redundant, is now gone
gl_flashblend is now gl_dlight_polyblend
gl_lightmap added to enable/disable lightmap updates independently of use of gl_dlight_polyblend
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-02-01 19:53:15 +00:00
parent 20a885c174
commit 161973d75a
10 changed files with 97 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/glquake.h
View file

@ -161,14 +161,14 @@ extern cvar_t *gl_clear;
extern cvar_t *gl_cull;
extern cvar_t *gl_fb_bmodels;
extern cvar_t *gl_fb_models;
extern cvar_t *gl_flashblend;
extern cvar_t *gl_dlight_lightmap;
extern cvar_t *gl_dlight_polyblend;
extern cvar_t *gl_dlight_smooth;
extern cvar_t *gl_keeptjunctions;
extern cvar_t *gl_multitexture;
extern cvar_t *gl_nocolors;
extern cvar_t *gl_poly;
extern cvar_t *gl_polyblend;
extern cvar_t *gl_smooth;
extern cvar_t *gl_smoothdlights;
extern cvar_t *gl_max_size;
extern cvar_t *gl_playermip;

2
source/cl_parse.c
View file

@ -65,7 +65,7 @@
#include "va.h"
#include "view.h"
extern cvar_t *gl_flashblend;
extern cvar_t *gl_dlight_polyblend;
extern cvar_t *cl_autoexec;
char *svc_strings[] = {

9
source/gl_rlight.c
View file

@ -168,7 +168,7 @@ R_RenderDlights (void)
int i;
dlight_t *l;
if (!gl_flashblend->int_val)
if (!gl_dlight_polyblend->int_val)
return;
r_dlightframecount = r_framecount + 1; // because the count hasn't
@ -176,8 +176,7 @@ R_RenderDlights (void)
glDepthMask (GL_FALSE);
glDisable (GL_TEXTURE_2D);
glBlendFunc (GL_ONE, GL_ONE);
if (gl_smoothdlights->int_val)
glShadeModel (GL_SMOOTH);
glShadeModel (GL_SMOOTH);
l = cl_dlights;
for (i = 0; i < MAX_DLIGHTS; i++, l++) {
@ -186,7 +185,7 @@ R_RenderDlights (void)
R_RenderDlight (l);
}
if (!gl_smooth->int_val)
if (!gl_dlight_smooth->int_val)
glShadeModel (GL_FLAT);
glColor3ubv (lighthalf_v);
glEnable (GL_TEXTURE_2D);
@ -305,7 +304,7 @@ R_PushDlights (vec3_t entorigin)
dlight_t *l;
vec3_t lightorigin;
if (gl_flashblend->int_val)
if (!gl_dlight_lightmap->int_val)
return;
r_dlightframecount = r_framecount + 1; // because the count hasn't

8
source/gl_rmain.c
View file

@ -115,7 +115,8 @@ cvar_t *r_waterripple;
cvar_t *gl_affinemodels;
cvar_t *gl_clear;
cvar_t *gl_cull;
cvar_t *gl_flashblend;
cvar_t *gl_dlight_lightmap;
cvar_t *gl_dlight_polyblend;
cvar_t *gl_fb_models;
cvar_t *gl_fb_bmodels;
cvar_t *gl_keeptjunctions;
@ -123,8 +124,7 @@ cvar_t *gl_lerp_anim;
cvar_t *gl_multitexture;
cvar_t *gl_nocolors;
cvar_t *gl_playermip;
cvar_t *gl_smooth;
cvar_t *gl_smoothdlights;
cvar_t *gl_dlight_smooth;
cvar_t *r_skyname;
cvar_t *gl_skymultipass;
@ -1188,7 +1188,7 @@ R_SetupGL (void)
glDisable (GL_ALPHA_TEST);
glAlphaFunc (GL_GREATER, 0.5);
glEnable (GL_DEPTH_TEST);
if (gl_smooth->int_val)
if (gl_dlight_smooth->int_val)
glShadeModel (GL_SMOOTH);
else
glShadeModel (GL_FLAT);

6
source/gl_rmisc.c
View file

@ -228,10 +228,12 @@ R_Init_Cvars (void)
gl_affinemodels = Cvar_Get ("gl_affinemodels", "0", CVAR_ARCHIVE, "Makes texture rendering quality better if set to 1");
gl_clear = Cvar_Get ("gl_clear", "0", CVAR_NONE, "Set to 1 to make background black. Useful for removing HOM effect");
gl_cull = Cvar_Get ("gl_cull", "1", CVAR_ARCHIVE, "If set to 1, does not render things that do not need to be");
gl_dlight_lightmap = Cvar_Get ("gl_dlight_lightmap", "0", CVAR_ARCHIVE, "Set to 1 for high quality dynamic lighting.");
gl_dlight_polyblend = Cvar_Get ("gl_dlight_polyblend", "0", CVAR_ARCHIVE, "Set to 1 to use a dynamic light effect faster on GL");
gl_dlight_smooth = Cvar_Get ("gl_dlight_smooth", "1", CVAR_ARCHIVE, "Smooth dynamic vertex lighting");
gl_fb_bmodels = Cvar_Get ("gl_fb_bmodels", "1", CVAR_ARCHIVE, "Toggles fullbright color support for bmodels");
gl_fb_models = Cvar_Get ("gl_fb_models", "1", CVAR_ARCHIVE, "Toggles fullbright color support for models");
gl_fires = Cvar_Get ("gl_fires", "0", CVAR_ARCHIVE, "Toggles lavaball and rocket fireballs");
gl_flashblend = Cvar_Get ("gl_flashblend", "0", CVAR_ARCHIVE, "Set to 1 to use a type of lighting faster on GL");
gl_keeptjunctions = Cvar_Get ("gl_keeptjunctions", "1", CVAR_ARCHIVE, "Set to 0 to turn off colinear vertexes upon level load");
gl_lerp_anim = Cvar_Get ("gl_lerp_anim", "1", CVAR_ARCHIVE, "Toggles model animation interpolation");
gl_multitexture = Cvar_Get ("gl_multitexture", "0", CVAR_ARCHIVE, "Use multitexture when available");
@ -240,8 +242,6 @@ R_Init_Cvars (void)
gl_sky_clip = Cvar_Get ("gl_sky_clip", "0", CVAR_ARCHIVE, "controls whether sky is drawn first (0) or later (1)");
gl_sky_divide = Cvar_Get ("gl_sky_divide", "1", CVAR_ARCHIVE, "subdivide sky polys");
gl_skymultipass = Cvar_Get ("gl_skymultipass", "1", CVAR_ARCHIVE, "controls whether the skydome is single or double pass");
gl_smooth = Cvar_Get ("gl_smooth", "1", CVAR_ARCHIVE, "Smooth lighting on models");
gl_smoothdlights = Cvar_Get ("gl_smoothdlights", "1", CVAR_ARCHIVE, "Smooth dynamic lights");
}
/*

2
source/gl_rsurf.c
View file

@ -765,7 +765,7 @@ R_DrawBrushModel (entity_t *e)
psurf = &clmodel->surfaces[clmodel->firstmodelsurface];
// calculate dynamic lighting for bmodel if it's not an instanced model
if (clmodel->firstmodelsurface != 0 && !gl_flashblend->int_val) {
if (clmodel->firstmodelsurface != 0 && gl_dlight_lightmap->int_val) {
vec3_t lightorigin;
for (k = 0; k < MAX_DLIGHTS; k++) {

40
source/gl_view.c
View file

@ -38,19 +38,22 @@
#include <stdio.h>
#include "bothdefs.h"
#include "glquake.h"
#include "view.h"
extern byte *host_basepal;
extern double host_frametime;
extern int onground;
extern byte gammatable[256];
extern cvar_t *cl_cshift_powerup;
extern cvar_t *contrast;
byte ramps[3][256];
float v_blend[4];
void V_CalcPowerupCshift (void);
qboolean V_CheckGamma (void);
/*
@ -108,12 +111,39 @@ V_CalcBlend (void)
v_blend[3] = bound (0.0, a, 1.0);
}
/*
=============
V_CalcPowerupCshift
=============
*/
void
V_CalcPowerupCshift (void)
{
if (!cl_cshift_powerup->int_val
|| (atoi (Info_ValueForKey (cl.serverinfo, "cshifts")) & INFO_CSHIFT_POWERUP))
return;
// Note that quad and pent are handled as dlights now. - Despair
if (cl.stats[STAT_ITEMS] & IT_SUIT) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 20;
} else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 100;
cl.cshifts[CSHIFT_POWERUP].percent = 100;
} else
cl.cshifts[CSHIFT_POWERUP].percent = 0;
}
/*
=============
V_UpdatePalette
=============
*/
*/
void
V_UpdatePalette (void)
{
@ -155,13 +185,13 @@ V_UpdatePalette (void)
V_CalcBlend ();
}
/*
BuildGammaTable
In software mode, this function gets the palette ready for changing...in
in GL, it does very little as you can see.
*/
*/
void
BuildGammaTable (float b, float c)
{

4
source/r_main.c
View file

@ -172,7 +172,8 @@ cvar_t *r_numedges;
cvar_t *r_aliastransbase;
cvar_t *r_aliastransadj;
cvar_t *gl_flashblend;
cvar_t *gl_dlight_lightmap;
cvar_t *gl_dlight_polyblend;
cvar_t *gl_sky_divide;
extern cvar_t *scr_fov;
@ -294,7 +295,6 @@ R_Init_Cvars (void)
r_numedges = Cvar_Get ("r_numedges", "0", CVAR_NONE, "Toggles the displaying of number of edges currently being viewed");
r_aliastransbase = Cvar_Get ("r_aliastransbase", "200", CVAR_NONE, "Determines how much of an alias model is clipped away and how much is viewable");
r_aliastransadj = Cvar_Get ("r_aliastransadj", "100", CVAR_NONE, "Determines how much of an alias model is clipped away and how much is viewable.");
gl_flashblend = Cvar_Get ("gl_flashblend", "0", CVAR_NONE, "Toggles the type of lighting for objects");
gl_sky_divide = Cvar_Get ("gl_sky_divide", "1", CVAR_ARCHIVE,
"subdivide sky polys");
}

38
source/r_view.c
View file

@ -264,7 +264,7 @@ V_DriftPitch (void)
extern cvar_t *cl_cshift_bonus;
extern cvar_t *cl_cshift_contents;
extern cvar_t *cl_cshift_damage;
extern cvar_t *cl_cshift_powerup;
// extern cvar_t *cl_cshift_powerup;
cshift_t cshift_empty = { {130, 80, 50}, 0 };
cshift_t cshift_water = { {130, 80, 50}, 128 };
@ -433,42 +433,6 @@ V_SetContentsColor (int contents)
}
}
/*
=============
V_CalcPowerupCshift
=============
*/
void
V_CalcPowerupCshift (void)
{
if (!cl_cshift_powerup->int_val
|| (atoi (Info_ValueForKey (cl.serverinfo, "cshifts")) & INFO_CSHIFT_POWERUP))
return;
if (cl.stats[STAT_ITEMS] & IT_QUAD) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else if (cl.stats[STAT_ITEMS] & IT_SUIT) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 20;
} else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 100;
cl.cshifts[CSHIFT_POWERUP].percent = 100;
} else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else
cl.cshifts[CSHIFT_POWERUP].percent = 0;
}
/*
==============================================================================

45
source/sw_view.c
View file

@ -30,19 +30,60 @@
# include "config.h"
#endif
#include "bothdefs.h"
#include "host.h"
#include "r_local.h"
#include "view.h"
extern cvar_t *cl_cshift_powerup;
extern byte gammatable[256];
void V_CalcPowerupCshift (void);
qboolean V_CheckGamma (void);
/*
=============
V_CalcPowerupCshift
=============
*/
void
V_CalcPowerupCshift (void)
{
if (!cl_cshift_powerup->int_val
|| (atoi (Info_ValueForKey (cl.serverinfo, "cshifts")) & INFO_CSHIFT_POWERUP))
return;
if (cl.stats[STAT_ITEMS] & IT_QUAD) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else if (cl.stats[STAT_ITEMS] & IT_SUIT) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 20;
} else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 100;
cl.cshifts[CSHIFT_POWERUP].percent = 100;
} else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else
cl.cshifts[CSHIFT_POWERUP].percent = 0;
}
/*
=============
V_UpdatePalette
=============
*/
*/
void
V_UpdatePalette (void)
{