clamp software lightlevels before shifting it
was a little oopsie porting this over ,after shifting we only get 32 lightlevels decided to clamp this in range aswell, just incase
This commit is contained in:
1 parent
cd9e819f11
commit
a6231d4db1
4 files changed
+23
-19
No files matched your search
@@ -201,6 +201,11 @@ extern consvar_t cv_secbright;
|
||||
|
||||
extern consvar_t cv_randomdirlight;
|
||||
|
||||
static inline INT32 R_GetSoftLightlevel(INT32 llevel)
|
||||
{
|
||||
return CLAMP(llevel, cv_secbright.value, 255) >> LIGHTSEGSHIFT;
|
||||
}
|
||||
|
||||
// Called by startup code.
|
||||
void R_Init(void);
|
||||
|
||||
|
||||
+5
-5
@@ -1059,7 +1059,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
|
||||
#else
|
||||
if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
|
||||
#endif
|
||||
light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
light = R_GetSoftLightlevel(pl->lightlevel);
|
||||
else
|
||||
light = LIGHTLEVELS-1;
|
||||
}
|
||||
@@ -1111,17 +1111,17 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
|
||||
#else
|
||||
if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
|
||||
#endif
|
||||
light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
light = R_GetSoftLightlevel(pl->lightlevel);
|
||||
else
|
||||
light = LIGHTLEVELS-1;
|
||||
}
|
||||
else if (pl->ffloor->flags & FF_FOG)
|
||||
{
|
||||
spanfunctype = SPANDRAWFUNC_FOG;
|
||||
light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
light = R_GetSoftLightlevel(pl->lightlevel);
|
||||
}
|
||||
else
|
||||
light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
light = R_GetSoftLightlevel(pl->lightlevel);
|
||||
|
||||
if (pl->ffloor->flags & FF_RIPPLE && cv_ripplewater.value)
|
||||
{
|
||||
@@ -1174,7 +1174,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
|
||||
}
|
||||
}
|
||||
else
|
||||
light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
light = R_GetSoftLightlevel(pl->lightlevel);
|
||||
}
|
||||
|
||||
ds->currentplane = pl;
|
||||
|
||||
+10
-11
@@ -209,11 +209,11 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
|
||||
rlight->flags = static_cast<ffloortype_e>(light->flags);
|
||||
|
||||
if (rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog))
|
||||
lightnum = std::max((rlight->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(rlight->lightlevel);
|
||||
else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY))
|
||||
lightnum = LIGHTLEVELS - 1;
|
||||
else
|
||||
lightnum = std::max((rlight->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(rlight->lightlevel);
|
||||
|
||||
if (rlight->extra_colormap && rlight->extra_colormap->fog)
|
||||
;
|
||||
@@ -227,7 +227,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
|
||||
{
|
||||
if ((R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == false)
|
||||
|| (frontsector->extra_colormap && frontsector->extra_colormap->fog))
|
||||
lightnum = std::max((frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
|
||||
else
|
||||
lightnum = LIGHTLEVELS - 1;
|
||||
|
||||
@@ -764,9 +764,9 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
|
||||
|
||||
// Check if the current light effects the colormap/lightlevel
|
||||
if (pfloor->flags & FF_FOG)
|
||||
rlight->lightnum = std::max((pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
rlight->lightnum = R_GetSoftLightlevel(pfloor->master->frontsector->lightlevel);
|
||||
else
|
||||
rlight->lightnum = std::max((rlight->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
rlight->lightnum = R_GetSoftLightlevel(rlight->lightlevel);
|
||||
|
||||
if (pfloor->flags & FF_FOG || rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog))
|
||||
;
|
||||
@@ -782,14 +782,13 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
|
||||
{
|
||||
// Get correct light level!
|
||||
if ((frontsector->extra_colormap && frontsector->extra_colormap->fog))
|
||||
lightnum = std::max((frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
|
||||
else if (fog)
|
||||
lightnum = std::max((pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(pfloor->master->frontsector->lightlevel);
|
||||
else if (fuzzy)
|
||||
lightnum = LIGHTLEVELS-1;
|
||||
else
|
||||
lightnum = std::max((R_FakeFlat(frontsector, &tempsec, &templight, &templight, false)
|
||||
->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(R_FakeFlat(frontsector, &tempsec, &templight, &templight, false)->lightlevel);
|
||||
|
||||
if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && frontsector->extra_colormap->fog))
|
||||
;
|
||||
@@ -1385,7 +1384,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
|
||||
for (i = 0; i < dc->numlights; i++)
|
||||
{
|
||||
INT32 lightnum;
|
||||
lightnum = std::max((dc->lightlist[i].lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(dc->lightlist[i].lightlevel);
|
||||
|
||||
if (dc->lightlist[i].extra_colormap)
|
||||
;
|
||||
@@ -2443,7 +2442,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
||||
// use different light tables
|
||||
// for horizontal / vertical / diagonal
|
||||
// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
|
||||
lightnum = std::max((frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
|
||||
|
||||
if (P_ApplyLightOffset(lightnum, frontsector))
|
||||
lightnum += curline->lightOffset;
|
||||
|
||||
+3
-3
@@ -1061,7 +1061,7 @@ static void R_SplitSprite(vissprite_t *sprite)
|
||||
|
||||
if (!(sector->lightlist[i].caster->flags & FF_NOSHADE))
|
||||
{
|
||||
INT32 lightnum = std::max((*sector->lightlist[i].lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel);
|
||||
|
||||
if (lightnum < 0)
|
||||
spritelights = scalelight[0];
|
||||
@@ -1668,7 +1668,7 @@ static void R_ProjectSprite(mobj_t *thing)
|
||||
lightnum = thing->subsector->sector->lightlevel;
|
||||
}
|
||||
|
||||
lightnum = std::max((lightnum + R_ThingLightLevel(thing)) >> LIGHTSEGSHIFT, cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(lightnum + R_ThingLightLevel(thing));
|
||||
|
||||
if (maplighting.directional && P_SectorUsesDirectionalLighting(thing->subsector->sector))
|
||||
{
|
||||
@@ -2065,7 +2065,7 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
|
||||
{
|
||||
if (sec->heightsec == -1) lightlevel = sec->lightlevel;
|
||||
|
||||
lightnum = std::max((lightlevel >> LIGHTSEGSHIFT), cv_secbright.value);
|
||||
lightnum = R_GetSoftLightlevel(lightlevel);
|
||||
|
||||
if (lightnum < 0)
|
||||
spritelights = scalelight[0];
|
||||
|
||||
Reference in new issue
Block a user