From def40280285d8b2ff3fdbd94b9b36010be9f3458 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 23 Apr 2025 11:39:54 +0200 Subject: [PATCH] add P_DivlineCrossedFast to take more advantage of P_DivlineSideFast --- src/p_sight.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/p_sight.c b/src/p_sight.c index 5dfc796b8..b02ffd786 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -34,6 +34,7 @@ typedef struct { static INT32 sightcounts[2]; typedef INT32 (*divlinefunc)(fixed_t x, fixed_t y, const divline_t *node); +typedef INT32 (*divlinecrossfunc)(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node); // // P_DivlineSide @@ -67,6 +68,11 @@ static inline INT32 P_DivlineCrossed(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t return (P_DivlineSide(x1, y1, node) == P_DivlineSide(x2, y2, node)); } +static inline INT32 P_DivlineCrossedFast(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node) +{ + return (P_DivlineSideFast(x1, y1, node) == P_DivlineSideFast(x2, y2, node)); +} + static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los) { size_t i; @@ -130,7 +136,7 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los) // // Returns true if strace crosses the given subsector successfully. // -static boolean P_CrossSubsector(size_t num, register los_t *los) +static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast) { seg_t *seg; INT32 count; @@ -159,6 +165,8 @@ static boolean P_CrossSubsector(size_t num, register los_t *los) } } + const divlinecrossfunc divlinecrossFunc = fast ? P_DivlineCrossedFast : P_DivlineCrossed; + for (count = subsectors[num].numlines; --count >= 0; seg++) // check lines { line_t *line = seg->linedef; @@ -187,14 +195,14 @@ static boolean P_CrossSubsector(size_t num, register los_t *los) v2 = line->v2; // line isn't crossed? - if (P_DivlineCrossed(v1->x, v1->y, v2->x, v2->y, &los->strace)) + if (divlinecrossFunc(v1->x, v1->y, v2->x, v2->y, &los->strace)) continue; divl.dx = v2->x - (divl.x = v1->x); divl.dy = v2->y - (divl.y = v1->y); // line isn't crossed? - if (P_DivlineCrossed(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl)) + if (divlinecrossFunc(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl)) continue; // stop because it is not two sided anyway @@ -326,7 +334,7 @@ static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los, boolean fast) } } - return P_CrossSubsector((bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR), los); + return P_CrossSubsector((bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR), los, fast); } //