From 2c36078be43f5008c1baa05ea507bb24809055d4 Mon Sep 17 00:00:00 2001 From: Evgeny Savelyev Date: Sat, 12 Jan 2019 00:38:16 +0300 Subject: [PATCH] fixed invalid implementations of Plane::intersects_segment and Plane::intersects_ray --- core/math/plane.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/math/plane.cpp b/core/math/plane.cpp index cd3cbce300f..ee59a0e1712 100644 --- a/core/math/plane.cpp +++ b/core/math/plane.cpp @@ -115,15 +115,14 @@ bool Plane::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 return false; } - real_t dist = (normal.dot(p_from) - d) / den; + real_t dist = (-normal.dot(p_from) - d) / den; //printf("dist is %i\n",dist); - if (dist > CMP_EPSILON) { //this is a ray, before the emitting pos (p_from) doesn't exist + if (dist < -CMP_EPSILON) { //this is a ray, before the emitting pos (p_from) doesn't exist return false; } - dist = -dist; *p_intersection = p_from + segment * dist; return true; @@ -140,7 +139,7 @@ bool Plane::intersects_segment(const Vector3 &p_begin, const Vector3 &p_end, Vec return false; } - real_t dist = (normal.dot(p_begin) - d) / den; + real_t dist = (-normal.dot(p_begin) - d) / den; //printf("dist is %i\n",dist); if (dist < -CMP_EPSILON || dist > (1.0 + CMP_EPSILON)) { @@ -148,7 +147,6 @@ bool Plane::intersects_segment(const Vector3 &p_begin, const Vector3 &p_end, Vec return false; } - dist = -dist; *p_intersection = p_begin + segment * dist; return true;