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

- use math utilities to get closest point on wall in clip.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-17 20:02:15 +02:00
parent e6f1d92567
commit b9ea355e2e
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/build/src/clip.cpp
View file

@ -969,30 +969,8 @@ int pushmove_(vec3_t *const vect, int *const sectnum,
if (wal->nextsector < 0 || wal->cstat & EWallFlags::FromInt(dawalclipmask)) j = 1;
else
{
int32_t daz2;
vec2_t closest;
if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829)
closest = vect->vec2;
else
{
//Find closest point on wall (dax, day) to (vect->x, vect->y)
int32_t dax = wal->point2Wall()->wall_int_pos().X-wal->wall_int_pos().X;
int32_t day = wal->point2Wall()->wall_int_pos().Y-wal->wall_int_pos().Y;
int32_t daz = dax*((vect->X)-wal->wall_int_pos().X) + day*((vect->Y)-wal->wall_int_pos().Y);
int32_t t;
if (daz <= 0)
t = 0;
else
{
daz2 = dax*dax+day*day;
if (daz >= daz2) t = (1<<30); else t = DivScale(daz, daz2, 30);
}
dax = wal->wall_int_pos().X + MulScale(dax, t, 30);
day = wal->wall_int_pos().Y + MulScale(day, t, 30);
closest = { dax, day };
}
auto pvect = NearestPointOnWall(vect->X * inttoworld, vect->Y * inttoworld, wal);
vec2_t closest = { int(pvect.X * worldtoint), int(pvect.Y * worldtoint) };
j = cliptestsector(clipsectorlist[clipsectcnt], wal->nextsector, flordist, ceildist, closest, vect->Z);
}