teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed BunchInFront to do a more thorough comparison in case it encounters colinear walls.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-21 14:31:12 +02:00
parent 716b8840af
commit 24dbfc7827
2 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
source/core/rendering/scene/hw_bunchdrawer.cpp
View file

@ -392,9 +392,34 @@ int BunchDrawer::WallInFront(int line1, int line2)
//
//==========================================================================
int BunchDrawer::ColinearBunchInFront(FBunch* b1, FBunch* b2)
{
// Unable to determine the order. The only option left is to see if the sectors within the bunch can be ordered.
for (int i = b1->startline; i <= b1->endline; i++)
{
int wall1s = sectionLines[i].wall;
if (wall1s == -1) continue;
int sect1 = wall[wall1s].sector;
int nsect1 = wall[wall1s].nextsector;
if (nsect1 < 0) continue;
for (int j = b2->startline; j <= b2->endline; j++)
{
int wall2s = sectionLines[j].wall;
if (wall2s == -1) continue;
int sect2 = wall[wall2s].sector;
int nsect2 = wall[wall2s].nextsector;
if (nsect2 < 0) continue;
if (sect1 == nsect2) return 1; // bunch 2 is in front
if (sect2 == nsect1) return 0; // bunch 1 is in front
}
}
return -1;
}
int BunchDrawer::BunchInFront(FBunch* b1, FBunch* b2)
{
binangle anglecheck, endang;
bool colinear = false;
if (b2->startangle.asbam() >= b1->startangle.asbam() && b2->startangle.asbam() < b1->endangle.asbam())
{
@ -409,6 +434,15 @@ int BunchDrawer::BunchInFront(FBunch* b1, FBunch* b2)
{
// found a line
int ret = WallInFront(b2->startline, i);
if (ret == -1)
{
ret = ColinearBunchInFront(b1, b2);
if (ret == -1)
{
colinear = true;
continue;
}
}
return ret;
}
}
@ -426,10 +460,24 @@ int BunchDrawer::BunchInFront(FBunch* b1, FBunch* b2)
{
// found a line
int ret = WallInFront(i, b1->startline);
if (ret == -1)
{
ret = ColinearBunchInFront(b1, b2);
if (ret == -1)
{
colinear = true;
continue;
}
}
return ret;
}
}
}
if (colinear)
{
// This should never happen.
assert(true);
}
// we have no overlap
return -1;
}

1
source/core/rendering/scene/hw_bunchdrawer.h
View file

@ -53,6 +53,7 @@ private:
int ClipLine(int line, bool portal);
void ProcessBunch(int bnch);
int WallInFront(int wall1, int wall2);
int ColinearBunchInFront(FBunch* b1, FBunch* b2);
int BunchInFront(FBunch* b1, FBunch* b2);
int FindClosestBunch();
void ProcessSection(int sectnum, bool portal);