qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-12 06:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

better fix for the dlights problem (will prevent similar problems in the

Browse source 
future)
This commit is contained in:
Bill Currie 2001-05-20 06:23:46 +00:00
parent 88302bd5f0
commit 44943e78de
9 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/render.h
View file

@ -185,7 +185,7 @@ void R_ClearEnts (void);
struct entity_s **R_NewEntity (void); struct entity_s **R_NewEntity (void);
dlight_t *R_AllocDlight (int key); dlight_t *R_AllocDlight (int key);
void R_DecayLights (void); void R_DecayLights (double frametime);
void R_ClearDlights (void); void R_ClearDlights (void);
#endif // __render_h #endif // __render_h

1
nq/source/gl_screen.c
View file

@ -884,7 +884,6 @@ SCR_UpdateScreen (double realtime)
if (block_drawing) if (block_drawing)
return; return;
r_frametime = min (realtime - r_realtime, 5); // bound to 0.2 fps
r_realtime = realtime; r_realtime = realtime;
vid.numpages = 2 + gl_triplebuffer->int_val; vid.numpages = 2 + gl_triplebuffer->int_val;

2
nq/source/host.c
View file

@ -713,7 +713,7 @@ _Host_Frame (float time)
// update audio // update audio
if (cls.signon == SIGNONS) { if (cls.signon == SIGNONS) {
S_Update (r_origin, vpn, vright, vup); S_Update (r_origin, vpn, vright, vup);
R_DecayLights (); R_DecayLights (host_frametime);
} else } else
S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin); S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin);

5
nq/source/r_main.c
View file

@ -3,7 +3,6 @@
#include "r_local.h" #include "r_local.h"
double r_realtime; double r_realtime;
double r_frametime;
dlight_t r_dlights[MAX_DLIGHTS]; dlight_t r_dlights[MAX_DLIGHTS];
dlight_t * dlight_t *
@ -42,7 +41,7 @@ R_AllocDlight (int key)
} }
void void
R_DecayLights (void) R_DecayLights (double frametime)
{ {
int i; int i;
dlight_t *dl; dlight_t *dl;
@ -52,7 +51,7 @@ R_DecayLights (void)
if (dl->die < r_realtime || !dl->radius) if (dl->die < r_realtime || !dl->radius)
continue; continue;
dl->radius -= r_frametime * dl->decay; dl->radius -= frametime * dl->decay;
if (dl->radius < 0) if (dl->radius < 0)
dl->radius = 0; dl->radius = 0;
} }

1
nq/source/screen.c
View file

@ -893,7 +893,6 @@ SCR_UpdateScreen (double realtime)
} }
#endif #endif
r_frametime = min (realtime - r_realtime, 5); // bound to 0.2 fps
r_realtime = realtime; r_realtime = realtime;
scr_copytop = 0; scr_copytop = 0;

2
qw/source/cl_main.c
View file

@ -1488,7 +1488,7 @@ Host_Frame (float time)
// update audio // update audio
if (cls.state == ca_active) { if (cls.state == ca_active) {
S_Update (r_origin, vpn, vright, vup); S_Update (r_origin, vpn, vright, vup);
R_DecayLights (); R_DecayLights (host_frametime);
} else } else
S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin); S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin);

1
qw/source/gl_screen.c
View file

@ -882,7 +882,6 @@ SCR_UpdateScreen (double realtime)
if (block_drawing) if (block_drawing)
return; return;
r_frametime = min (realtime - r_realtime, 5); // bound to 0.2 fps
r_realtime = realtime; r_realtime = realtime;
vid.numpages = 2 + gl_triplebuffer->int_val; vid.numpages = 2 + gl_triplebuffer->int_val;

5
qw/source/r_main.c
View file

@ -3,7 +3,6 @@
#include "r_local.h" #include "r_local.h"
double r_realtime; double r_realtime;
double r_frametime;
dlight_t r_dlights[MAX_DLIGHTS]; dlight_t r_dlights[MAX_DLIGHTS];
dlight_t * dlight_t *
@ -42,7 +41,7 @@ R_AllocDlight (int key)
} }
void void
R_DecayLights (void) R_DecayLights (double frametime)
{ {
int i; int i;
dlight_t *dl; dlight_t *dl;
@ -52,7 +51,7 @@ R_DecayLights (void)
if (dl->die < r_realtime || !dl->radius) if (dl->die < r_realtime || !dl->radius)
continue; continue;
dl->radius -= r_frametime * dl->decay; dl->radius -= frametime * dl->decay;
if (dl->radius < 0) if (dl->radius < 0)
dl->radius = 0; dl->radius = 0;
} }

1
qw/source/screen.c
View file

@ -892,7 +892,6 @@ SCR_UpdateScreen (double realtime)
} }
#endif #endif
r_frametime = min (realtime - r_realtime, 5); // bound to 0.2 fps
r_realtime = realtime; r_realtime = realtime;
scr_copytop = 0; scr_copytop = 0;