zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- restored portal code that shouldn't have been deleted.

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-08 20:39:44 +01:00
parent cdd60b1431
commit f6af50fc74
4 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/hwrenderer/scene/hw_bsp.cpp
View file

@ -702,6 +702,21 @@ void HWDrawInfo::DoSubsector(subsector_t * sub)
ss_renderflags[sub->Index()] = ss_renderflags[sub->Index()] =
(sub->numlines > 2) ? SSRF_PROCESSED|SSRF_RENDERALL : SSRF_PROCESSED; (sub->numlines > 2) ? SSRF_PROCESSED|SSRF_RENDERALL : SSRF_PROCESSED;
if (sub->hacked & 1) AddHackedSubsector(sub); if (sub->hacked & 1) AddHackedSubsector(sub);
// This is for portal coverage.
FSectorPortalGroup *portal;
portal = fakesector->GetPortalGroup(sector_t::ceiling);
if (portal != nullptr)
{
AddSubsectorToPortal(portal, sub);
}
portal = fakesector->GetPortalGroup(sector_t::floor);
if (portal != nullptr)
{
AddSubsectorToPortal(portal, sub);
}
} }
} }
} }

19
src/hwrenderer/scene/hw_drawinfo.cpp
View file

@ -655,3 +655,22 @@ void HWDrawInfo::ProcessScene(bool toscreen, const std::function<void(HWDrawInfo
DrawScene(this, toscreen ? DM_MAINVIEW : DM_OFFSCREEN); DrawScene(this, toscreen ? DM_MAINVIEW : DM_OFFSCREEN);
} }
//==========================================================================
//
//
//
//==========================================================================
void HWDrawInfo::AddSubsectorToPortal(FSectorPortalGroup *ptg, subsector_t *sub)
{
auto portal = FindPortal(ptg);
if (!portal)
{
portal = new HWScenePortal(screen->mPortalState, new HWSectorStackPortal(ptg));
Portals.Push(portal);
}
auto ptl = static_cast<HWSectorStackPortal*>(static_cast<HWScenePortal*>(portal)->mScene);
ptl->AddSubsector(sub);
}

1
src/hwrenderer/scene/hw_drawinfo.h
View file

@ -300,6 +300,7 @@ public:
void DrawPlayerSprites(bool hudModelStep, FRenderState &state); void DrawPlayerSprites(bool hudModelStep, FRenderState &state);
void ProcessLowerMinisegs(TArray<seg_t *> &lowersegs); void ProcessLowerMinisegs(TArray<seg_t *> &lowersegs);
void AddSubsectorToPortal(FSectorPortalGroup *portal, subsector_t *sub);
void AddWall(GLWall *w); void AddWall(GLWall *w);
void AddMirrorSurface(GLWall *w); void AddMirrorSurface(GLWall *w);

18
src/hwrenderer/scene/hw_renderhacks.cpp
View file

@ -1393,22 +1393,4 @@ void HWDrawInfo::ProcessSectorStacks(area_t in_area)
CeilingStacks.Clear(); CeilingStacks.Clear();
} }
//==========================================================================
//
//
//
//==========================================================================
void HWDrawInfo::AddSubsectorToPortal(FSectorPortalGroup *ptg, subsector_t *sub)
{
auto portal = FindPortal(ptg);
if (!portal)
{
portal = new HWScenePortal(screen->mPortalState, new HWSectorStackPortal(ptg));
Portals.Push(portal);
}
auto ptl = static_cast<HWSectorStackPortal*>(static_cast<HWScenePortal*>(portal)->mScene);
ptl->AddSubsector(sub);
}
#endif #endif