yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename gl_polyblend to gl1_polyblend and unite *_lockpvs to r_lockpvs.

Browse source
This commit is contained in:
Yamagi Burmeister 2018-01-09 09:44:06 +01:00
parent 6c99cef52d
commit 78ff99dd86
9 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/refresh/gl/header/local.h
View file

@ -210,7 +210,7 @@ extern cvar_t *gl_zfix;
extern cvar_t *r_clear; extern cvar_t *r_clear;
extern cvar_t *gl_cull; extern cvar_t *gl_cull;
extern cvar_t *gl_polyblend; extern cvar_t *gl_polyblend;
extern cvar_t *gl_flashblend; extern cvar_t *gl1_flashblend;
extern cvar_t *gl_modulate; extern cvar_t *gl_modulate;
extern cvar_t *gl_drawbuffer; extern cvar_t *gl_drawbuffer;
extern cvar_t *gl_swapinterval; extern cvar_t *gl_swapinterval;
@ -219,7 +219,7 @@ extern cvar_t *gl_texturemode;
extern cvar_t *gl_texturealphamode; extern cvar_t *gl_texturealphamode;
extern cvar_t *gl_texturesolidmode; extern cvar_t *gl_texturesolidmode;
extern cvar_t *gl_saturatelighting; extern cvar_t *gl_saturatelighting;
extern cvar_t *gl_lockpvs; extern cvar_t *r_lockpvs;
extern cvar_t *gl_msaa_samples; extern cvar_t *gl_msaa_samples;
extern cvar_t *vid_fullscreen; extern cvar_t *vid_fullscreen;

4
src/client/refresh/gl/r_light.c
View file

@ -92,7 +92,7 @@ R_RenderDlights(void)
int i; int i;
dlight_t *l; dlight_t *l;
if (!gl_flashblend->value) if (!gl1_flashblend->value)
{ {
return; return;
} }
@ -189,7 +189,7 @@ R_PushDlights(void)
int i; int i;
dlight_t *l; dlight_t *l;
if (gl_flashblend->value) if (gl1_flashblend->value)
{ {
return; return;
} }

8
src/client/refresh/gl/r_main.c
View file

@ -118,14 +118,14 @@ cvar_t *gl_finish;
cvar_t *r_clear; cvar_t *r_clear;
cvar_t *gl_cull; cvar_t *gl_cull;
cvar_t *gl_polyblend; cvar_t *gl_polyblend;
cvar_t *gl_flashblend; cvar_t *gl1_flashblend;
cvar_t *gl_saturatelighting; cvar_t *gl_saturatelighting;
cvar_t *gl_swapinterval; cvar_t *gl_swapinterval;
cvar_t *gl_texturemode; cvar_t *gl_texturemode;
cvar_t *gl_texturealphamode; cvar_t *gl_texturealphamode;
cvar_t *gl_texturesolidmode; cvar_t *gl_texturesolidmode;
cvar_t *gl_anisotropic; cvar_t *gl_anisotropic;
cvar_t *gl_lockpvs; cvar_t *r_lockpvs;
cvar_t *gl_msaa_samples; cvar_t *gl_msaa_samples;
cvar_t *vid_fullscreen; cvar_t *vid_fullscreen;
@ -1235,13 +1235,13 @@ R_Register(void)
r_clear = ri.Cvar_Get("r_clear", "0", 0); r_clear = ri.Cvar_Get("r_clear", "0", 0);
gl_cull = ri.Cvar_Get("gl_cull", "1", 0); gl_cull = ri.Cvar_Get("gl_cull", "1", 0);
gl_polyblend = ri.Cvar_Get("gl_polyblend", "1", 0); gl_polyblend = ri.Cvar_Get("gl_polyblend", "1", 0);
gl_flashblend = ri.Cvar_Get("gl_flashblend", "0", 0); gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE); gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
gl_texturealphamode = ri.Cvar_Get("gl_texturealphamode", "default", CVAR_ARCHIVE); gl_texturealphamode = ri.Cvar_Get("gl_texturealphamode", "default", CVAR_ARCHIVE);
gl_texturesolidmode = ri.Cvar_Get("gl_texturesolidmode", "default", CVAR_ARCHIVE); gl_texturesolidmode = ri.Cvar_Get("gl_texturesolidmode", "default", CVAR_ARCHIVE);
gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE); gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
gl_lockpvs = ri.Cvar_Get("gl_lockpvs", "0", 0); r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
gl_palettedtexture = ri.Cvar_Get("gl_palettedtexture", "0", CVAR_ARCHIVE); gl_palettedtexture = ri.Cvar_Get("gl_palettedtexture", "0", CVAR_ARCHIVE);
gl_pointparameters = ri.Cvar_Get("gl_pointparameters", "1", CVAR_ARCHIVE); gl_pointparameters = ri.Cvar_Get("gl_pointparameters", "1", CVAR_ARCHIVE);

