summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorChristoph Schroeder <call-schroedi@web.de>2019-03-06 11:07:24 +0100
committerChristoph Schroeder <call-schroedi@web.de>2019-03-06 12:28:54 +0100
commitdcbe55a1facc3cc2c6058dda967fcbe9fdc8c7d0 (patch)
tree87b25ecd852d376d3a421e8eea9b496721b46d80 /core
parent2940475c716eab517ca52957acc8714f195d32cb (diff)
Fixes Geometry.segment_intersects_circle working only one way.
Diffstat (limited to 'core')
-rw-r--r--core/math/geometry.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/math/geometry.h b/core/math/geometry.h
index 4b478b6b16..7347cb742a 100644
--- a/core/math/geometry.h
+++ b/core/math/geometry.h
@@ -702,9 +702,11 @@ public:
/* if we can assume that the line segment starts outside the circle (e.g. for continuous time collision detection) then the following can be skipped and we can just return the equivalent of res1 */
sqrtterm = Math::sqrt(sqrtterm);
real_t res1 = (-b - sqrtterm) / (2 * a);
- //real_t res2 = ( -b + sqrtterm ) / (2 * a);
+ real_t res2 = (-b + sqrtterm) / (2 * a);
- return (res1 >= 0 && res1 <= 1) ? res1 : -1;
+ if (res1 >= 0 && res1 <= 1) return res1;
+ if (res2 >= 0 && res2 <= 1) return res2;
+ return -1;
}
static inline Vector<Vector3> clip_polygon(const Vector<Vector3> &polygon, const Plane &p_plane) {