yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-23 04:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename gl_modulate to r_modulate.

Browse source
This commit is contained in:
Yamagi Burmeister 2018-01-09 14:09:34 +01:00
parent 11ad28b711
commit 526904ca03
7 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,7 +211,7 @@ extern cvar_t *r_clear;
extern cvar_t *gl_cull;
extern cvar_t *gl_polyblend;
extern cvar_t *gl1_flashblend;
extern cvar_t *gl_modulate;
extern cvar_t *r_modulate;
extern cvar_t *gl_drawbuffer;
extern cvar_t *gl_swapinterval;
extern cvar_t *gl_anisotropic;

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

@ -310,7 +310,7 @@ R_RecursiveLightPoint(mnode_t *node, vec3_t start, vec3_t end)
for (j = 0; j < 3; j++)
{
scale[j] = gl_modulate->value *
scale[j] = r_modulate->value *
r_newrefdef.lightstyles[surf->styles[maps]].rgb[j];
}
@ -376,7 +376,7 @@ R_LightPoint(vec3_t p, vec3_t color)
}
}
VectorScale(color, gl_modulate->value, color);
VectorScale(color, r_modulate->value, color);
}
void
@ -544,7 +544,7 @@ R_BuildLightMap(msurface_t *surf, byte *dest, int stride)
for (i = 0; i < 3; i++)
{
scale[i] = gl_modulate->value *
scale[i] = r_modulate->value *
r_newrefdef.lightstyles[surf->styles[maps]].rgb[i];
}
@ -584,7 +584,7 @@ R_BuildLightMap(msurface_t *surf, byte *dest, int stride)
for (i = 0; i < 3; i++)
{
scale[i] = gl_modulate->value *
scale[i] = r_modulate->value *
r_newrefdef.lightstyles[surf->styles[maps]].rgb[i];
}

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

@ -106,7 +106,7 @@ cvar_t *gl_retexturing;
cvar_t *gl_nolerp_list;
cvar_t *gl1_dynamic;
cvar_t *gl_modulate;
cvar_t *r_modulate;
cvar_t *gl_nobind;
cvar_t *gl_round_down;
cvar_t *gl_picmip;
@ -1218,7 +1218,7 @@ R_Register(void)
gl_particle_att_b = ri.Cvar_Get("gl_particle_att_b", "0.0", CVAR_ARCHIVE);
gl_particle_att_c = ri.Cvar_Get("gl_particle_att_c", "0.01", CVAR_ARCHIVE);
gl_modulate = ri.Cvar_Get("gl_modulate", "1", CVAR_ARCHIVE);
r_modulate = ri.Cvar_Get("r_modulate", "1", CVAR_ARCHIVE);
r_mode = ri.Cvar_Get("r_mode", "4", CVAR_ARCHIVE);
gl_lightmap = ri.Cvar_Get("gl_lightmap", "0", 0);
gl_shadows = ri.Cvar_Get("gl_shadows", "0", CVAR_ARCHIVE);

4
src/client/refresh/gl3/gl3_light.c
View file

@ -235,7 +235,7 @@ RecursiveLightPoint(mnode_t *node, vec3_t start, vec3_t end)
{
for (i = 0; i < 3; i++)
{
scale[i] = gl_modulate->value *
scale[i] = r_modulate->value *
gl3_newrefdef.lightstyles[surf->styles[maps]].rgb[i];
}
@ -304,7 +304,7 @@ GL3_LightPoint(vec3_t p, vec3_t color)
}
}
VectorScale(color, gl_modulate->value, color);
VectorScale(color, r_modulate->value, color);
}

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

@ -119,7 +119,7 @@ cvar_t *gl_finish;
cvar_t *gl_cull;
cvar_t *gl_zfix;
cvar_t *r_fullbright;
cvar_t *gl_modulate;
cvar_t *r_modulate;
cvar_t *gl_lightmap;
cvar_t *gl_shadows;
// no gl_stencilshadows, always use stencil (if available)
@ -232,7 +232,7 @@ GL3_Register(void)
gl_lightmap = ri.Cvar_Get("gl_lightmap", "0", 0);
gl_shadows = ri.Cvar_Get("gl_shadows", "0", CVAR_ARCHIVE);
gl_modulate = ri.Cvar_Get("gl_modulate", "1", CVAR_ARCHIVE);
r_modulate = ri.Cvar_Get("gl_modulate", "1", CVAR_ARCHIVE);
gl_zfix = ri.Cvar_Get("gl_zfix", "0", 0);
r_clear = ri.Cvar_Get("r_clear", "0", 0);
gl_cull = ri.Cvar_Get("gl_cull", "1", 0);

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

@ -510,7 +510,7 @@ extern cvar_t *gl3_overbrightbits;
extern cvar_t *gl3_particle_fade_factor;
extern cvar_t *gl3_particle_square;
extern cvar_t *gl_modulate;
extern cvar_t *r_modulate;
extern cvar_t *gl_lightmap;
extern cvar_t *gl_shadows;

3
src/common/cvar.c
View file

@ -57,7 +57,8 @@ replacement_t replacements[] = {
{"gl_flashblend", "gl1_flashblend"},
{"gl_lockpvs", "r_lockpvs"},
{"gl_maxfps", "vid_maxfps"},
{"gl_mode", "r_mode"}
{"gl_mode", "r_mode"},
{"gl_modulate", "r_modulate"}
};