zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- better handling for portal lines having sloped back sectors.

Browse source 
This is a very ugly special case that probably needs a bit more work to get right, for now this should be enough as this combination is rather rare.
This commit is contained in:
Christoph Oelckers 2021-04-09 22:48:16 +02:00
parent 19a4c12e6a
commit 345275db5d
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/core/rendering/scene/hw_walls.cpp
View file

@ -893,7 +893,7 @@ void HWWall::Process(HWDrawInfo* di, walltype* wal, sectortype* frontsector, sec
#ifdef _DEBUG #ifdef _DEBUG
if (wal - wall == 843) if (wal - wall == 788)
{ {
int a = 0; int a = 0;
} }
@ -990,11 +990,14 @@ void HWWall::Process(HWDrawInfo* di, walltype* wal, sectortype* frontsector, sec
{ {
float bch1a = bch1; float bch1a = bch1;
float bch2a = bch2; float bch2a = bch2;
if (ffh1 > bch1 && ffh2 > bch2) if (ffh1 > bch1 || ffh2 > bch2)
{ {
// the back sector's floor obstructs part of this wall // the back sector's floor obstructs part of this wall. Todo: Handle the portal case better.
bch2a = ffh2; if ((ffh1 > bch1 && ffh2 > bch2) || frontsector->portalflags == PORTAL_SECTOR_FLOOR)
bch1a = ffh1; {
bch2a = ffh2;
bch1a = ffh1;
}
} }
if (bch1a < fch1 || bch2a < fch2) if (bch1a < fch1 || bch2a < fch2)
@ -1025,11 +1028,14 @@ void HWWall::Process(HWDrawInfo* di, walltype* wal, sectortype* frontsector, sec
// lower texture // lower texture
if (!(frontsector->floorstat & backsector->floorstat & CSTAT_SECTOR_SKY)) if (!(frontsector->floorstat & backsector->floorstat & CSTAT_SECTOR_SKY))
{ {
if (fch1 < bfh1 && fch2 < bfh2) if (fch1 < bfh1 || fch2 < bfh2)
{ {
// the back sector's ceiling obstructs part of this wall. // the back sector's ceiling obstructs part of this wall. Todo: Handle the portal case better.
bfh1 = fch1; if ((fch1 < bfh1 && fch2 < bfh2) || frontsector->portalflags == PORTAL_SECTOR_CEILING)
bfh2 = fch2; {
bfh1 = fch1;
bfh2 = fch2;
}
} }
if (bfh1 > ffh1 || bfh2 > ffh2) if (bfh1 > ffh1 || bfh2 > ffh2)