eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fix r_dynamic.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5699 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-06-01 01:30:31 +00:00
parent 62a4572f23
commit f688882d3e
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
engine/client/r_surf.c
View file

@ -57,6 +57,8 @@ extern cvar_t r_stainfadeammount;
extern cvar_t r_lightmap_nearest; extern cvar_t r_lightmap_nearest;
extern cvar_t r_lightmap_format; extern cvar_t r_lightmap_format;
extern int r_dlightframecount;
static void Surf_FreeLightmap(lightmapinfo_t *lm); static void Surf_FreeLightmap(lightmapinfo_t *lm);
static int lightmap_shift; static int lightmap_shift;
@ -691,7 +693,7 @@ static void Surf_BuildDeluxMap (model_t *wmodel, msurface_t *surf, qbyte *dest,
store: store:
// add all the dynamic lights // add all the dynamic lights
// if (surf->dlightframe == r_framecount) // if (surf->dlightframe == r_dlightframecount)
// GLR_AddDynamicLightNorms (surf); // GLR_AddDynamicLightNorms (surf);
// bound, invert, and shift // bound, invert, and shift
@ -1361,7 +1363,7 @@ static void Surf_BuildLightMap (model_t *currentmodel, msurface_t *surf, int map
qbyte *src = surf->samples; qbyte *src = surf->samples;
shift += 7; // increase to base value shift += 7; // increase to base value
surf->cached_dlight = (surf->dlightframe == r_framecount); surf->cached_dlight = (surf->dlightframe == r_dlightframecount);
if (size > maxblocksize) if (size > maxblocksize)
{ //fixme: fill in? { //fixme: fill in?
@ -1546,7 +1548,7 @@ static void Surf_BuildLightMap (model_t *currentmodel, msurface_t *surf, int map
} }
// add all the dynamic lights // add all the dynamic lights
if (surf->dlightframe == r_framecount) if (surf->dlightframe == r_dlightframecount)
Surf_AddDynamicLights_RGB (surf); Surf_AddDynamicLights_RGB (surf);
Surf_StoreLightmap_RGB(dest, blocklights, smax, tmax, shift, stainsrc, lm); Surf_StoreLightmap_RGB(dest, blocklights, smax, tmax, shift, stainsrc, lm);
@ -1648,7 +1650,7 @@ static void Surf_BuildLightMap (model_t *currentmodel, msurface_t *surf, int map
} }
} }
// add all the dynamic lights // add all the dynamic lights
if (surf->dlightframe == r_framecount) if (surf->dlightframe == r_dlightframecount)
Surf_AddDynamicLights_Lum (surf); Surf_AddDynamicLights_Lum (surf);
} }
@ -1988,7 +1990,7 @@ void Surf_RenderDynamicLightmaps (msurface_t *fa)
goto dynamic; goto dynamic;
} }
if (fa->dlightframe == r_framecount // dynamic this frame if (fa->dlightframe == r_dlightframecount // dynamic this frame
|| fa->cached_dlight) // dynamic previously || fa->cached_dlight) // dynamic previously
{ {
RSpeedLocals(); RSpeedLocals();
@ -2057,7 +2059,7 @@ void Surf_RenderAmbientLightmaps (msurface_t *fa, int ambient)
if (fa->cached_light[0] != ambient || fa->cached_colour[0] != 0xff) if (fa->cached_light[0] != ambient || fa->cached_colour[0] != 0xff)
goto dynamic; goto dynamic;
if (fa->dlightframe == r_framecount // dynamic this frame if (fa->dlightframe == r_dlightframecount // dynamic this frame
|| fa->cached_dlight) // dynamic previously || fa->cached_dlight) // dynamic previously
{ {
RSpeedLocals(); RSpeedLocals();

2
engine/gl/gl_rlight.c
View file

@ -750,7 +750,7 @@ void R_PushDlights (void)
{ {
if (!l->radius || !(l->flags & LFLAG_LIGHTMAP)) if (!l->radius || !(l->flags & LFLAG_LIGHTMAP))
continue; continue;
currentmodel->funcs.MarkLights( l, 1<<i, currentmodel->nodes ); currentmodel->funcs.MarkLights( l, (dlightbitmask_t)1u<<i, currentmodel->nodes );
} }
} }