refactor: small collision fn stuff

leia-uwu · Sep 14, 2024 · 5e63447 · 5e63447
1 parent 0f1f1bc
commit 5e63447
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/shared/utils/coldet.ts b/shared/utils/coldet.ts
@@ -331,13 +331,7 @@ export const coldet = {
         return null;
     },
 
-    intersectAabbCircle(
-        min: Vec2,
-        max: Vec2,
-        pos: Vec2,
-        rad: number,
-        _isPlayerCollision = false,
-    ) {
+    intersectAabbCircle(min: Vec2, max: Vec2, pos: Vec2, rad: number) {
         if (pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y) {
             const e = v2.mul(v2.sub(max, min), 0.5);
             const c = v2.add(min, e);
@@ -359,9 +353,7 @@ export const coldet = {
             math.clamp(pos.x, min.x, max.x),
             math.clamp(pos.y, min.y, max.y),
         );
-        let dir = v2.sub(pos, cpt);
-
-        dir = v2.sub(pos, cpt);
+        const dir = v2.sub(pos, cpt);
 
         const dstSqr = v2.lengthSqr(dir);
         if (dstSqr < rad * rad) {

diff --git a/shared/utils/collider.ts b/shared/utils/collider.ts
@@ -105,7 +105,7 @@ export const collider = {
 
         return pts;
     },
-    // @TODO: Ensure consistent pen dirs (ie towards 2nd arg)
+
     intersectCircle(col: Collider, pos: Vec2, rad: number) {
         if (col.type === collider.Type.Aabb) {
             return coldet.intersectAabbCircle(col.min, col.max, pos, rad);
@@ -117,7 +117,6 @@ export const collider = {
         if (col.type === collider.Type.Aabb) {
             return coldet.intersectAabbAabb(col.min, col.max, min, max);
         }
-        // @TODO: pen dir is reversed
         return coldet.intersectAabbCircle(min, max, col.pos, col.rad);
     },