From fb8cdbb9cc0bfff8698b7d8089d0b5aca79d9ce7 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 27 Nov 2023 04:23:28 +0100 Subject: [PATCH] only do it like that in pal rendering mode --- src/hardware/hw_main.c | 64 +++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index ae285dd27..03e829010 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1157,15 +1157,27 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, { if (pfloor && (pfloor->flags & FF_FOG)) { - colormap = pfloor->master->frontsector->extra_colormap; - lightnum = pfloor->master->frontsector->lightlevel; - lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, v1x, v1y, v2x, v2y); + if (HWR_ShouldUsePaletteRendering()) + { + colormap = pfloor->master->frontsector->extra_colormap; + lightnum = pfloor->master->frontsector->lightlevel; + lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, v1x, v1y, v2x, v2y); + }else{ + lightnum = HWR_CalcWallLight(pfloor->master->frontsector->lightlevel, v1x, v1y, v2x, v2y); + colormap = pfloor->master->frontsector->extra_colormap; + } } else { - colormap = list[i].extra_colormap; - lightnum = *list[i].lightlevel; - lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, v1x, v1y, v2x, v2y); + if (HWR_ShouldUsePaletteRendering()) + { + colormap = list[i].extra_colormap; + lightnum = *list[i].lightlevel; + lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, v1x, v1y, v2x, v2y); + }else{ + lightnum = HWR_CalcWallLight(*list[i].lightlevel, v1x, v1y, v2x, v2y); + colormap = list[i].extra_colormap; + } } } @@ -1599,10 +1611,16 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom cliphigh = (float)(texturehpeg + (gr_curline->flength*FRACUNIT)); } - colormap = gr_frontsector->extra_colormap; - lightnum = gr_frontsector->lightlevel; - lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); - + if (HWR_ShouldUsePaletteRendering()) + { + colormap = gr_frontsector->extra_colormap; + lightnum = gr_frontsector->lightlevel; + lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); + }else{ + lightnum = HWR_CalcWallLight(gr_frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); + colormap = gr_frontsector->extra_colormap; + } + if (gr_frontsector) Surf.PolyColor.s.alpha = 255; @@ -2456,10 +2474,16 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom blendmode = PF_Fog|PF_NoTexture; - colormap = rover->master->frontsector->extra_colormap; - lightnum = rover->master->frontsector->lightlevel; - lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); - + if (HWR_ShouldUsePaletteRendering()) + { + colormap = rover->master->frontsector->extra_colormap; + lightnum = rover->master->frontsector->lightlevel; + lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); + }else{ + lightnum = HWR_CalcWallLight(rover->master->frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); + colormap = rover->master->frontsector->extra_colormap; + } + Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap); if (gr_frontsector->numlights) @@ -2601,9 +2625,15 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom blendmode = PF_Fog|PF_NoTexture; - colormap = rover->master->frontsector->extra_colormap; - lightnum = rover->master->frontsector->lightlevel; - lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); + if (HWR_ShouldUsePaletteRendering()) + { + colormap = rover->master->frontsector->extra_colormap; + lightnum = rover->master->frontsector->lightlevel; + lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); + }else{ + lightnum = HWR_CalcWallLight(rover->master->frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); + colormap = rover->master->frontsector->extra_colormap; + } Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);