qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[renderer] Fix some non-static linking issues

Browse source 
Well, hopefully I'll get the root cause sorted eventually. I really hate
globals.
This commit is contained in:
Bill Currie 2022-03-09 06:55:31 +09:00
parent 1fef0e50e0
commit 5c8f3ec3ac
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/video/renderer/r_fog.c
View file

@ -68,10 +68,10 @@ Fog_Update (float density, float red, float green, float blue, float time)
//save previous settings for fade
if (time > 0) {
//check for a fade in progress
if (fade_done > vr_data.realtime) {
if (fade_done > r_data->realtime) {
float f;
f = (fade_done - vr_data.realtime) / fade_time;
f = (fade_done - r_data->realtime) / fade_time;
old_density = f * old_density + (1.0 - f) * fog_density;
old_red = f * old_red + (1.0 - f) * fog_red;
old_green = f * old_green + (1.0 - f) * fog_green;
@ -89,7 +89,7 @@ Fog_Update (float density, float red, float green, float blue, float time)
fog_green = green;
fog_blue = blue;
fade_time = time;
fade_done = vr_data.realtime + time;
fade_done = r_data->realtime + time;
}
/*
@ -189,8 +189,8 @@ Fog_GetColor (quat_t fogcolor)
float f;
int i;
if (fade_done > vr_data.realtime) {
f = (fade_done - vr_data.realtime) / fade_time;
if (fade_done > r_data->realtime) {
f = (fade_done - r_data->realtime) / fade_time;
fogcolor[0] = f * old_red + (1.0 - f) * fog_red;
fogcolor[1] = f * old_green + (1.0 - f) * fog_green;
fogcolor[2] = f * old_blue + (1.0 - f) * fog_blue;
@ -218,8 +218,8 @@ Fog_GetDensity (void)
{
float f;
if (fade_done > vr_data.realtime) {
f = (fade_done - vr_data.realtime) / fade_time;
if (fade_done > r_data->realtime) {
f = (fade_done - r_data->realtime) / fade_time;
return f * old_density + (1.0 - f) * fog_density;
} else {
return fog_density;

2
libs/video/renderer/r_screen.c
View file

@ -178,7 +178,7 @@ SCR_UpdateScreen (transform_t *camera, double realtime, SCR_Func *scr_funcs)
r_funcs->begin_frame ();
r_funcs->render_view ();
r_funcs->set_2d();
view_draw (vr_data.scr_view);
view_draw (r_data->scr_view);
while (*scr_funcs) {
(*scr_funcs)();
scr_funcs++;