4
src/client/refresh/gl/r_surf.c
View file

@ -656,7 +656,7 @@ R_DrawInlineBModel(void)
dlight_t *lt; dlight_t *lt;
/* calculate dynamic lighting for bmodel */ /* calculate dynamic lighting for bmodel */
if (!gl_flashblend->value) if (!gl1_flashblend->value)
{ {
lt = r_newrefdef.dlights; lt = r_newrefdef.dlights;
@ -992,7 +992,7 @@ R_MarkLeaves(void)
/* development aid to let you run around /* development aid to let you run around
and see exactly where the pvs ends */ and see exactly where the pvs ends */
if (gl_lockpvs->value) if (r_lockpvs->value)
{ {
return; return;
} }

10
src/client/refresh/gl3/gl3_main.c
View file

@ -111,7 +111,7 @@ cvar_t *r_drawentities;
cvar_t *r_drawworld; cvar_t *r_drawworld;
cvar_t *gl_nolerp_list; cvar_t *gl_nolerp_list;
cvar_t *gl_nobind; cvar_t *gl_nobind;
cvar_t *gl_lockpvs; cvar_t *r_lockpvs;
cvar_t *r_novis; cvar_t *r_novis;
cvar_t *r_speeds; cvar_t *r_speeds;
cvar_t *gl_finish; cvar_t *gl_finish;
@ -236,7 +236,7 @@ GL3_Register(void)
gl_zfix = ri.Cvar_Get("gl_zfix", "0", 0); gl_zfix = ri.Cvar_Get("gl_zfix", "0", 0);
r_clear = ri.Cvar_Get("r_clear", "0", 0); r_clear = ri.Cvar_Get("r_clear", "0", 0);
gl_cull = ri.Cvar_Get("gl_cull", "1", 0); gl_cull = ri.Cvar_Get("gl_cull", "1", 0);
gl_lockpvs = ri.Cvar_Get("gl_lockpvs", "0", 0); r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
r_novis = ri.Cvar_Get("r_novis", "0", 0); r_novis = ri.Cvar_Get("r_novis", "0", 0);
r_speeds = ri.Cvar_Get("r_speeds", "0", 0); r_speeds = ri.Cvar_Get("r_speeds", "0", 0);
gl_finish = ri.Cvar_Get("gl_finish", "0", CVAR_ARCHIVE); gl_finish = ri.Cvar_Get("gl_finish", "0", CVAR_ARCHIVE);
@ -278,13 +278,13 @@ GL3_Register(void)
r_clear = ri.Cvar_Get("r_clear", "0", 0); r_clear = ri.Cvar_Get("r_clear", "0", 0);
// gl_cull = ri.Cvar_Get("gl_cull", "1", 0); // gl_cull = ri.Cvar_Get("gl_cull", "1", 0);
gl_polyblend = ri.Cvar_Get("gl_polyblend", "1", 0); gl_polyblend = ri.Cvar_Get("gl_polyblend", "1", 0);
//gl_flashblend = ri.Cvar_Get("gl_flashblend", "0", 0); //gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
//gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE); //gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
gl_texturealphamode = ri.Cvar_Get("gl_texturealphamode", "default", CVAR_ARCHIVE); gl_texturealphamode = ri.Cvar_Get("gl_texturealphamode", "default", CVAR_ARCHIVE);
gl_texturesolidmode = ri.Cvar_Get("gl_texturesolidmode", "default", CVAR_ARCHIVE); gl_texturesolidmode = ri.Cvar_Get("gl_texturesolidmode", "default", CVAR_ARCHIVE);
//gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE); //gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
//gl_lockpvs = ri.Cvar_Get("gl_lockpvs", "0", 0); //r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
//gl_palettedtexture = ri.Cvar_Get("gl_palettedtexture", "0", CVAR_ARCHIVE); NOPE. //gl_palettedtexture = ri.Cvar_Get("gl_palettedtexture", "0", CVAR_ARCHIVE); NOPE.
gl_pointparameters = ri.Cvar_Get("gl_pointparameters", "1", CVAR_ARCHIVE); gl_pointparameters = ri.Cvar_Get("gl_pointparameters", "1", CVAR_ARCHIVE);
@ -1446,7 +1446,7 @@ GL3_RenderView(refdef_t *fd)
GL3_DrawEntitiesOnList(); GL3_DrawEntitiesOnList();
// kick the silly gl_flashblend poly lights // kick the silly gl1_flashblend poly lights
// GL3_RenderDlights(); // GL3_RenderDlights();
GL3_DrawParticles(); GL3_DrawParticles();

2
src/client/refresh/gl3/gl3_surf.c
View file

@ -863,7 +863,7 @@ GL3_MarkLeaves(void)
/* development aid to let you run around /* development aid to let you run around
and see exactly where the pvs ends */ and see exactly where the pvs ends */
if (gl_lockpvs->value) if (r_lockpvs->value)
{ {
return; return;
} }

2
src/client/refresh/gl3/header/local.h
View file

@ -488,7 +488,7 @@ extern cvar_t *r_customheight;
extern cvar_t *gl_nolerp_list; extern cvar_t *gl_nolerp_list;
extern cvar_t *gl_nobind; extern cvar_t *gl_nobind;
extern cvar_t *gl_lockpvs; extern cvar_t *r_lockpvs;
extern cvar_t *r_novis; extern cvar_t *r_novis;
extern cvar_t *gl_cull; extern cvar_t *gl_cull;

6
src/client/refresh/soft/r_main.c
View file

@ -153,7 +153,7 @@ cvar_t *vid_fullscreen;
cvar_t *vid_gamma; cvar_t *vid_gamma;
//PGM //PGM
cvar_t *sw_lockpvs; cvar_t *r_lockpvs;
//PGM //PGM
#define STRINGER(x) "x" #define STRINGER(x) "x"
@ -297,7 +297,7 @@ void R_Register (void)
sw_overbrightbits->modified = true; // force us to rebuild pallete later sw_overbrightbits->modified = true; // force us to rebuild pallete later
//PGM //PGM
sw_lockpvs = ri.Cvar_Get ("sw_lockpvs", "0", 0); r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", 0);
//PGM //PGM
} }
@ -453,7 +453,7 @@ void R_MarkLeaves (void)
// development aid to let you run around and see exactly where // development aid to let you run around and see exactly where
// the pvs ends // the pvs ends
if (sw_lockpvs->value) if (r_lockpvs->value)
return; return;
r_visframecount++; r_visframecount++;

4
src/common/cvar.c
View file

@ -53,7 +53,9 @@ replacement_t replacements[] = {
{"gl_customheight", "r_customheight"}, {"gl_customheight", "r_customheight"},
{"gl_customwidth", "r_customheight"}, {"gl_customwidth", "r_customheight"},
{"gl_dynamic", "gl1_dynamic"}, {"gl_dynamic", "gl1_dynamic"},
{"gl_farsee", "r_farsee"} {"gl_farsee", "r_farsee"},
{"gl_flashblend", "gl1_flashblend"},
{"gl_lockpvs", "r_lockpvs"}
}; };