From a6231d4db1affcaa6f9a2ff26ddee3d1a14ed37c Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 2 Aug 2025 19:13:15 +0200 Subject: [PATCH] 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 --- src/r_main.h | 5 +++++ src/r_plane.cpp | 10 +++++----- src/r_segs.cpp | 21 ++++++++++----------- src/r_things.cpp | 6 +++--- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/r_main.h b/src/r_main.h index ea2fb8f9c..db3142548 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -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); diff --git a/src/r_plane.cpp b/src/r_plane.cpp index 7fe1679b4..0e2e563ff 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -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; diff --git a/src/r_segs.cpp b/src/r_segs.cpp index b28190b92..e6e9dfb1f 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -209,11 +209,11 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 rlight->flags = static_cast(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; diff --git a/src/r_things.cpp b/src/r_things.cpp index fc01ed985..41e69e419 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -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];