zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed last commit and optimized wall lookup code a bit.

Browse source 
No need to continue if a matching wall has been found.
This commit is contained in:
Christoph Oelckers 2022-01-14 20:20:47 +01:00
parent ef711f0b2d
commit 7b1d99373b
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,16 +72,16 @@ static walltype* IsOnWall(tspritetype* tspr, int height, DVector2& outpos)
// In Wanton Destruction's airplane level there's such a sprite assigned to the wrong sector. // In Wanton Destruction's airplane level there's such a sprite assigned to the wrong sector.
if (d.X == 0) if (d.X == 0)
{ {
if (fabs(tspr->pos.X - wal.pos.X) < maxorthdist); if (fabs(tspr->pos.X - wal.pos.X) < maxorthdist)
{ {
closest = &wal; return &wal;
} }
} }
else if (d.Y == 0) else if (d.Y == 0)
{ {
if (fabs(tspr->pos.Y - wal.pos.Y) < maxorthdist); if (fabs(tspr->pos.Y - wal.pos.Y) < maxorthdist)
{ {
closest = &wal; return &wal;
} }
} }
else else
@ -89,13 +89,12 @@ static walltype* IsOnWall(tspritetype* tspr, int height, DVector2& outpos)
double wdist = SquareDistToWall(tspr->pos.X, tspr->pos.Y, &wal, &outpos); double wdist = SquareDistToWall(tspr->pos.X, tspr->pos.Y, &wal, &outpos);
if (wdist <= maxdistsq) if (wdist <= maxdistsq)
{ {
closest = &wal; return &wal;
} }
} }
} }
} }
// todo: cache this in the sprite to avoid recalculation. return nullptr;
return closest;
} }
//========================================================================== //==========================================================================