From 9bdb5f1a5d4df5d06d7bdebf51d9148fe7d826a3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 20 Jun 2018 10:10:30 +0200 Subject: [PATCH] Moved ProcessLowerMinisegs back toAPI independent code. --- src/gl/scene/gl_drawinfo.cpp | 12 ------------ src/hwrenderer/scene/hw_drawinfo.h | 2 +- src/hwrenderer/scene/hw_renderhacks.cpp | 15 ++++++++++++++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/gl/scene/gl_drawinfo.cpp b/src/gl/scene/gl_drawinfo.cpp index 60991e2fb..11ae0b825 100644 --- a/src/gl/scene/gl_drawinfo.cpp +++ b/src/gl/scene/gl_drawinfo.cpp @@ -481,18 +481,6 @@ void FDrawInfo::FloodLowerGap(seg_t * seg) ClearFloodStencil(&ws); } -// This was temporarily moved out of gl_renderhacks.cpp so that the dependency on GLWall could be eliminated until things have progressed a bit. -void FDrawInfo::ProcessLowerMinisegs(TArray &lowersegs) -{ - for(unsigned int j=0;jSubsector->render_sector, seg->PartnerSeg->Subsector->render_sector); - rendered_lines++; - } -} - // Same here for the dependency on the portal. void FDrawInfo::AddSubsectorToPortal(FSectorPortalGroup *portal, subsector_t *sub) { diff --git a/src/hwrenderer/scene/hw_drawinfo.h b/src/hwrenderer/scene/hw_drawinfo.h index 06a42f1eb..317fea51d 100644 --- a/src/hwrenderer/scene/hw_drawinfo.h +++ b/src/hwrenderer/scene/hw_drawinfo.h @@ -196,7 +196,7 @@ public: virtual void FloodUpperGap(seg_t * seg) = 0; virtual void FloodLowerGap(seg_t * seg) = 0; - virtual void ProcessLowerMinisegs(TArray &lowersegs) = 0; + void ProcessLowerMinisegs(TArray &lowersegs); virtual void AddSubsectorToPortal(FSectorPortalGroup *portal, subsector_t *sub) = 0; virtual void AddWall(GLWall *w) = 0; diff --git a/src/hwrenderer/scene/hw_renderhacks.cpp b/src/hwrenderer/scene/hw_renderhacks.cpp index 82deec698..52f996f41 100644 --- a/src/hwrenderer/scene/hw_renderhacks.cpp +++ b/src/hwrenderer/scene/hw_renderhacks.cpp @@ -30,7 +30,8 @@ #include "r_sky.h" #include "g_levellocals.h" -#include "hwrenderer/scene/hw_drawinfo.h" +#include "hw_drawinfo.h" +#include "hw_drawstructs.h" #include "hwrenderer/utility/hw_clock.h" sector_t * hw_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back); @@ -844,6 +845,18 @@ bool HWDrawInfo::CollectSubsectorsCeiling(subsector_t * sub, sector_t * anchor) // //========================================================================== +void HWDrawInfo::ProcessLowerMinisegs(TArray &lowersegs) +{ + for(unsigned int j=0;jSubsector->render_sector, seg->PartnerSeg->Subsector->render_sector); + rendered_lines++; + } +} + + void HWDrawInfo::HandleHackedSubsectors() { viewsubsector = R_PointInSubsector(Viewpoint.Pos);