zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-04 00:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle sectors within sectors for stacked portals and plane mirrors (affects OoB only).

Browse source
This commit is contained in:
Dileep V. Reddy 2025-03-07 23:47:12 -07:00 committed by Rachael Alexanderson
parent def3082ed8
commit 60ebd71fea
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rendering/hwrenderer/scene/hw_portal.cpp
View file

@ -815,6 +815,7 @@ bool HWSectorStackPortal::Setup(HWDrawInfo *di, FRenderState &rstate, Clipper *c
if (origin->plane != -1) screen->instack[origin->plane]++;
if (lines.Size() > 0)
{
flat.plane.GetFromSector(lines[0].sub->sector, origin->plane);
di->SetClipHeight(flat.plane.plane.ZatPoint(vp.Pos),
flat.plane.plane.Normal().Z > 0 ? -1.f : 1.f);
@ -841,11 +842,12 @@ void HWSectorStackPortal::DrawPortalStencil(FRenderState &state, int pass)
if (mState->vpIsAllowedOoB)
{
bool isceiling = planesused & (1 << sector_t::ceiling);
for (unsigned int i = 0; i < lines.Size(); i++)
for (unsigned i = 0; i<subsectors.Size(); i++)
{
flat.section = lines[i].sub->section;
flat.iboindex = lines[i].sub->sector->iboindex[isceiling ? sector_t::ceiling : sector_t::floor];
flat.plane.GetFromSector(lines[i].sub->sector, isceiling ? sector_t::ceiling : sector_t::floor);
subsector_t *sub = subsectors[i];
flat.section = sub->section;
flat.iboindex = sub->sector->iboindex[isceiling ? sector_t::ceiling : sector_t::floor];
flat.plane.GetFromSector(sub->sector, isceiling ? sector_t::ceiling : sector_t::floor);
// if (isceiling) flat.plane.plane.FlipVert(); // Doesn't do anything. Stencil is a screen-space projection
state.SetNormal(flat.plane.plane.Normal().X, flat.plane.plane.Normal().Z, flat.plane.plane.Normal().Y);

10
src/rendering/hwrenderer/scene/hw_sky.cpp
View file

@ -319,7 +319,10 @@ void HWWall::SkyTop(HWWallDispatcher *di, seg_t * seg,sector_t * fs,sector_t * b
if (backreflect > 0 && bs->ceilingplane.fD() == fs->ceilingplane.fD() && !bs->isClosed())
{
// Don't add intra-portal line to the portal.
return;
if (!(di->di && di->di->Viewpoint.IsAllowedOoB()))
{
return;
}
}
}
else
@ -398,7 +401,10 @@ void HWWall::SkyBottom(HWWallDispatcher *di, seg_t * seg,sector_t * fs,sector_t
if (backreflect > 0 && bs->floorplane.fD() == fs->floorplane.fD() && !bs->isClosed())
{
// Don't add intra-portal line to the portal.
return;
if (!(di->di && di->di->Viewpoint.IsAllowedOoB()))
{
return;
}
}
}
else