teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-04 23:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floating point version of rintersect, based on GZDoom's P_InterceptVector.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-24 17:03:03 +02:00
parent b7ddd9e784
commit 2cc81d0165
2 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/build/src/engine.cpp
View file

@ -142,45 +142,6 @@ int32_t lintersect(const int32_t originX, const int32_t originY, const int32_t o
return 1;
}
//
// rintersect (internal)
//
// returns: -1 if didn't intersect, coefficient (x3--x4 fraction)<<16 else
int32_t rintersect(int32_t x1, int32_t y1, int32_t z1,
int32_t vx, int32_t vy, int32_t vz,
int32_t x3, int32_t y3, int32_t x4, int32_t y4,
int32_t *intx, int32_t *inty, int32_t *intz)
{
//p1 towards p2 is a ray
int64_t const x34=x3-x4, y34=y3-y4;
int64_t const x31=x3-x1, y31=y3-y1;
int64_t const bot = vx*y34 - vy*x34;
int64_t const topt = x31*y34 - y31*x34;
if (bot == 0)
return -1;
int64_t const topu = vx*y31 - vy*x31;
if (bot > 0 && (topt < 0 || topu < 0 || topu >= bot))
return -1;
else if (bot < 0 && (topt > 0 || topu > 0 || topu <= bot))
return -1;
int64_t t = (topt << 16) / bot;
*intx = x1 + ((vx*t) >> 16);
*inty = y1 + ((vy*t) >> 16);
*intz = z1 + ((vz*t) >> 16);
t = (topu << 16) / bot;
assert((unsigned)t < 65536);
return t;
}
//
// cansee
//

43
source/core/gamefuncs.h
View file

@ -585,7 +585,7 @@ inline double SquareDistToLine(double px, double py, double lx1, double ly1, dou
}
// taken from GZDoom with the divline_t parameters removed
double InterceptVector(double v2x, double v2y, double v2dx, double v2dy, double v1x, double v1y, double v1dx, double v1dy)
inline double InterceptVector(double v2x, double v2y, double v2dx, double v2dy, double v1x, double v1y, double v1dx, double v1dy)
{
double den = v1dy * v2dx - v1dx * v2dy;
@ -596,6 +596,32 @@ double InterceptVector(double v2x, double v2y, double v2dx, double v2dy, double
return num / den;
}
// Essentially two InterceptVector calls. We can reduce the calculations because the denominators for both calculations only differ by their sign.
inline double InterceptLineSegments(double v2x, double v2y, double v2dx, double v2dy, double v1x, double v1y, double v1dx, double v1dy, double* pfactor1 = nullptr)
{
double den = v1dy * v2dx - v1dx * v2dy;
if (den == 0)
return 0; // parallel
// perform the division first for better parallelization.
den = 1 / den;
double factor1 = ((v2x - v1x) * v2dy + (v1y - v2y) * v2dx) * -den;
if (factor1 < 0 || factor1 > 1) return -FLT_MAX; // no intersection
if (pfactor1) *pfactor1 = factor1;
return ((v1x - v2x) * v1dy + (v2y - v1y) * v1dx) * den; // this one's for the line segment where we want to get the intercept factor for so it needs to be last.
}
inline double GetRayIntersect(const DVector3& start1, const DVector3& vect1, const DVector2& start2, const DVector2& vect2, DVector3& retv)
{
double factor2;
double factor = InterceptLineSegments(start1.X, start1.Y, vect1.X, vect1.Y, start2.X, start2.Y, vect2.X, vect2.Y, &factor2);
if (factor <= 0) return -1;
retv = start1 + factor * vect1;
return factor2;
}
inline void alignceilslope(sectortype* sect, const DVector3& pos)
@ -618,4 +644,19 @@ inline double BobVal(double val)
return g_sinbam(xs_CRoundToUInt(val * (1 << 21)));
}
// deprecated int wrappers
[[deprecated]]
inline int rintersect(int x1, int y1, int z1, int vx, int vy, int vz, int x3, int y3, int x4, int y4, int* intx, int* inty, int* intz)
{
DVector3 retv;
double result = GetRayIntersect(DVector3(x1 * inttoworld, y1 * inttoworld, z1 * zinttoworld), DVector3(vx * inttoworld, vy * inttoworld, vz * zinttoworld),
DVector2(x3 * inttoworld, y3 * inttoworld), DVector2((x4 - x3) * inttoworld, (y4 - y3) * inttoworld), retv);
if (result < 0) return -1;
*intx = retv.X * worldtoint;
*inty = retv.Y * worldtoint;
*intz = retv.Z * zworldtoint;
return FloatToFixed(result);
}
#include "updatesector.h"