use more permissive comparisons

pygame-community · Jul 25, 2024 · 609d52a · 609d52a
1 parent 34e3a8d
commit 609d52a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src_c/collisions.c b/src_c/collisions.c
@@ -605,7 +605,7 @@ pgIntersection_CircleCircle(pgCircleBase *A, pgCircleBase *B,
         return 0;
     }
 
-    if (d2 == 0 && A->r == B->r) {
+    if (double_compare(d2, 0) && double_compare(A->r, B->r)) {
         return 0;
     }
 
@@ -621,7 +621,7 @@ pgIntersection_CircleCircle(pgCircleBase *A, pgCircleBase *B,
     double xs2 = xm - h * (dy / d);
     double ys2 = ym + h * (dx / d);
 
-    if (d2 == r_sum2 || d2 == r_diff2) {
+    if (double_compare(d2, r_sum2) || double_compare(d2, r_diff2)) {
         intersections[0] = xs1;
         intersections[1] = ys1;
         return 1;

diff --git a/src_c/include/geometry.h b/src_c/include/geometry.h
@@ -147,4 +147,12 @@ PG_FREEPOLY_COND(pgPolygonBase *poly, int was_sequence)
     }
 }
 
+static int
+double_compare(double a, double b)
+{
+    /* Uses both a fixed epsilon and an adaptive epsilon */
+    const double e = 1e-6;
+    return fabs(a - b) < e || fabs(a - b) <= e * MAX(fabs(a), fabs(b));
+}
+
 #endif /* ~_GEOMETRY_H */