zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

engine.c: prevent multiple collection of same sector in scansector().

Browse source 
Also for polymost_scansector(). These were likely of little consequence
because collection in scansector() is the exception than the rule (see
added comments), and because the redundant drawwalls() would find the
x range done the second and following times.

Also, add a bound check for sectorborder[] (the limit was probably rarely
hit in practice, but the check is mandatory nontheless) and add functions
printscans() and printbunches() in the DEBUGGINGAIDS=2 build.

git-svn-id: https://svn.eduke32.com/eduke32@4877 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-01-04 18:45:03 +00:00
parent bc35a5c8d2
commit 431941771d
2 changed files with 68 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
polymer/eduke32/build/src/engine.c
View file

@ -2678,8 +2678,15 @@ static void scansector(int16_t startsectnum)
const int32_t x1 = wal->x-globalposx, y1 = wal->y-globalposy;
const int32_t x2 = wal2->x-globalposx, y2 = wal2->y-globalposy;
// The following block checks for a potential collection of a
// sector that is "thin" in screen space. This is necessary because
// not all sectors that are needed to be drawn may be collected via
// drawalls() -> scansector() (although those are the majority).
// Example: standing at exactly the intersection of a large sector
// into four quadrant sub-sectors.
#if 1
if (nextsectnum >= 0 && (wal->cstat&32) == 0)
if (nextsectnum >= 0 && (wal->cstat&32) == 0 && sectorbordercnt < ARRAY_SSIZE(sectorborder))
#ifdef YAX_ENABLE
if (yax_nomaskpass==0 || !yax_isislandwall(w, !yax_globalcf) || (yax_nomaskdidit=1, 0))
#endif
@ -2690,7 +2697,10 @@ static void scansector(int16_t startsectnum)
int32_t tempint = temp;
if (((uint64_t)tempint+262144) < 524288) // BXY_MAX?
if (mulscale5(tempint,tempint) <= (x2-x1)*(x2-x1)+(y2-y1)*(y2-y1))
{
sectorborder[sectorbordercnt++] = nextsectnum;
gotsector[nextsectnum>>3] |= pow2char[nextsectnum&7];
}
}
#endif
if (w == startwall || wall[w-1].point2 != w)
@ -2743,6 +2753,57 @@ skipitaddwall:
while (sectorbordercnt > 0);
}
#if DEBUGGINGAIDS >= 2
// Printing functions for collected scans (called "wall proxies" by
// http://fabiensanglard.net/duke3d/build_engine_internals.php) and
// bunches. For use from within the debugger.
void printscans(void)
{
static uint8_t didscan[(MAXWALLSB+7)>>3];
Bmemset(didscan, 0, sizeof(didscan));
for (int s=0; s<numscans; s++)
{
if (bunchp2[s] >= 0 && (didscan[s>>3] & (1<<(s&7)))==0)
{
printf("scan ");
int z = s;
do
{
const int cond = (wall[thewall[z]].point2 != thewall[bunchp2[z]] ||
xb2[z] >= xb1[bunchp2[z]]);
printf("%s%d(%d) ", cond ? "!" : "", z, thewall[z]);
if (didscan[z>>3] & (1<<(z&7)))
{
printf("*");
break;
}
didscan[z>>3] |= (1<<(z&7));
z = bunchp2[z];
} while (z >= 0);
printf("\n");
}
}
}
void printbunches(void)
{
for (int bn=0; bn<numbunches; bn++)
{
printf("bunch %d: ", bn);
for (int s=bunchfirst[bn]; s>=0; s=bunchp2[s])
printf("%d(%d) ", s, thewall[s]);
printf("\n");
}
}
#endif
////////// *WALLSCAN HELPERS //////////

7
polymer/eduke32/build/src/polymost.c
View file

@ -3284,17 +3284,22 @@ void polymost_scansector(int32_t sectnum)
fp2.x = (float)(wal2->x-globalposx); fp2.y = (float)(wal2->y-globalposy);
nextsectnum = wal->nextsector; //Scan close sectors
if (nextsectnum >= 0 && !(wal->cstat&32) && sectorbordercnt < ARRAY_SSIZE(sectorborder))
#ifdef YAX_ENABLE
if (yax_nomaskpass==0 || !yax_isislandwall(z, !yax_globalcf) || (yax_nomaskdidit=1, 0))
#endif
if ((nextsectnum >= 0) && (!(wal->cstat&32)) && (!(gotsector[nextsectnum>>3]&pow2char[nextsectnum&7])))
if ((gotsector[nextsectnum>>3]&pow2char[nextsectnum&7]) == 0)
{
d = fp1.x*fp2.y - fp2.x*fp1.y;
p1.x = fp2.x-fp1.x;
p1.y = fp2.y-fp1.y;
if (d*d <= (p1.x*p1.x + p1.y*p1.y) * (SCISDIST*SCISDIST*260.f))
{
sectorborder[sectorbordercnt++] = nextsectnum;
gotsector[nextsectnum>>3] |= pow2char[nextsectnum&7];
}
}
if ((z == startwall) || (wall[z-1].point2 != z))