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

sync usage r_dynamic and r_dynamic

Browse source
This commit is contained in:
Denis Pauk 2023-10-07 18:08:33 +03:00
parent b1b3ff1992
commit edfd93802b
26 changed files with 92 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/040_cvarlist.md
View file

@ -420,6 +420,9 @@ Set `0` by default.
OpenGL 3.2 renderer, `gles3` for the OpenGL ES3 renderer
and `soft` for the software renderer.
* **r_dynamic**: Enamble dynamic light in gl1 and vk renders.
* **r_flashblend**: Flah blend enable in gl1, gl3 and vulkan.
## Graphics (GL renderers only)

20
src/client/menu/videomenu.c
View file

@ -45,7 +45,7 @@ static cvar_t *gl_anisotropic;
static cvar_t *gl_msaa_samples;
static cvar_t *gl1_colorlight;
static cvar_t *gl3_colorlight;
static cvar_t *vk_dynamic;
static cvar_t *r_dynamic;
static menuframework_s s_opengl_menu;
@ -63,7 +63,7 @@ static menuslider_s s_gl3_overbrightbits_slider;
static menuslider_s s_vk_overbrightbits_slider;
static menulist_s s_gl1_colorlight_list;
static menulist_s s_gl3_colorlight_list;
static menulist_s s_vk_dynamic_list;
static menulist_s s_r_dynamic_list;
static menulist_s s_fs_box;
static menulist_s s_vsync_list;
static menulist_s s_af_list;
@ -564,13 +564,13 @@ VID_MenuInit(void)
s_vk_overbrightbits_slider.minvalue = 0.1f;
s_vk_overbrightbits_slider.maxvalue = 5.0f;
vk_dynamic = Cvar_Get("vk_dynamic", "1", CVAR_ARCHIVE);
s_vk_dynamic_list.generic.type = MTYPE_SPINCONTROL;
s_vk_dynamic_list.generic.name = "dynamic light";
s_vk_dynamic_list.generic.x = 0;
s_vk_dynamic_list.generic.y = (y += 10);
s_vk_dynamic_list.itemnames = yesno_names;
s_vk_dynamic_list.curvalue = (vk_dynamic->value != 0);
r_dynamic = Cvar_Get("r_dynamic", "1", CVAR_ARCHIVE);
s_r_dynamic_list.generic.type = MTYPE_SPINCONTROL;
s_r_dynamic_list.generic.name = "dynamic light";
s_r_dynamic_list.generic.x = 0;
s_r_dynamic_list.generic.y = (y += 10);
s_r_dynamic_list.itemnames = yesno_names;
s_r_dynamic_list.curvalue = (r_dynamic->value != 0);
}
else
{
@ -707,7 +707,7 @@ VID_MenuInit(void)
{
Menu_AddItem(&s_opengl_menu, (void *)&s_vk_intensity_slider);
Menu_AddItem(&s_opengl_menu, (void *)&s_vk_overbrightbits_slider);
Menu_AddItem(&s_opengl_menu, (void *)&s_vk_dynamic_list);
Menu_AddItem(&s_opengl_menu, (void *)&s_r_dynamic_list);
}
else if (strcmp(vid_renderer->string, "gl1") == 0)
{

2
src/client/refresh/files/models.c
View file

@ -1680,7 +1680,7 @@ Mod_LoadLighting(byte **lightdata, int *size, const byte *mod_base, const lump_t
}
void
SetSurfaceLighting(byte *lightdata, int size, msurface_t *out, byte *styles, int lightofs)
Mod_LoadSetSurfaceLighting(byte *lightdata, int size, msurface_t *out, byte *styles, int lightofs)
{
int i;

8
src/client/refresh/gl1/gl1_image.c
View file

@ -211,7 +211,7 @@ R_TextureMode(char *string)
ri.Cvar_SetValue("r_anisotropic", 0.0);
}
const char* nolerplist = gl_nolerp_list->string;
const char* nolerplist = r_nolerp_list->string;
const char* lerplist = r_lerp_list->string;
qboolean unfiltered2D = r_2D_unfiltered->value != 0;
@ -247,7 +247,7 @@ R_TextureMode(char *string)
{
if (nolerp)
{
// this texture shouldn't be filtered at all (no gl_nolerp_list or r_2D_unfiltered case)
// this texture shouldn't be filtered at all (no r_nolerp_list or r_2D_unfiltered case)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
@ -867,9 +867,9 @@ R_LoadPic(const char *name, byte *pic, int width, int realwidth,
// *unless* the texture is on the r_lerp_list
nolerp = (r_lerp_list->string == NULL) || (strstr(r_lerp_list->string, name) == NULL);
}
else if (gl_nolerp_list != NULL && gl_nolerp_list->string != NULL)
else if (r_nolerp_list != NULL && r_nolerp_list->string != NULL)
{
nolerp = strstr(gl_nolerp_list->string, name) != NULL;
nolerp = strstr(r_nolerp_list->string, name) != NULL;
}
/* find a free image_t */

4
src/client/refresh/gl1/gl1_light.c
View file

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

16
src/client/refresh/gl1/gl1_main.c
View file

@ -104,12 +104,12 @@ cvar_t *r_customheight;
cvar_t *r_retexturing;
cvar_t *r_scale8bittextures;
cvar_t *gl_nolerp_list;
cvar_t *r_nolerp_list;
cvar_t *r_lerp_list;
cvar_t *r_2D_unfiltered;
cvar_t *r_videos_unfiltered;
cvar_t *gl1_dynamic;
cvar_t *r_dynamic;
cvar_t *r_modulate;
cvar_t *gl_nobind;
cvar_t *gl1_round_down;
@ -122,7 +122,7 @@ cvar_t *gl_finish;
cvar_t *r_clear;
cvar_t *r_cull;
cvar_t *gl_polyblend;
cvar_t *gl1_flashblend;
cvar_t *r_flashblend;
cvar_t *gl1_saturatelighting;
cvar_t *r_vsync;
cvar_t *gl_texturemode;
@ -1199,7 +1199,7 @@ R_Register(void)
gl_lightmap = ri.Cvar_Get("r_lightmap", "0", 0);
gl_shadows = ri.Cvar_Get("r_shadows", "0", CVAR_ARCHIVE);
gl1_stencilshadow = ri.Cvar_Get("gl1_stencilshadow", "0", CVAR_ARCHIVE);
gl1_dynamic = ri.Cvar_Get("gl1_dynamic", "1", 0);
r_dynamic = ri.Cvar_Get("r_dynamic", "1", 0);
gl_nobind = ri.Cvar_Get("gl_nobind", "0", 0);
gl1_round_down = ri.Cvar_Get("gl1_round_down", "1", 0);
gl1_picmip = ri.Cvar_Get("gl1_picmip", "0", 0);
@ -1211,7 +1211,7 @@ R_Register(void)
r_clear = ri.Cvar_Get("r_clear", "0", 0);
r_cull = ri.Cvar_Get("r_cull", "1", 0);
gl_polyblend = ri.Cvar_Get("gl_polyblend", "1", 0);
gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
r_flashblend = ri.Cvar_Get("r_flashblend", "0", 0);
r_fixsurfsky = ri.Cvar_Get("r_fixsurfsky", "0", CVAR_ARCHIVE);
gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
@ -1240,7 +1240,7 @@ R_Register(void)
r_scale8bittextures = ri.Cvar_Get("r_scale8bittextures", "0", CVAR_ARCHIVE);
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("r_nolerp_list", DEFAULT_NOLERP_LIST, CVAR_ARCHIVE);
r_nolerp_list = ri.Cvar_Get("r_nolerp_list", DEFAULT_NOLERP_LIST, CVAR_ARCHIVE);
/* textures that should always be filtered, even if r_2D_unfiltered or an unfiltered gl mode is used */
r_lerp_list = ri.Cvar_Get("r_lerp_list", "", CVAR_ARCHIVE);
/* don't bilerp any 2D elements */
@ -1732,13 +1732,13 @@ RI_BeginFrame(float camera_separation)
/* texturemode stuff */
if (gl_texturemode->modified || (gl_config.anisotropic && gl_anisotropic->modified)
|| gl_nolerp_list->modified || r_lerp_list->modified
|| r_nolerp_list->modified || r_lerp_list->modified
|| r_2D_unfiltered->modified || r_videos_unfiltered->modified)
{
R_TextureMode(gl_texturemode->string);
gl_texturemode->modified = false;
gl_anisotropic->modified = false;
gl_nolerp_list->modified = false;
r_nolerp_list->modified = false;
r_lerp_list->modified = false;
r_2D_unfiltered->modified = false;
r_videos_unfiltered->modified = false;

19
src/client/refresh/gl1/gl1_mesh.c
View file

@ -750,17 +750,14 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
}
}
// Apply gl1_overbrightbits to the mesh. If we don't do this they will appear slightly dimmer relative to walls.
if (gl1_overbrightbits->value)
{
for (i = 0; i < 3; ++i)
{
shadelight[i] *= gl1_overbrightbits->value;
}
}
// Apply gl1_overbrightbits to the mesh. If we don't do this they will appear slightly dimmer relative to walls.
if (gl1_overbrightbits->value)
{
for (i = 0; i < 3; ++i)
{
shadelight[i] *= gl1_overbrightbits->value;
}
}
/* ir goggles color override */
if (r_newrefdef.rdflags & RDF_IRGOGGLES && currententity->flags &

4
src/client/refresh/gl1/gl1_model.c
View file

@ -422,7 +422,7 @@ Mod_LoadFaces(model_t *loadmodel, const byte *mod_base, const lump_t *l,
lightofs = in->lightofs;
}
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, lightofs);
/* set the drawing flags */
@ -547,7 +547,7 @@ Mod_LoadQFaces(model_t *loadmodel, const byte *mod_base, const lump_t *l,
lightofs = in->lightofs;
}
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, lightofs);
/* set the drawing flags */

6
src/client/refresh/gl1/gl1_surf.c
View file

@ -300,7 +300,7 @@ R_BlendLightmaps(const model_t *currentmodel)
}
/* render dynamic lightmaps */
if (gl1_dynamic->value)
if (r_dynamic->value)
{
LM_InitBlock();
@ -485,7 +485,7 @@ R_RenderBrushPoly(entity_t *currententity, msurface_t *fa)
{
dynamic:
if (gl1_dynamic->value)
if (r_dynamic->value)
{
if (!(fa->texinfo->flags &
(SURF_SKY | SURF_TRANS33 |
@ -636,7 +636,7 @@ R_DrawInlineBModel(entity_t *currententity, const model_t *currentmodel)
msurface_t *psurf;
/* calculate dynamic lighting for bmodel */
if (!gl1_flashblend->value)
if (!r_flashblend->value)
{
dlight_t *lt;
int k;

6
src/client/refresh/gl1/header/local.h
View file

@ -181,7 +181,7 @@ extern cvar_t *r_retexturing;
extern cvar_t *r_scale8bittextures;
extern cvar_t *r_validation;
extern cvar_t *gl_nolerp_list;
extern cvar_t *r_nolerp_list;
extern cvar_t *r_lerp_list;
extern cvar_t *r_2D_unfiltered;
extern cvar_t *r_videos_unfiltered;
@ -189,7 +189,7 @@ extern cvar_t *r_videos_unfiltered;
extern cvar_t *gl_lightmap;
extern cvar_t *gl_shadows;
extern cvar_t *gl1_stencilshadow;
extern cvar_t *gl1_dynamic;
extern cvar_t *r_dynamic;
extern cvar_t *gl_nobind;
extern cvar_t *gl1_round_down;
extern cvar_t *gl1_picmip;
@ -201,7 +201,7 @@ extern cvar_t *gl_zfix;
extern cvar_t *r_clear;
extern cvar_t *r_cull;
extern cvar_t *gl1_polyblend;
extern cvar_t *gl1_flashblend;
extern cvar_t *r_flashblend;
extern cvar_t *r_modulate;
extern cvar_t *gl_drawbuffer;
extern cvar_t *r_vsync;

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

@ -87,7 +87,7 @@ GL3_TextureMode(char *string)
gl3image_t *glt;
const char* nolerplist = gl_nolerp_list->string;
const char* nolerplist = r_nolerp_list->string;
const char* lerplist = r_lerp_list->string;
qboolean unfiltered2D = r_2D_unfiltered->value != 0;
@ -95,7 +95,7 @@ GL3_TextureMode(char *string)
for (i = 0, glt = gl3textures; i < numgl3textures; i++, glt++)
{
qboolean nolerp = false;
/* r_2D_unfiltered and gl_nolerp_list allow rendering stuff unfiltered even if gl_filter_* is filtered */
/* r_2D_unfiltered and r_nolerp_list allow rendering stuff unfiltered even if gl_filter_* is filtered */
if (unfiltered2D && glt->type == it_pic)
{
// exception to that exception: stuff on the r_lerp_list
@ -123,7 +123,7 @@ GL3_TextureMode(char *string)
{
if (nolerp)
{
// this texture shouldn't be filtered at all (no gl_nolerp_list or r_2D_unfiltered case)
// this texture shouldn't be filtered at all (no r_nolerp_list or r_2D_unfiltered case)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
@ -390,9 +390,9 @@ GL3_LoadPic(char *name, byte *pic, int width, int realwidth,
// *unless* the texture is on the r_lerp_list
nolerp = (r_lerp_list->string == NULL) || (strstr(r_lerp_list->string, name) == NULL);
}
else if (gl_nolerp_list != NULL && gl_nolerp_list->string != NULL)
else if (r_nolerp_list != NULL && r_nolerp_list->string != NULL)
{
nolerp = strstr(gl_nolerp_list->string, name) != NULL;
nolerp = strstr(r_nolerp_list->string, name) != NULL;
}
/* find a free gl3image_t */
for (i = 0, image = gl3textures; i < numgl3textures; i++, image++)

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

@ -111,7 +111,7 @@ cvar_t *gl3_overbrightbits;
cvar_t *r_norefresh;
cvar_t *r_drawentities;
cvar_t *r_drawworld;
cvar_t *gl_nolerp_list;
cvar_t *r_nolerp_list;
cvar_t *r_lerp_list;
cvar_t *r_2D_unfiltered;
cvar_t *r_videos_unfiltered;
@ -236,7 +236,7 @@ GL3_Register(void)
r_validation = ri.Cvar_Get("r_validation", "0", CVAR_ARCHIVE);
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("r_nolerp_list", DEFAULT_NOLERP_LIST, CVAR_ARCHIVE);
r_nolerp_list = ri.Cvar_Get("r_nolerp_list", DEFAULT_NOLERP_LIST, CVAR_ARCHIVE);
/* textures that should always be filtered, even if r_2D_unfiltered or an unfiltered gl mode is used */
r_lerp_list = ri.Cvar_Get("r_lerp_list", "", CVAR_ARCHIVE);
/* don't bilerp any 2D elements */
@ -302,7 +302,7 @@ GL3_Register(void)
//gl_zfix = ri.Cvar_Get("gl_zfix", "0", 0);
//gl_finish = ri.Cvar_Get("gl_finish", "0", CVAR_ARCHIVE);
r_clear = ri.Cvar_Get("r_clear", "0", 0);
//gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
//r_flashblend = ri.Cvar_Get("r_flashblend", "0", 0);
//gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
gl1_texturealphamode = ri.Cvar_Get("gl1_texturealphamode", "default", CVAR_ARCHIVE);
@ -1657,7 +1657,7 @@ GL3_RenderView(refdef_t *fd)
GL3_DrawEntitiesOnList();
// kick the silly gl1_flashblend poly lights
// kick the silly r_flashblend poly lights
// GL3_RenderDlights();
GL3_DrawParticles();
@ -1917,13 +1917,13 @@ GL3_BeginFrame(float camera_separation)
/* texturemode stuff */
if (gl_texturemode->modified || (gl3config.anisotropic && gl_anisotropic->modified)
|| gl_nolerp_list->modified || r_lerp_list->modified
|| r_nolerp_list->modified || r_lerp_list->modified
|| r_2D_unfiltered->modified || r_videos_unfiltered->modified)
{
GL3_TextureMode(gl_texturemode->string);
gl_texturemode->modified = false;
gl_anisotropic->modified = false;
gl_nolerp_list->modified = false;
r_nolerp_list->modified = false;
r_lerp_list->modified = false;
r_2D_unfiltered->modified = false;
r_videos_unfiltered->modified = false;

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

@ -405,7 +405,7 @@ Mod_LoadFaces(gl3model_t *loadmodel, const byte *mod_base, const lump_t *l,
Mod_CalcSurfaceExtents(loadmodel->surfedges, loadmodel->vertexes,
loadmodel->edges, out);
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, in->lightofs);
/* set the drawing flags */
@ -513,7 +513,7 @@ Mod_LoadQFaces(gl3model_t *loadmodel, const byte *mod_base, const lump_t *l,
Mod_CalcSurfaceExtents(loadmodel->surfedges, loadmodel->vertexes,
loadmodel->edges, out);
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, in->lightofs);
/* set the drawing flags */

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

@ -522,7 +522,7 @@ extern cvar_t *r_customheight;
extern cvar_t *r_2D_unfiltered;
extern cvar_t *r_videos_unfiltered;
extern cvar_t *gl_nolerp_list;
extern cvar_t *r_nolerp_list;
extern cvar_t *r_lerp_list;
extern cvar_t *gl_nobind;
extern cvar_t *r_lockpvs;

10
src/client/refresh/gl4/gl4_image.c
View file

@ -87,7 +87,7 @@ GL4_TextureMode(char *string)
gl4image_t *glt;
const char* nolerplist = gl_nolerp_list->string;
const char* nolerplist = r_nolerp_list->string;
const char* lerplist = r_lerp_list->string;
qboolean unfiltered2D = r_2D_unfiltered->value != 0;
@ -95,7 +95,7 @@ GL4_TextureMode(char *string)
for (i = 0, glt = gl4textures; i < numgl4textures; i++, glt++)
{
qboolean nolerp = false;
/* r_2D_unfiltered and gl_nolerp_list allow rendering stuff unfiltered even if gl_filter_* is filtered */
/* r_2D_unfiltered and r_nolerp_list allow rendering stuff unfiltered even if gl_filter_* is filtered */
if (unfiltered2D && glt->type == it_pic)
{
// exception to that exception: stuff on the r_lerp_list
@ -123,7 +123,7 @@ GL4_TextureMode(char *string)
{
if (nolerp)
{
// this texture shouldn't be filtered at all (no gl_nolerp_list or r_2D_unfiltered case)
// this texture shouldn't be filtered at all (no r_nolerp_list or r_2D_unfiltered case)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
@ -390,9 +390,9 @@ GL4_LoadPic(char *name, byte *pic, int width, int realwidth,
// *unless* the texture is on the r_lerp_list
nolerp = (r_lerp_list->string == NULL) || (strstr(r_lerp_list->string, name) == NULL);
}
else if (gl_nolerp_list != NULL && gl_nolerp_list->string != NULL)
else if (r_nolerp_list != NULL && r_nolerp_list->string != NULL)
{
nolerp = strstr(gl_nolerp_list->string, name) != NULL;
nolerp = strstr(r_nolerp_list->string, name) != NULL;
}
/* find a free gl4image_t */
for (i = 0, image = gl4textures; i < numgl4textures; i++, image++)

10
src/client/refresh/gl4/gl4_main.c
View file

@ -111,7 +111,7 @@ cvar_t *gl4_overbrightbits;
cvar_t *r_norefresh;
cvar_t *r_drawentities;
cvar_t *r_drawworld;
cvar_t *gl_nolerp_list;
cvar_t *r_nolerp_list;
cvar_t *r_lerp_list;
cvar_t *r_2D_unfiltered;
cvar_t *r_videos_unfiltered;
@ -236,7 +236,7 @@ GL4_Register(void)
r_validation = ri.Cvar_Get("r_validation", "0", CVAR_ARCHIVE);
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("r_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", CVAR_ARCHIVE);
r_nolerp_list = ri.Cvar_Get("r_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", CVAR_ARCHIVE);
/* textures that should always be filtered, even if r_2D_unfiltered or an unfiltered gl mode is used */
r_lerp_list = ri.Cvar_Get("r_lerp_list", "", CVAR_ARCHIVE);
/* don't bilerp any 2D elements */
@ -302,7 +302,7 @@ GL4_Register(void)
//gl_zfix = ri.Cvar_Get("gl_zfix", "0", 0);
//gl_finish = ri.Cvar_Get("gl_finish", "0", CVAR_ARCHIVE);
r_clear = ri.Cvar_Get("r_clear", "0", 0);
//gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
//r_flashblend = ri.Cvar_Get("r_flashblend", "0", 0);
//gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
gl1_texturealphamode = ri.Cvar_Get("gl1_texturealphamode", "default", CVAR_ARCHIVE);
@ -1901,13 +1901,13 @@ GL4_BeginFrame(float camera_separation)
/* texturemode stuff */
if (gl_texturemode->modified || (gl4config.anisotropic && gl_anisotropic->modified)
|| gl_nolerp_list->modified || r_lerp_list->modified
|| r_nolerp_list->modified || r_lerp_list->modified
|| r_2D_unfiltered->modified || r_videos_unfiltered->modified)
{
GL4_TextureMode(gl_texturemode->string);
gl_texturemode->modified = false;
gl_anisotropic->modified = false;
gl_nolerp_list->modified = false;
r_nolerp_list->modified = false;
r_lerp_list->modified = false;
r_2D_unfiltered->modified = false;
r_videos_unfiltered->modified = false;

2
src/client/refresh/gl4/gl4_model.c
View file

@ -319,7 +319,7 @@ Mod_LoadFaces(gl4model_t *loadmodel, byte *mod_base, lump_t *l)
Mod_CalcSurfaceExtents(loadmodel->surfedges, loadmodel->vertexes,
loadmodel->edges, out);
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, in->lightofs);
/* set the drawing flags */

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

@ -522,7 +522,7 @@ extern cvar_t *r_customheight;
extern cvar_t *r_2D_unfiltered;
extern cvar_t *r_videos_unfiltered;
extern cvar_t *gl_nolerp_list;
extern cvar_t *r_nolerp_list;
extern cvar_t *r_lerp_list;
extern cvar_t *gl_nobind;
extern cvar_t *r_lockpvs;

2
src/client/refresh/ref_shared.h
View file

@ -343,7 +343,7 @@ extern void Mod_LoadVertexes(const char *name, mvertex_t **vertexes, int *numver
const byte *mod_base, const lump_t *l, int extra);
extern void Mod_LoadVisibility(dvis_t **vis, const byte *mod_base, const lump_t *l);
extern void Mod_LoadLighting(byte **lightdata, int *size, const byte *mod_base, const lump_t *l);
extern void SetSurfaceLighting(byte *lightdata, int size, msurface_t *out, byte *styles, int lightofs);
extern void Mod_LoadSetSurfaceLighting(byte *lightdata, int size, msurface_t *out, byte *styles, int lightofs);
extern void Mod_CalcSurfaceExtents(int *surfedges, mvertex_t *vertexes, medge_t *edges,
msurface_t *s);
extern void Mod_LoadTexinfo(const char *name, mtexinfo_t **texinfo, int *numtexinfo,

4
src/client/refresh/soft/sw_model.c
View file

@ -249,7 +249,7 @@ Mod_LoadFaces(model_t *loadmodel, const byte *mod_base, const lump_t *l,
Mod_CalcSurfaceExtents(loadmodel->surfedges, loadmodel->vertexes,
loadmodel->edges, out);
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, in->lightofs);
/* set the drawing flags flag */
@ -358,7 +358,7 @@ Mod_LoadQFaces(model_t *loadmodel, const byte *mod_base, const lump_t *l,
Mod_CalcSurfaceExtents(loadmodel->surfedges, loadmodel->vertexes,
loadmodel->edges, out);
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, in->lightofs);
if (!out->texinfo->image)

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

@ -124,10 +124,10 @@ extern cvar_t *r_validation;
extern cvar_t *r_cull;
extern cvar_t *vk_picmip;
extern cvar_t *r_palettedtexture;
extern cvar_t *vk_flashblend;
extern cvar_t *r_flashblend;
extern cvar_t *vk_finish;
extern cvar_t *vk_shadows;
extern cvar_t *vk_dynamic;
extern cvar_t *r_dynamic;
extern cvar_t *vk_msaa;
extern cvar_t *r_showtris;
extern cvar_t *r_lightmap;

4
src/client/refresh/vk/vk_light.c
View file

@ -89,7 +89,7 @@ R_RenderDlights(void)
int i;
dlight_t *l;
if (!vk_flashblend->value)
if (!r_flashblend->value)
{
return;
}
@ -151,7 +151,7 @@ R_PushDlights(void)
dlight_t *l;
int i;
if (vk_flashblend->value)
if (r_flashblend->value)
{
return;
}

8
src/client/refresh/vk/vk_main.c
View file

@ -101,7 +101,7 @@ cvar_t *vk_overbrightbits;
cvar_t *r_validation;
cvar_t *vk_picmip;
cvar_t *r_palettedtexture;
cvar_t *vk_flashblend;
cvar_t *r_flashblend;
cvar_t *vk_finish;
#if defined(__APPLE__)
cvar_t *vk_molten_fastmath;
@ -121,7 +121,7 @@ static cvar_t *vk_particle_min_size;
static cvar_t *vk_particle_max_size;
static cvar_t *vk_custom_particles;
cvar_t *vk_postprocess;
cvar_t *vk_dynamic;
cvar_t *r_dynamic;
cvar_t *vk_msaa;
cvar_t *r_showtris;
cvar_t *r_lightmap;
@ -1143,7 +1143,7 @@ R_Register(void)
r_validation = ri.Cvar_Get("r_validation", "0", CVAR_ARCHIVE);
vk_picmip = ri.Cvar_Get("vk_picmip", "0", 0);
r_palettedtexture = ri.Cvar_Get("r_palettedtexture", "0", 0);
vk_flashblend = ri.Cvar_Get("vk_flashblend", "0", 0);
r_flashblend = ri.Cvar_Get("r_flashblend", "0", 0);
vk_finish = ri.Cvar_Get("vk_finish", "0", CVAR_ARCHIVE);
r_clear = ri.Cvar_Get("r_clear", "0", CVAR_ARCHIVE);
r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
@ -1159,7 +1159,7 @@ R_Register(void)
vk_particle_max_size = ri.Cvar_Get("vk_particle_max_size", "40", CVAR_ARCHIVE);
vk_custom_particles = ri.Cvar_Get("vk_custom_particles", "1", CVAR_ARCHIVE);
vk_postprocess = ri.Cvar_Get("vk_postprocess", "1", CVAR_ARCHIVE);
vk_dynamic = ri.Cvar_Get("vk_dynamic", "1", 0);
r_dynamic = ri.Cvar_Get("r_dynamic", "1", 0);
vk_msaa = ri.Cvar_Get("r_msaa_samples", "0", CVAR_ARCHIVE);
r_showtris = ri.Cvar_Get("r_showtris", "0", 0);
r_lightmap = ri.Cvar_Get("r_lightmap", "0", 0);

4
src/client/refresh/vk/vk_model.c
View file

@ -392,7 +392,7 @@ Mod_LoadFaces(model_t *loadmodel, const byte *mod_base, const lump_t *l,
lightofs = in->lightofs;
}
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, lightofs);
/* set the drawing flags */
@ -517,7 +517,7 @@ Mod_LoadQFaces(model_t *loadmodel, const byte *mod_base, const lump_t *l,
lightofs = in->lightofs;
}
SetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
Mod_LoadSetSurfaceLighting(loadmodel->lightdata, loadmodel->numlightdata,
out, in->styles, lightofs);
/* set the drawing flags */

6
src/client/refresh/vk/vk_surf.c
View file

@ -240,7 +240,7 @@ R_RenderBrushPoly(msurface_t *fa, float *modelMatrix, float alpha, entity_t *cur
if (fa->dlightframe == r_framecount)
{
dynamic:
if (vk_dynamic->value)
if (r_dynamic->value)
{
if (!(fa->texinfo->flags & (SURF_SKY | SURF_TRANS33 | SURF_TRANS66 | SURF_WARP)))
{
@ -438,7 +438,7 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti
if (surf->dlightframe == r_framecount)
{
dynamic:
if (vk_dynamic->value)
if (r_dynamic->value)
{
if (!(surf->texinfo->flags & (SURF_SKY | SURF_TRANS33 | SURF_TRANS66 | SURF_WARP)))
{
@ -631,7 +631,7 @@ R_DrawInlineBModel(entity_t *currententity, const model_t *currentmodel, float *
float alpha = 1.f;
/* calculate dynamic lighting for bmodel */
if (!vk_flashblend->value)
if (!r_flashblend->value)
{
dlight_t *lt;
int k;

8
src/common/cvar.c
View file

@ -54,9 +54,13 @@ replacement_t replacements[] = {
{"gl_menuscale", "r_scale"},
{"gl_customheight", "r_customheight"},
{"gl_customwidth", "r_customheight"},
{"gl_dynamic", "gl1_dynamic"},
{"gl_dynamic", "r_dynamic"},
{"gl1_dynamic", "r_dynamic"},
{"vk_dynamic", "r_dynamic"},
{"gl_farsee", "r_farsee"},
{"gl_flashblend", "gl1_flashblend"},
{"gl_flashblend", "r_flashblend"},
{"gl1_flashblend", "r_flashblend"},
{"vk_flashblend", "r_flashblend"},
{"gl_lockpvs", "r_lockpvs"},
{"gl_maxfps", "vid_maxfps"},
{"gl_mode", "r_mode"},