From 3c5d997eff04ba16903eb372bb34fbead010a4f8 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 26 Aug 2025 09:40:31 +0200 Subject: [PATCH] simplyfied P_PointOn checks from prboom should be functionally identical --- src/p_maputl.c | 52 ++++++++++++++------------------------------------ src/p_maputl.h | 4 ++-- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/src/p_maputl.c b/src/p_maputl.c index baab10b0a..68de643e5 100644 --- a/src/p_maputl.c +++ b/src/p_maputl.c @@ -134,23 +134,13 @@ void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, verte // P_PointOnLineSide // Returns 0 or 1 // -INT32 P_PointOnLineSide(fixed_t x, fixed_t y, const line_t *line) +INT32 PUREFUNC P_PointOnLineSide(fixed_t x, fixed_t y, const line_t *line) { - fixed_t dx, dy, left, right; - - if (!line->dx) - return x <= line->v1->x ? line->dy > 0 : line->dy < 0; - - if (!line->dy) - return y <= line->v1->y ? line->dx < 0 : line->dx > 0; - - dx = (x - line->v1->x); - dy = (y - line->v1->y); - - left = FixedMul(line->dy>>FRACBITS, dx); - right = FixedMul(dy, line->dx>>FRACBITS); - - return right < left ? 0 : 1; + return + !line->dx ? x <= line->v1->x ? line->dy > 0 : line->dy < 0 : + !line->dy ? y <= line->v1->y ? line->dx < 0 : line->dx > 0 : + FixedMul(y-line->v1->y, line->dx>>FRACBITS) >= + FixedMul(line->dy>>FRACBITS, x-line->v1->x); } // @@ -158,7 +148,7 @@ INT32 P_PointOnLineSide(fixed_t x, fixed_t y, const line_t *line) // Considers the line to be infinite // Returns side 0 or 1, -1 if box crosses the line. // -INT32 P_BoxOnLineSide(fixed_t *tmbox, const line_t *ld) +INT32 PUREFUNC P_BoxOnLineSide(fixed_t *tmbox, const line_t *ld) { INT32 p1, p2; @@ -208,27 +198,13 @@ INT32 P_BoxOnLineSide(fixed_t *tmbox, const line_t *ld) // P_PointOnDivlineSide // Returns 0 or 1. // -static INT32 P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t *line) +static INT32 PUREFUNC P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t *line) { - fixed_t dx, dy, left, right; - - if (!line->dx) - return x <= line->x ? line->dy > 0 : line->dy < 0; - - if (!line->dy) - return y <= line->y ? line->dx < 0 : line->dx > 0; - - dx = (x - line->x); - dy = (y - line->y); - - // try to quickly decide by looking at sign bits - if ((line->dy ^ line->dx ^ dx ^ dy) & 0x80000000) - return ((line->dy ^ dx) & 0x80000000) ? 1 : 0; - - left = FixedMul(line->dy>>8, dx>>8); - right = FixedMul(dy>>8, line->dx>>8); - - return right < left ? 0 : 1; + return + !line->dx ? x <= line->x ? line->dy > 0 : line->dy < 0 : + !line->dy ? y <= line->y ? line->dx < 0 : line->dx > 0 : + (line->dy^line->dx^(x -= line->x)^(y -= line->y)) < 0 ? (line->dy^x) < 0 : + FixedMul(y>>8, line->dx>>8) >= FixedMul(line->dy>>8, x>>8); } @@ -248,7 +224,7 @@ void P_MakeDivline(line_t *li, divline_t *dl) // Returns the fractional intercept point along the first divline. // This is only called by the addthings and addlines traversers. // -fixed_t P_InterceptVector(divline_t *v2, divline_t *v1) +fixed_t PUREFUNC P_InterceptVector(divline_t *v2, divline_t *v1) { fixed_t frac, num, den; diff --git a/src/p_maputl.h b/src/p_maputl.h index d2337d007..c337c0f87 100644 --- a/src/p_maputl.h +++ b/src/p_maputl.h @@ -44,10 +44,10 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2, #define P_AproxDistance(dx, dy) FixedHypot(dx, dy) void P_ClosestPointOnLine(fixed_t x, fixed_t y, line_t *line, vertex_t *result); void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, vertex_t *result); -INT32 P_PointOnLineSide(fixed_t x, fixed_t y, const line_t *line); +INT32 PUREFUNC P_PointOnLineSide(fixed_t x, fixed_t y, const line_t *line); void P_MakeDivline(line_t *li, divline_t *dl); void P_CameraLineOpening(line_t *plinedef); -fixed_t P_InterceptVector(divline_t *v2, divline_t *v1); +fixed_t PUREFUNC P_InterceptVector(divline_t *v2, divline_t *v1); INT32 P_BoxOnLineSide(fixed_t *tmbox, const line_t *ld); void P_UnsetPrecipThingPosition(precipmobj_t *thing); void P_SetPrecipitationThingPosition(precipmobj_t *thing);