diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 2e64cc7b2..aad0cf583 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -228,7 +228,6 @@ consvar_t cv_glslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NU consvar_t cv_glshaders = {"gr_shaders", "On", CV_CALL|CV_SAVE, glshaders_cons_t, CV_glshaders_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_gllightdither = {"gr_lightdithering", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_gllightdithering_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_glsecbright = {"secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glfiltermode = {"gr_filtermode", "Nearest", CV_CALL|CV_SAVE, glfiltermode_cons_t, CV_filtermode_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glanisotropicmode = {"gr_anisotropicmode", "1", CV_CALL|CV_SAVE, glanisotropicmode_cons_t, CV_anisotropic_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -419,7 +418,7 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col fade_color.rgba = (colormap != NULL) ? (UINT32)colormap->fadergba : GL_DEFAULTFOG; // Clamp the light level, since it can sometimes go out of the 0-255 range from animations - light_level = CLAMP(SOFTLIGHT(light_level), cv_glsecbright.value, 255); + light_level = CLAMP(SOFTLIGHT(light_level), cv_secbright.value, 255); // Crappy backup coloring if you can't do shaders if (!HWR_UseShader()) @@ -5856,7 +5855,6 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_glshaders); CV_RegisterVar(&cv_gllightdither); - CV_RegisterVar(&cv_glsecbright); CV_RegisterVar(&cv_glfiltermode); CV_RegisterVar(&cv_glanisotropicmode); diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 34e581ff5..669fb36d4 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -202,7 +202,6 @@ extern consvar_t cv_glslopecontrast; extern consvar_t cv_glshaders; extern consvar_t cv_gllightdither; -extern consvar_t cv_glsecbright; extern consvar_t cv_glfiltermode; extern consvar_t cv_glanisotropicmode; diff --git a/src/r_main.cpp b/src/r_main.cpp index 155711a36..656bc78d8 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -151,6 +151,7 @@ static CV_PossibleValue_t fov_cons_t[] = {{MINFOV*FRACUNIT, "MIN"}, {MAXFOV*FRAC static CV_PossibleValue_t translucenthud_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}}; static CV_PossibleValue_t maxportals_cons_t[] = {{0, "MIN"}, {12, "MAX"}, {0, NULL}}; // lmao rendering 32 portals, you're a card static CV_PossibleValue_t homremoval_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Flash"}, {0, NULL}}; +static CV_PossibleValue_t secbright_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}}; static void R_SetFov(fixed_t playerfov); @@ -201,6 +202,8 @@ consvar_t cv_ripplewater = {"waterripples", "On", CV_SAVE, CV_OnOff, NULL, 0 // Okay, whoever said homremoval causes a performance hit should be shot. consvar_t cv_homremoval = {"homremoval", "Yes", CV_SAVE, homremoval_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_secbright = {"r_secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_maxportals = {"maxportals", "2", CV_SAVE, maxportals_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // cap fov, fov too high tears software apart. @@ -1558,6 +1561,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_skybox); CV_RegisterVar(&cv_ffloorclip); CV_RegisterVar(&cv_spriteclip); + CV_RegisterVar(&cv_secbright); CV_RegisterVar(&cv_softcyancut); for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) diff --git a/src/r_main.h b/src/r_main.h index 82a0205d3..ea2fb8f9c 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -197,6 +197,7 @@ extern consvar_t cv_tailspickup; extern consvar_t cv_maxinterpdist; extern consvar_t cv_playerfade; extern consvar_t cv_ripplewater; +extern consvar_t cv_secbright; extern consvar_t cv_randomdirlight; diff --git a/src/r_plane.cpp b/src/r_plane.cpp index 499e302ac..7fe1679b4 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 = (pl->lightlevel >> LIGHTSEGSHIFT); + light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); else light = LIGHTLEVELS-1; } @@ -1111,16 +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 = (pl->lightlevel >> LIGHTSEGSHIFT); + light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); else light = LIGHTLEVELS-1; } else if (pl->ffloor->flags & FF_FOG) { spanfunctype = SPANDRAWFUNC_FOG; - light = (pl->lightlevel >> LIGHTSEGSHIFT); + light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); } - else light = (pl->lightlevel >> LIGHTSEGSHIFT); + else + light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (pl->ffloor->flags & FF_RIPPLE && cv_ripplewater.value) { @@ -1172,7 +1173,8 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle } } } - else light = (pl->lightlevel >> LIGHTSEGSHIFT); + else + light = std::max((pl->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); } ds->currentplane = pl; diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 848483c97..b28190b92 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 = (rlight->lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((rlight->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY)) lightnum = LIGHTLEVELS - 1; else - lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((rlight->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); 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 = (frontsector->lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); 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 = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT); + rlight->lightnum = std::max((pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); else - rlight->lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT); + rlight->lightnum = std::max((rlight->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (pfloor->flags & FF_FOG || rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog)) ; @@ -782,14 +782,14 @@ 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 = (frontsector->lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); else if (fog) - lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); else if (fuzzy) lightnum = LIGHTLEVELS-1; else - lightnum = R_FakeFlat(frontsector, &tempsec, &templight, &templight, false) - ->lightlevel >> LIGHTSEGSHIFT; + lightnum = std::max((R_FakeFlat(frontsector, &tempsec, &templight, &templight, false) + ->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && frontsector->extra_colormap->fog)) ; @@ -1385,7 +1385,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc) for (i = 0; i < dc->numlights; i++) { INT32 lightnum; - lightnum = (dc->lightlist[i].lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((dc->lightlist[i].lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (dc->lightlist[i].extra_colormap) ; @@ -2443,7 +2443,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) // use different light tables // for horizontal / vertical / diagonal // OPTIMIZE: get rid of LIGHTSEGSHIFT globally - lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((frontsector->lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; diff --git a/src/r_things.cpp b/src/r_things.cpp index 59c89b1d3..fc01ed985 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 = (*sector->lightlist[i].lightlevel >> LIGHTSEGSHIFT); + INT32 lightnum = std::max((*sector->lightlist[i].lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (lightnum < 0) spritelights = scalelight[0]; @@ -1668,7 +1668,7 @@ static void R_ProjectSprite(mobj_t *thing) lightnum = thing->subsector->sector->lightlevel; } - lightnum = (lightnum + R_ThingLightLevel(thing)) >> LIGHTSEGSHIFT; + lightnum = std::max((lightnum + R_ThingLightLevel(thing)) >> LIGHTSEGSHIFT, cv_secbright.value); 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 = (lightlevel >> LIGHTSEGSHIFT); + lightnum = std::max((lightlevel >> LIGHTSEGSHIFT), cv_secbright.value); if (lightnum < 0) spritelights = scalelight[0];