Revert software renderer parts of "- sprite lightlevel cleanup and fi…

…xes." This code had some issues which are not easily fixed, so it's better to just undo it all.
drfrag666 · Jun 6, 2024 · 72dcfeb · 72dcfeb
1 parent d0b3278
commit 72dcfeb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/rendering/swrenderer/scene/r_opaque_pass.cpp b/src/rendering/swrenderer/scene/r_opaque_pass.cpp
@@ -606,7 +606,8 @@ namespace swrenderer
 		}
 
 		Add3DFloorPlanes(sub, frontsector, basecolormap, foggy, adjusted_ceilinglightlevel, adjusted_floorlightlevel);
-		AddSprites(sub->sector, frontsector, FakeSide, foggy);
+		auto nc = !!(frontsector->Level->flags3 & LEVEL3_NOCOLOREDSPRITELIGHTING);
+		AddSprites(sub->sector, frontsector->GetTexture(sector_t::ceiling) == skyflatnum ? ceilinglightlevel : floorlightlevel, FakeSide, foggy, GetSpriteColorTable(frontsector->Colormap, frontsector->SpecialColors[sector_t::sprites], nc));
 
 		// [RH] Add particles
 		if ((unsigned int)(sub->Index()) < Level->subsectors.Size())
@@ -874,7 +875,7 @@ namespace swrenderer
 		fillshort(ceilingclip, viewwidth, 0);
 	}
 
-	void RenderOpaquePass::AddSprites(sector_t *sec, sector_t* frontsector, WaterFakeSide fakeside, bool foggy)
+	void RenderOpaquePass::AddSprites(sector_t *sec, int lightlevel, WaterFakeSide fakeside, bool foggy, FDynamicColormap *basecolormap)
 	{
 		// BSP is traversed by subsector.
 		// A sector might have been split into several
@@ -940,22 +941,23 @@ namespace swrenderer
 				}
 				else if (GetThingSprite(thing, sprite))
 				{
-					int thinglightlevel;
+					FDynamicColormap *thingColormap = basecolormap;
+					int thinglightlevel = lightlevel;
 					if (sec->sectornum != thing->Sector->sectornum)	// compare sectornums to account for R_FakeFlat copies.
 					{
-						frontsector = thing->Sector;
+						thinglightlevel = thing->Sector->GetTexture(sector_t::ceiling) == skyflatnum ? thing->Sector->GetCeilingLight() : thing->Sector->GetFloorLight();
+						auto nc = !!(thing->Level->flags3 & LEVEL3_NOCOLOREDSPRITELIGHTING);
+						thingColormap = GetSpriteColorTable(thing->Sector->Colormap, thing->Sector->SpecialColors[sector_t::sprites], nc);					
 					}
-					auto nc = !!(thing->Level->flags3 & LEVEL3_NOCOLOREDSPRITELIGHTING);
-					FDynamicColormap* thingColormap = GetSpriteColorTable(frontsector->Colormap, frontsector->SpecialColors[sector_t::sprites], nc);
-
-					// per-sprite lightlevel and fog do not mix well in the software renderer.
-					if (!foggy)
-					{
-						thinglightlevel = clamp(thing->GetLightLevel(frontsector), 0, 255);
-					}
-					else
+					if (thing->LightLevel > -1)
 					{
-						thinglightlevel = clamp<int>(frontsector->lightlevel, 0, 255);
+						thinglightlevel = thing->LightLevel;
+
+						if (thing->flags8 & MF8_ADDLIGHTLEVEL)
+						{
+							thinglightlevel += thing->Sector->GetTexture(sector_t::ceiling) == skyflatnum ? thing->Sector->GetCeilingLight() : thing->Sector->GetFloorLight();
+							thinglightlevel = clamp(thinglightlevel, 0, 255);
+						}
 					}
 					if ((sprite.renderflags & RF_SPRITETYPEMASK) == RF_WALLSPRITE)
 					{

diff --git a/src/rendering/swrenderer/scene/r_opaque_pass.h b/src/rendering/swrenderer/scene/r_opaque_pass.h
@@ -89,7 +89,7 @@ namespace swrenderer
 		void FakeDrawLoop(subsector_t *sub, sector_t *frontsector, VisiblePlane *floorplane, VisiblePlane *ceilingplane, Fake3DOpaque opaque3dfloor);
 		void Add3DFloorLine(seg_t *line, sector_t *frontsector);
 
-		void AddSprites(sector_t *sec, sector_t* frontsector, WaterFakeSide fakeside, bool foggy);
+		void AddSprites(sector_t *sec, int lightlevel, WaterFakeSide fakeside, bool foggy, FDynamicColormap *basecolormap);
 		bool IsPotentiallyVisible(AActor *thing);
 		bool GetThingSprite(AActor *thing, ThingSprite &sprite);