diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-27 22:51:43 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-28 00:18:04 +0100 |
| commit | 2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a (patch) | |
| tree | b6c42b3c3ce8b1122e90ad871b3c06bd3e21c7b0 /src/collision/Collision.cpp | |
| parent | Merge pull request #1004 from GaryOderNichts/fix1 (diff) | |
| download | re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.tar re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.tar.gz re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.tar.bz2 re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.tar.lz re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.tar.xz re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.tar.zst re3-2b269ff1c0b834d9a89c3b6acbec4c73c98cd35a.zip | |
Diffstat (limited to 'src/collision/Collision.cpp')
| -rw-r--r-- | src/collision/Collision.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/collision/Collision.cpp b/src/collision/Collision.cpp index 396e3b85..9d656581 100644 --- a/src/collision/Collision.cpp +++ b/src/collision/Collision.cpp @@ -477,8 +477,16 @@ CCollision::TestLineTriangle(const CColLine &line, const CompressedVector *verts if(plane.CalcPoint(line.p0) * plane.CalcPoint(line.p1) > 0.0f) return false; + float p0dist = DotProduct(line.p1 - line.p0, normal); + +#ifdef FIX_BUGS + // line lines in the plane, assume no collision + if (p0dist == 0.0f) + return false; +#endif + // intersection parameter on line - t = -plane.CalcPoint(line.p0) / DotProduct(line.p1 - line.p0, normal); + t = -plane.CalcPoint(line.p0) / p0dist; // find point of intersection CVector p = line.p0 + (line.p1-line.p0)*t; @@ -1286,8 +1294,17 @@ CCollision::ProcessLineTriangle(const CColLine &line, if(plane.CalcPoint(line.p0) * plane.CalcPoint(line.p1) > 0.0f) return false; + float p0dist = DotProduct(line.p1 - line.p0, normal); + +#ifdef FIX_BUGS + // line lines in the plane, assume no collision + if (p0dist == 0.0f) + return false; +#endif + // intersection parameter on line - t = -plane.CalcPoint(line.p0) / DotProduct(line.p1 - line.p0, normal); + t = -plane.CalcPoint(line.p0) / p0dist; + // early out if we're beyond the mindist if(t >= mindist) return false; |