diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index b7008a0a7..ce1314020 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -1885,28 +1885,38 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom //Hurdler: 3d-floors test if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors)) { - ffloor_t *rover; fixed_t highcut = 0, lowcut = 0; fixed_t lowcutslope = 0, highcutslope = 0; - // Used for height comparisons and etc across FOFs and slopes - fixed_t high1, highslope1, low1, lowslope1; - fixed_t high2, highslope2, low2, lowslope2; - - INT32 texnum; - lowcut = std::max(worldbottom, worldlow); highcut = std::min(worldtop, worldhigh); lowcutslope = std::max(worldbottomslope, worldlowslope); highcutslope = std::min(worldtopslope, worldhighslope); - if (gl_backsector->ffloors) + auto process_ffloors = [&](boolean backsec) { - for (rover = gl_backsector->ffloors; rover; rover = rover->next) + ffloor_t *rover; + INT32 texnum; + + // Used for height comparisons and etc across FOFs and slopes + fixed_t high1, highslope1, low1, lowslope1; + fixed_t high2, highslope2, low2, lowslope2; + + // i suck at naming stuff lul + sector_t* main_sector = backsec ? gl_backsector : gl_frontsector; + sector_t* other_sector = backsec ? gl_frontsector : gl_backsector; + + for (rover = main_sector->ffloors; rover; rover = rover->next) { const ffloortype_e roverflags = rover->flags; - if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || (roverflags & FF_INVERTSIDES)) + if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES)) + continue; + + if (backsec && (roverflags & FF_INVERTSIDES)) + continue; + + if (!backsec && !(roverflags & FF_ALLSIDES)) continue; SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) @@ -1916,7 +1926,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom continue; ffloor_t * r2; - for (r2 = gl_frontsector->ffloors; r2; r2 = r2->next) + for (r2 = other_sector->ffloors; r2; r2 = r2->next) { if (r2->master == rover->master) // Skip if same control line. break; @@ -1954,14 +1964,14 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (r2) continue; - side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector); + const side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, main_sector); boolean do_texture_skew; boolean dont_peg_bottom; if (rover->master->flags & ML_TFERLINE) { - line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector); + const line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, main_sector); do_texture_skew = newline->flags & ML_DONTPEGTOP; dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM; } @@ -1984,6 +1994,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom h = highcut; hS = highcutslope; } + if (l <= lowcut && lS <= lowcutslope) { l = lowcut; @@ -2058,8 +2069,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap); - if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); + if (other_sector->numlights) + HWR_SplitWall(other_sector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); else HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap); } @@ -2073,8 +2084,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255); } - if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); + if (other_sector->numlights) + HWR_SplitWall(other_sector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); else { if (blendmode != PF_Masked) @@ -2084,192 +2095,16 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom } } } + }; + + if (gl_backsector->ffloors) + { + process_ffloors(true); } if (gl_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think? { - for (rover = gl_frontsector->ffloors; rover; rover = rover->next) - { - const ffloortype_e roverflags = rover->flags; - - if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || !(roverflags & FF_ALLSIDES)) - continue; - - SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) - SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight) - - if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope)) - continue; - - ffloor_t * r2; - for (r2 = gl_backsector->ffloors; r2; r2 = r2->next) - { - if (r2->master == rover->master) // Skip if same control line. - break; - - const ffloortype_e r2flags = r2->flags; - - if (!(r2flags & FF_EXISTS) || !(r2flags & FF_RENDERSIDES)) - continue; - - if (rover->flags & FF_EXTRA) - { - if (!(r2flags & FF_CUTEXTRA)) - continue; - - if (r2flags & FF_EXTRA && (r2flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG))) - continue; - } - else - { - if (!(r2flags & FF_CUTSOLIDS)) - continue; - } - - SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight) - SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight) - - if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope)) - continue; - if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2)) - continue; - - break; - } - - if (r2) - continue; - - side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector); - - boolean do_texture_skew; - boolean dont_peg_bottom; - - if (rover->master->flags & ML_TFERLINE) - { - line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector); - do_texture_skew = newline->flags & ML_DONTPEGTOP; - dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM; - } - else - { - do_texture_skew = rover->master->flags & ML_DONTPEGTOP; - dont_peg_bottom = gl_curline->linedef->flags & ML_DONTPEGBOTTOM; - } - - texnum = R_GetTextureNum(side->midtexture); - - h = P_GetFFloorTopZAt (rover, v1x, v1y); - hS = P_GetFFloorTopZAt (rover, v2x, v2y); - l = P_GetFFloorBottomZAt(rover, v1x, v1y); - lS = P_GetFFloorBottomZAt(rover, v2x, v2y); - - // Adjust the heights so the FOF does not overlap with top and bottom textures. - if (h >= highcut && hS >= highcutslope) - { - h = highcut; - hS = highcutslope; - } - if (l <= lowcut && lS <= lowcutslope) - { - l = lowcut; - lS = lowcutslope; - } - - //Hurdler: HW code starts here - //FIXME: check if peging is correct - // set top/bottom coords - - wallVerts[3].y = FixedToFloat(h); - wallVerts[2].y = FixedToFloat(hS); - wallVerts[0].y = FixedToFloat(l); - wallVerts[1].y = FixedToFloat(lS); - - if (roverflags & FF_FOG) - { - wallVerts[3].t = wallVerts[2].t = 0; - wallVerts[0].t = wallVerts[1].t = 0; - wallVerts[0].s = wallVerts[3].s = 0; - wallVerts[2].s = wallVerts[1].s = 0; - } - else - { - // Wow, how was this missing from OpenGL for so long? - // ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software - // -- Monster Iestyn 26/06/18 - fixed_t texturevpeg = side->rowoffset; - - glTex = HWR_GetTexture(texnum, noencore); - - if (!do_texture_skew) // no skewing - { - if (dont_peg_bottom) - texturevpeg -= (*rover->topheight - *rover->bottomheight); - - wallVerts[3].t = static_cast((*rover->topheight - h) + texturevpeg) * glTex->scaleY; - wallVerts[2].t = static_cast((*rover->topheight - hS) + texturevpeg) * glTex->scaleY; - wallVerts[0].t = static_cast((*rover->topheight - l) + texturevpeg) * glTex->scaleY; - wallVerts[1].t = static_cast((*rover->topheight - lS) + texturevpeg) * glTex->scaleY; - } - else - { - if (!dont_peg_bottom) // skew by top - { - wallVerts[3].t = wallVerts[2].t = (static_cast(texturevpeg) * glTex->scaleY); - wallVerts[0].t = static_cast((h - l) + texturevpeg) * glTex->scaleY; - wallVerts[1].t = static_cast((hS - lS) + texturevpeg) * glTex->scaleY; - } - else // skew by bottom - { - wallVerts[0].t = wallVerts[1].t = (static_cast(texturevpeg) * glTex->scaleY); - wallVerts[3].t = wallVerts[0].t - static_cast(h - l) * glTex->scaleY; - wallVerts[2].t = wallVerts[1].t - static_cast(hS - lS) * glTex->scaleY; - } - } - - wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX; - wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX; - } - - FBITFIELD blendmode; - - if (roverflags & FF_FOG) - { - blendmode = PF_Fog|PF_NoTexture; - - lightnum = rover->master->frontsector->lightlevel; - colormap = rover->master->frontsector->extra_colormap; - - Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(lightnum, colormap); - - lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap); - - if (gl_backsector->numlights) - HWR_SplitWall(gl_backsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); - else - HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap); - } - else - { - blendmode = PF_Masked; - - if ((roverflags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) - { - blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent); - Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255); - } - - if (gl_backsector->numlights) - HWR_SplitWall(gl_backsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); - else - { - if (blendmode != PF_Masked) - HWR_AddTransparentWall(wallVerts, &Surf, texnum, noencore, blendmode, false, lightnum, colormap); - else - HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap); - } - } - } + process_ffloors(false); } } #undef SLOPEPARAMS @@ -3107,49 +2942,59 @@ static void HWR_Subsector(size_t num) continue; } - // bottom plane - centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); - - if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight && - ((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) || - (viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + auto render_plane = [&](boolean bottom) { + const fixed_t cullheight = bottom ? bottomCullHeight : topCullHeight; + const levelflat_t *flat = bottom ? &levelflats[*rover->bottompic] : &levelflats[*rover->toppic]; + const fixed_t roverheight = bottom ? *rover->bottomheight : *rover->topheight; + if (rover->flags & FF_FOG) { UINT8 alpha; - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight)); + light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < cullheight)); alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); HWR_AddTransparentFloor(0, &extrasubsectors[num], - false, - *rover->bottomheight, + !bottom, + roverheight, *gl_frontsector->lightlist[light].lightlevel, alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, true, rover->master->frontsector->extra_colormap); } else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient { - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight)); + light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < cullheight)); - HWR_AddTransparentFloor(levelflats[*rover->bottompic].lumpnum, + HWR_AddTransparentFloor(flat->lumpnum, &extrasubsectors[num], - false, - *rover->bottomheight, + !bottom, + roverheight, *gl_frontsector->lightlist[light].lightlevel, - CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent)), + CLAMP(rover->alpha, 0, 255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent)), false, gl_frontsector->lightlist[light].extra_colormap); } else { - HWR_GetFlat(levelflats[*rover->bottompic].lumpnum, R_NoEncore(gl_frontsector, false)); - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight)); + HWR_GetFlat(flat->lumpnum, R_NoEncore(gl_frontsector, !bottom)); + light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < cullheight)); - HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum, + HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flat->lumpnum, rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap); } + }; + + // bottom plane + centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); + + if (centerHeight <= locCeilingHeight && + centerHeight >= locFloorHeight && + ((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) || + (viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + { + render_plane(true); } // top plane @@ -3160,42 +3005,7 @@ static void HWR_Subsector(size_t num) ((viewz > topCullHeight && !(rover->flags & FF_INVERTPLANES)) || (viewz < topCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) { - if (rover->flags & FF_FOG) - { - UINT8 alpha; - - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight)); - - alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); - - HWR_AddTransparentFloor(0, - &extrasubsectors[num], - true, - *rover->topheight, - *gl_frontsector->lightlist[light].lightlevel, - alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, - true, rover->master->frontsector->extra_colormap); - } - else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) - { - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight)); - - HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum, - &extrasubsectors[num], - true, - *rover->topheight, - *gl_frontsector->lightlist[light].lightlevel, - CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent)), - false, gl_frontsector->lightlist[light].extra_colormap); - } - else - { - HWR_GetFlat(levelflats[*rover->toppic].lumpnum, R_NoEncore(gl_frontsector, true)); - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight)); - - HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum, - rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap); - } + render_plane(false); } } } @@ -4349,7 +4159,7 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I wallinfo_t *wallinfo = static_cast(HWR_CreateDrawNode(DRAWNODE_WALL)); memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts)); - memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo)); + memcpy(&wallinfo->Surf, pSurf, sizeof(FSurfaceInfo)); wallinfo->texnum = texnum; wallinfo->noencore = noencore; wallinfo->blend = blend; @@ -4483,7 +4293,7 @@ static void HWR_RenderDrawNodes(void) gl_frontsector = NULL; if (!(plane->blend & PF_NoTexture)) - HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling)); + HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling)); HWR_RenderPlane(NULL, plane->xsub, plane->isceiling, plane->fixedheight, plane->blend, plane->lightlevel, plane->lumpnum, plane->FOFSector, plane->alpha, plane->planecolormap); @@ -4497,10 +4307,10 @@ static void HWR_RenderDrawNodes(void) gl_frontsector = NULL; if (!(polyplane->blend & PF_NoTexture)) - HWR_GetFlat(polyplane->lumpnum, R_NoEncore(polyplane->FOFSector, polyplane->isceiling)); + HWR_GetFlat(polyplane->lumpnum, R_NoEncore(polyplane->FOFSector, polyplane->isceiling)); HWR_RenderPolyObjectPlane(polyplane->polysector, polyplane->isceiling, polyplane->fixedheight, polyplane->blend, polyplane->lightlevel, - polyplane->lumpnum, polyplane->FOFSector, polyplane->alpha, polyplane->planecolormap); + polyplane->lumpnum, polyplane->FOFSector, polyplane->alpha, polyplane->planecolormap); } break; @@ -4512,7 +4322,7 @@ static void HWR_RenderDrawNodes(void) HWR_GetTexture(wall->texnum, wall->noencore); HWR_RenderWall(wall->wallVerts, &wall->Surf, wall->blend, wall->fogwall, - wall->lightlevel, wall->wallcolormap); + wall->lightlevel, wall->wallcolormap); } break; default: