Fixes issue with one intersection and two roots

kaplayjs · Oct 25, 2024 · c184bd1 · c184bd1
1 parent 2fa7ac3
commit c184bd1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/examples/clip.js b/examples/clip.js
@@ -91,4 +91,3 @@ scene("circle", () => {
 });
 
 go("circle");
-
diff --git a/src/math/math.ts b/src/math/math.ts
@@ -1749,11 +1749,25 @@ export function clipLineToCircle(
     else {
         const t1 = (-b + Math.sqrt(dis)) / (2 * a);
         const t2 = (-b - Math.sqrt(dis)) / (2 * a);
-        if ((t1 >= 0 && t1 <= 1) || (t2 >= 0 && t2 <= 1)) {
+        const b1 = t1 >= 0 && t1 <= 1;
+        const b2 = t2 >= 0 && t2 <= 1;
+        if (b1 && b2) {
             Vec2.addScaled(l.p1, v, t1, result.p1);
             Vec2.addScaled(l.p1, v, t2, result.p2);
             return true;
         }
+        else if (b1 || b2) {
+            const t = b1 ? t1 : t2;
+            if (testCirclePoint(circle, l.p1)) {
+                Vec2.copy(l.p1, result.p1);
+                Vec2.addScaled(l.p1, v, t, result.p2);
+            }
+            else {
+                Vec2.addScaled(l.p1, v, t, result.p1);
+                Vec2.copy(l.p2, result.p2);
+            }
+            return true;
+        }
     }
 
     // Check if line is completely within the circle
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,4 +91,3 @@ scene("circle", () => {
		});

		go("circle");