- move visibility calculation to LightVisibility

src/swrenderer/line/r_line.cpp

@@ -790,9 +790,8 @@ namespace swrenderer
 			if (cameraLight->FixedColormap() == nullptr && cameraLight->FixedLightLevel() < 0)
 			{
 				wallshade = LightVisibility::LightLevelToShade(mLineSegment->sidedef->GetLightLevel(foggy, mFrontSector->lightlevel) + LightVisibility::ActualExtraLight(foggy, Thread->Viewport.get()), foggy);
-				double GlobVis = Thread->Light->WallGlobVis(foggy);
+				rw_lightleft = float(Thread->Light->WallVis(WallC.sz1, foggy));
-				rw_lightleft = float(GlobVis / WallC.sz1);
+				rw_lightstep = float((Thread->Light->WallVis(WallC.sz2, foggy) - rw_lightleft) / (WallC.sx2 - WallC.sx1));
-				rw_lightstep = float((GlobVis / WallC.sz2 - rw_lightleft) / (WallC.sx2 - WallC.sx1));
 			}
 			else
 			{

src/swrenderer/plane/r_flatplane.cpp

@@ -137,9 +137,7 @@ namespace swrenderer
 		basecolormap = colormap;
 
 		// [RH] set foggy flag
-		bool foggy = (level.fadeto || basecolormap->Fade || (level.flags & LEVEL_HASFADETABLE));
+		foggy = (level.fadeto || basecolormap->Fade || (level.flags & LEVEL_HASFADETABLE));
-
-		GlobVis = Thread->Light->FlatPlaneGlobVis(foggy) / planeheight;
 
 		CameraLight *cameraLight = CameraLight::Instance();
 		if (cameraLight->FixedLightLevel() >= 0)
@@ -202,7 +200,7 @@ namespace swrenderer
 		if (plane_shade)
 		{
 			// Determine lighting based on the span's distance from the viewer.
-			drawerargs.SetLight(basecolormap, (float)(GlobVis * fabs(viewport->CenterY - y)), planeshade);
+			drawerargs.SetLight(basecolormap, (float)Thread->Light->FlatPlaneVis(y, planeheight, foggy, viewport), planeshade);
 		}
 
 		if (r_dynlights)

src/swrenderer/plane/r_flatplane.h

@@ -45,7 +45,7 @@ namespace swrenderer
 		double planeheight;
 		bool plane_shade;
 		int planeshade;
-		double GlobVis;
+		bool foggy;
 		FDynamicColormap *basecolormap;
 		double pviewx, pviewy;
 		double xstepscale, ystepscale;

src/swrenderer/scene/r_light.h

@@ -88,9 +88,9 @@ namespace swrenderer
 
 		// The vis value to pass into the GETPALOOKUP or LIGHTSCALE macros
 		double WallVis(double screenZ, bool foggy) const { return WallGlobVis(foggy) / screenZ; }
-		double SpriteVis(double screenZ, bool foggy) const { return SpriteGlobVis(foggy) / screenZ; }
+		double SpriteVis(double screenZ, bool foggy) const { return SpriteGlobVis(foggy) / MAX(screenZ, MINZ); }
 		double ParticleVis(double screenZ, bool foggy) const { return ParticleGlobVis(foggy) / screenZ; }
-		double FlatPlaneVis(int screenY, double planeZ, bool foggy, RenderViewport *viewport) const { return FlatPlaneGlobVis(foggy) / fabs(planeZ - viewport->viewpoint.Pos.Z) * fabs(viewport->CenterY - screenY); }
+		double FlatPlaneVis(int screenY, double planeheight, bool foggy, RenderViewport *viewport) const { return FlatPlaneGlobVis(foggy) / planeheight * fabs(viewport->CenterY - screenY); }
 
 		static fixed_t LightLevelToShade(int lightlevel, bool foggy);
 		static int ActualExtraLight(bool fog, RenderViewport *viewport) { return fog ? 0 : viewport->viewpoint.extralight << 4; }

src/swrenderer/scene/r_translucent_pass.h

@@ -23,8 +23,6 @@
 
 #include "tarray.h"
 
-#define MINZ double((2048*4) / double(1 << 20))
-
 struct particle_t;
 struct FVoxel;
 

src/swrenderer/things/r_particle.cpp

@@ -220,7 +220,7 @@ namespace swrenderer
 		vis->floorclip = 0;
 		vis->foggy = foggy;
 
-		vis->Light.SetColormap(tiz * thread->Light->ParticleGlobVis(foggy), shade, map, particle->bright != 0, false, false);
+		vis->Light.SetColormap(thread->Light->ParticleVis(tz, foggy), shade, map, particle->bright != 0, false, false);
 
 		thread->SpriteList->Push(vis);
 	}

src/swrenderer/things/r_sprite.cpp

@@ -300,7 +300,7 @@ namespace swrenderer
 			vis->dynlightcolor = 0;
 		}
 
-		vis->Light.SetColormap(thread->Light->SpriteGlobVis(foggy) / MAX(tz, MINZ), spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack);
+		vis->Light.SetColormap(thread->Light->SpriteVis(tz, foggy), spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack);
 
 		thread->SpriteList->Push(vis);
 	}

src/swrenderer/things/r_visiblesprite.cpp

@@ -165,7 +165,7 @@ namespace swrenderer
 
 				int spriteshade = LightVisibility::LightLevelToShade(sec->lightlevel + LightVisibility::ActualExtraLight(spr->foggy, thread->Viewport.get()), foggy);
 
-				Light.SetColormap(thread->Light->SpriteGlobVis(foggy) / MAX(MINZ, (double)spr->depth), spriteshade, mybasecolormap, isFullBright, invertcolormap, fadeToBlack);
+				Light.SetColormap(thread->Light->SpriteVis(spr->depth, foggy), spriteshade, mybasecolormap, isFullBright, invertcolormap, fadeToBlack);
 			}
 		}
 

src/swrenderer/things/r_voxel.cpp

@@ -188,7 +188,7 @@ namespace swrenderer
 		bool fullbright = !vis->foggy && ((renderflags & RF_FULLBRIGHT) || (thing->flags5 & MF5_BRIGHT));
 		bool fadeToBlack = (vis->RenderStyle.Flags & STYLEF_FadeToBlack) != 0;
 
-		vis->Light.SetColormap(thread->Light->SpriteGlobVis(foggy) / MAX(tz, MINZ), spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack);
+		vis->Light.SetColormap(thread->Light->SpriteVis(tz, foggy), spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack);
 
 		// Fake a voxel drawing to find its extents..
 		SpriteDrawerArgs drawerargs;

src/swrenderer/things/r_wallsprite.cpp

@@ -141,7 +141,7 @@ namespace swrenderer
 		vis->wallc = wallc;
 		vis->foggy = foggy;
 
-		vis->Light.SetColormap(thread->Light->SpriteGlobVis(foggy) / MAX(tz, MINZ), spriteshade, basecolormap, false, false, false);
+		vis->Light.SetColormap(thread->Light->SpriteVis(tz, foggy), spriteshade, basecolormap, false, false, false);
 
 		thread->SpriteList->Push(vis);
 	}

src/swrenderer/viewport/r_viewport.h

@@ -7,6 +7,8 @@
 #include "r_defs.h"
 #include "polyrenderer/math/gpu_types.h"
 
+#define MINZ double((2048*4) / double(1 << 20))
+
 namespace swrenderer
 {
 	class RenderThread;