zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle wall sprites on orthogonal walls better.

Browse source 
This covers the case that a wall sprite may overlap two walls with a slight deviation in their position - always pick the closest one.
This commit is contained in:
Christoph Oelckers 2022-01-30 08:28:52 +01:00
parent ce325e6453
commit 11b21cce2c
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,13 +50,12 @@ DCoreActor* wall_to_sprite_actors[8]; // gets updated each frame. Todo: Encapsul
static walltype* IsOnWall(tspritetype* tspr, int height, DVector2& outpos)
{
const double maxorthdist = 3; // maximum orthogonal distance to be considered an attached sprite.
const double maxdistsq = (tspr->ang & 0x1ff)? 3 * 3 : 1; // lower tolerance for perfectly orthogonal sprites
double maxorthdist = 3; // maximum orthogonal distance to be considered an attached sprite.
double maxdistsq = 3 * 3;
walltype* best = nullptr;
auto sect = tspr->sectp;
walltype* closest = nullptr;
int topz = (tspr->pos.Z - ((height * tspr->yrepeat) << 2));
for(auto& wal : wallsofsector(sect))
{
// Intentionally include two sided walls. Even on them the sprite should be projected onto the wall for better results.
@ -72,16 +71,20 @@ 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.
if (d.X == 0)
{
if (fabs(tspr->pos.X - wal.pos.X) < maxorthdist)
double newdist = fabs(tspr->pos.X - wal.pos.X);
if (newdist < maxorthdist)
{
return &wal;
maxorthdist = newdist;
best = &wal;
}
}
else if (d.Y == 0)
{
if (fabs(tspr->pos.Y - wal.pos.Y) < maxorthdist)
double newdist = fabs(tspr->pos.Y - wal.pos.Y);
if (newdist < maxorthdist)
{
return &wal;
maxorthdist = newdist;
best = &wal;
}
}
else
@ -94,7 +97,7 @@ static walltype* IsOnWall(tspritetype* tspr, int height, DVector2& outpos)
}
}
}
return nullptr;
return best;
}
//==========================================================================