Fix #165

tophat2d · Mar 11, 2024 · 0d814e1 · 0d814e1
1 parent 2d60e20
commit 0d814e1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/lib/miniaudio b/lib/miniaudio
diff --git a/lib/umka b/lib/umka
diff --git a/src/collisions.c b/src/collisions.c
@@ -1,4 +1,5 @@
 // line to line is stolen from: http://jeffreythompson.org/collision-detection/table_of_contents.php
+#include <float.h>
 #include <math.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -42,14 +43,37 @@ th_point_to_quad(th_vf2 p, th_quad *q, th_vf2 *ic)
 	return coll;
 }
 
+static fu
+point_distance(th_vf2 a, th_vf2 b)
+{
+	a.x -= b.x;
+	a.y -= b.y;
+	return a.x * a.x + a.y * a.y;
+}
+
 uu
 th_line_to_quad(th_vf2 b, th_vf2 e, th_quad *q, th_vf2 *ic)
 {
-	for (uu i = 0; i < 4; i++)
-		if (th_line_to_line(b, e, q->v[i], q->v[(i + 1) % 4], ic))
-			return 1;
+	th_vf2 ic_c;	      // closest incident point
+	float ic_d = FLT_MAX; // incident distance
+	bool collision = false;
 
-	return 0;
+	for (uu i = 0; i < 4; i++) {
+		th_vf2 ic_n; // current incident point
+
+		if (th_line_to_line(b, e, q->v[i], q->v[(i + 1) % 4], &ic_n)) {
+			float ic_nd = point_distance(b, ic_n);
+			if (ic_nd < ic_d) {
+				ic_d = ic_nd;
+				ic_c = ic_n;
+			}
+			collision = true;
+		}
+	}
+
+	*ic = ic_c;
+
+	return collision;
 }
 
 uu

diff --git a/src/raycast.c b/src/raycast.c
@@ -11,9 +11,8 @@ th_ray_getcoll(
 	for (int i = 0; i < sceneLen && *collCount < maxColls; i++) {
 		th_quad q = th_ent_transform(scene[i]);
 
-		if (th_line_to_quad(ra->pos, p2, &q, &colls[*collCount].pos) ||
-		    // in case the ray is completely inside the quad
-		    th_point_to_quad(ra->pos, &q, &colls[*collCount].pos)) {
+		if (th_point_to_quad(ra->pos, &q, &colls[*collCount].pos) ||
+		    th_line_to_quad(ra->pos, p2, &q, &colls[*collCount].pos)) {
 			++(*collCount);
 		}
 	}
+0 −13		CHANGES.md
+51 −70		extras/miniaudio_split/miniaudio.c
+3 −4		extras/miniaudio_split/miniaudio.h
+53 −73		miniaudio.h
+0 −1		tests/test_deviceio/ma_test_deviceio.c
+37 −52		doc/lang.md
+23 −19		examples/lisp/lex.um
+4 −4		examples/lisp/parse.um
+1 −1		playground/umka.js
+16 −17		src/umka_decl.c
+140 −133		src/umka_expr.c
+2 −2		src/umka_expr.h
+1 −1		src/umka_ident.c
+45 −45		src/umka_stmt.c
+4 −25		src/umka_types.c
+10 −7		src/umka_types.h
+29 −17		tests/enums.um
+7 −1		tests/expected.log
+24 −1		tests/safecast.um