@woosh/meep-engine 2.89.4 → 2.89.5

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.89.4",
+  "version": "2.89.5",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/geom/2d/circle/Circle.js

@@ -1,4 +1,4 @@
-import { circleIntersectsCircle } from "./circleIntersectsCircle.js";
+import { circle_intersects_circle } from "./circle_intersects_circle.js";
 
 /**
  * A circle or a 2-dimensional sphere. Represented as a position (x,y) and radius (r)
@@ -59,7 +59,7 @@ Circle.prototype.overlaps = function (other) {
     const y1 = other.y;
     const r1 = other.r;
 
-    return circleIntersectsCircle(x0, y0, r0, x1, y1, r1);
+    return circle_intersects_circle(x0, y0, r0, x1, y1, r1);
 };
 
 /**

package/src/core/geom/2d/circle/circle_compute_circle_intersection.d.ts

@@ -0,0 +1,14 @@
+/**
+ *
+ * @param {number[]} result
+ * @param {number} result_offset
+ * @param {number} a_center_x
+ * @param {number} a_center_y
+ * @param {number} a_radius
+ * @param {number} b_center_x
+ * @param {number} b_center_y
+ * @param {number} b_radius
+ * @returns {boolean} if intersection exists, false otherwise
+ */
+export function circle_compute_circle_intersection(result: number[], result_offset: number, a_center_x: number, a_center_y: number, a_radius: number, b_center_x: number, b_center_y: number, b_radius: number): boolean;
+//# sourceMappingURL=circle_compute_circle_intersection.d.ts.map

package/src/core/geom/2d/circle/circle_compute_circle_intersection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"circle_compute_circle_intersection.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circle_compute_circle_intersection.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,2DAVW,MAAM,EAAE,iBACR,MAAM,cACN,MAAM,cACN,MAAM,YACN,MAAM,cACN,MAAM,cACN,MAAM,YACN,MAAM,GACJ,OAAO,CAqDnB"}

package/src/core/geom/2d/circle/circle_compute_circle_intersection.js

@@ -0,0 +1,64 @@
+/**
+ *
+ * @param {number[]} result
+ * @param {number} result_offset
+ * @param {number} a_center_x
+ * @param {number} a_center_y
+ * @param {number} a_radius
+ * @param {number} b_center_x
+ * @param {number} b_center_y
+ * @param {number} b_radius
+ * @returns {boolean} if intersection exists, false otherwise
+ */
+export function circle_compute_circle_intersection(
+    result,
+    result_offset,
+    a_center_x, a_center_y, a_radius,
+    b_center_x, b_center_y, b_radius
+) {
+
+    // see https://math.stackexchange.com/a/1033561
+
+    const abx = a_center_x - b_center_x;
+    const aby = a_center_y - b_center_y;
+
+    const d2 = abx * abx + aby * aby;
+
+    if (d2 === 0) {
+        // centers are at the same coordinate, no intersection possible except for full overlap
+        // Continuing would lead to division by 0, so we treat this as no-intersection
+        return false;
+    }
+
+    const d = Math.sqrt(d2);
+
+    if (d > a_radius + b_radius) {
+        // no intersection
+        return false;
+    }
+
+    if (d < Math.abs(a_radius - b_radius)) {
+        // one circle is fully within another
+        return false;
+    }
+
+    const a_radius2 = a_radius * a_radius;
+    const l = (a_radius2 - b_radius * b_radius + d * d) / (2 * d);
+    const h = Math.sqrt(a_radius2 - l * l)
+
+    const l_d = l / d;
+    const h_d = h / d;
+
+    const bax = b_center_x - a_center_x;
+    const bay = b_center_y - a_center_y;
+
+    // compute first root
+    result[result_offset] = l_d * bax + h_d * bay + a_center_x;
+    result[result_offset + 1] = l_d * bay - h_d * bax + a_center_y;
+
+    // second root
+    result[result_offset + 2] = l_d * bax - h_d * bay + a_center_x;
+    result[result_offset + 3] = l_d * bay + h_d * bax + a_center_y;
+
+    return true;
+}

package/src/core/geom/2d/circle/circle_compute_circle_intersection.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=circle_compute_circle_intersection.spec.d.ts.map

package/src/core/geom/2d/circle/circle_compute_circle_intersection.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"circle_compute_circle_intersection.spec.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circle_compute_circle_intersection.spec.js"],"names":[],"mappings":""}

package/src/core/geom/2d/circle/circle_compute_circle_intersection.spec.js

@@ -0,0 +1,79 @@
+import { circle_compute_circle_intersection } from "./circle_compute_circle_intersection.js";
+
+test("non-intersecting point circles", () => {
+    expect(
+        circle_compute_circle_intersection(
+            [], 0,
+            0, 0, 0,
+            1, 0, 0
+        )
+    ).toBe(false);
+
+    expect(
+        circle_compute_circle_intersection(
+            [], 0,
+            1, 0, 0,
+            0, 0, 0
+        )
+    ).toBe(false);
+
+    expect(
+        circle_compute_circle_intersection(
+            [], 0,
+            0, 1, 0,
+            0, 0, 0
+        )
+    ).toBe(false);
+
+    expect(
+        circle_compute_circle_intersection(
+            [], 0,
+            0, 0, 0,
+            0, 1, 0
+        )
+    ).toBe(false);
+});
+
+test("circle inside circle", () => {
+
+
+    expect(
+        circle_compute_circle_intersection(
+            [], 0,
+            2, 3, 5,
+            3, 4, 11
+        )
+    ).toBe(false);
+
+
+});
+
+test("touching case", () => {
+
+    const result = [];
+
+    expect(
+        circle_compute_circle_intersection(
+            result, 0,
+            1, 3, 5,
+            7, 3, 1
+        )
+    ).toBe(true);
+
+    expect(result).toEqual([6, 3, 6, 3]);
+});
+
+test("2 intersection points", () => {
+
+    const result = [];
+
+    expect(
+        circle_compute_circle_intersection(
+            result, 0,
+            -0.5, 0, 1,
+            0.5, 0, 1
+        )
+    ).toBe(true);
+
+    expect(result).toEqual([0, -0.5 * Math.sqrt(3), 0, +0.5 * Math.sqrt(3)]);
+});

package/src/core/geom/2d/circle/{computeCircleCirclePenetrationDistance.d.ts → circle_compute_circle_penetration.d.ts}

@@ -8,5 +8,5 @@
  * @param {number} br Radius of second circle
  * @returns {number} positive value means that there is penetration, negative means that circles are separated
  */
-export function computeCircleCirclePenetrationDistance(ax: number, ay: number, ar: number, bx: number, by: number, br: number): number;
-//# sourceMappingURL=computeCircleCirclePenetrationDistance.d.ts.map
+export function circle_compute_circle_penetration(ax: number, ay: number, ar: number, bx: number, by: number, br: number): number;
+//# sourceMappingURL=circle_compute_circle_penetration.d.ts.map

package/src/core/geom/2d/circle/circle_compute_circle_penetration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"circle_compute_circle_penetration.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circle_compute_circle_penetration.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,sDARW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,MAAM,CAuBlB"}

package/src/core/geom/2d/circle/{computeCircleCirclePenetrationDistance.js → circle_compute_circle_penetration.js}

@@ -8,7 +8,11 @@
  * @param {number} br Radius of second circle
  * @returns {number} positive value means that there is penetration, negative means that circles are separated
  */
-export function computeCircleCirclePenetrationDistance(ax, ay, ar, bx, by, br) {
+export function circle_compute_circle_penetration(
+    ax, ay, ar,
+    bx, by, br
+) {
+
     const dx = bx - ax;
     const dy = by - ax;
 
@@ -24,7 +28,5 @@ export function computeCircleCirclePenetrationDistance(ax, ay, ar, bx, by, br) {
      */
     const minSeparation = ar + br;
 
-    const result = minSeparation - distance;
-
-    return result;
+    return minSeparation - distance;
 }

package/src/core/geom/2d/circle/{circleIntersectsCircle.d.ts → circle_intersects_circle.d.ts}

@@ -8,5 +8,5 @@
  * @param {number} r1 Radius is second circle
  * @returns {boolean}
  */
-export function circleIntersectsCircle(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): boolean;
-//# sourceMappingURL=circleIntersectsCircle.d.ts.map
+export function circle_intersects_circle(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): boolean;
+//# sourceMappingURL=circle_intersects_circle.d.ts.map

package/src/core/geom/2d/circle/circle_intersects_circle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"circle_intersects_circle.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circle_intersects_circle.js"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,6CARW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,OAAO,CAQnB"}

package/src/core/geom/2d/circle/{circleIntersectsCircle.js → circle_intersects_circle.js}

@@ -10,7 +10,7 @@ import { v2_distance } from "../../vec2/v2_distance.js";
  * @param {number} r1 Radius is second circle
  * @returns {boolean}
  */
-export function circleIntersectsCircle(x0, y0, r0, x1, y1, r1) {
+export function circle_intersects_circle(x0, y0, r0, x1, y1, r1) {
     const minSeparation = r0 + r1;
 
     const distance = v2_distance(x0, y0, x1, y1);

package/src/core/geom/2d/circle/{circleIntersectsPoint.d.ts → circle_intersects_point.d.ts}

@@ -7,5 +7,5 @@
  * @param {number} py Point coordinate Y
  * @returns {boolean}
  */
-export function circleIntersectsPoint(cx: number, cy: number, cr: number, px: number, py: number): boolean;
-//# sourceMappingURL=circleIntersectsPoint.d.ts.map
+export function circle_intersects_point(cx: number, cy: number, cr: number, px: number, py: number): boolean;
+//# sourceMappingURL=circle_intersects_point.d.ts.map

package/src/core/geom/2d/circle/circle_intersects_point.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"circle_intersects_point.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circle_intersects_point.js"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,4CAPW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,OAAO,CAMnB"}

package/src/core/geom/2d/circle/{circleIntersectsPoint.js → circle_intersects_point.js}

@@ -9,7 +9,7 @@ import { v2_distance } from "../../vec2/v2_distance.js";
  * @param {number} py Point coordinate Y
  * @returns {boolean}
  */
-export function circleIntersectsPoint(cx, cy, cr, px, py) {
+export function circle_intersects_point(cx, cy, cr, px, py) {
     const distance = v2_distance(cx, cx, px, py);
 
     return distance < cr;

package/src/core/geom/2d/shape/CircleShape.js

@@ -1,5 +1,5 @@
-import { circleIntersectsCircle } from "../circle/circleIntersectsCircle.js";
-import { circleIntersectsPoint } from "../circle/circleIntersectsPoint.js";
+import { circle_intersects_circle } from "../circle/circle_intersects_circle.js";
+import { circle_intersects_point } from "../circle/circle_intersects_point.js";
 import { AbstractShape } from "./AbstractShape.js";
 
 export class CircleShape extends AbstractShape {
@@ -52,11 +52,11 @@ export class CircleShape extends AbstractShape {
     }
 
     intersectsPoint(x, y) {
-        return circleIntersectsPoint(this.x, this.y, this.radius, x, y);
+        return circle_intersects_point(this.x, this.y, this.radius, x, y);
     }
 
     intersectsCircle(x, y, radius) {
-        return circleIntersectsCircle(x, y, radius, this.x, this.y, this.radius);
+        return circle_intersects_circle(x, y, radius, this.x, this.y, this.radius);
     }
 }
 

package/src/core/geom/2d/shape/PointShape.js

@@ -1,4 +1,4 @@
-import { circleIntersectsPoint } from "../circle/circleIntersectsPoint.js";
+import { circle_intersects_point } from "../circle/circle_intersects_point.js";
 import { AbstractShape } from "./AbstractShape.js";
 
 export class PointShape extends AbstractShape {
@@ -23,7 +23,7 @@ export class PointShape extends AbstractShape {
     }
 
     intersectsCircle(x, y, radius) {
-        return circleIntersectsPoint(x, y, radius, this.x, this.y);
+        return circle_intersects_point(x, y, radius, this.x, this.y);
     }
 }
 

package/src/generation/markers/MarkerNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkerNode.d.ts","sourceRoot":"","sources":["../../../../src/generation/markers/MarkerNode.js"],"names":[],"mappings":"AAKA;IAEI;;;OAGG;IACH,UAFU,MAAM,CAEH;IAEb;;;OAGG;IACH,aAAY;IAEZ;;;OAGG;IACH,MAFU,QAAQ,CAER;IAEV;;;OAGG;IACH,UAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,WAFU,SAAS,CAES;IAE5B;;;;OAIG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,gBAAgB;IAGhB;;;;OAIG;IACH,YAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;;OAIG;IACH,iBAHW,MAAM,EAAE,GACN,OAAO,CAanB;IAED;;;OAGG;IACH,SAFa,UAAU,CAQtB;IAED;;;OAGG;IACH,YAFW,UAAU,QAcpB;IAED;;;;OAIG;IACH,gBAHW,UAAU,GACR,OAAO,CAOnB;IAIL;;;OAGG;IACH,uBAFU,OAAO,CAEgB;CANhC;oBAxHmB,4BAA4B;0BACtB,yCAAyC"}
+{"version":3,"file":"MarkerNode.d.ts","sourceRoot":"","sources":["../../../../src/generation/markers/MarkerNode.js"],"names":[],"mappings":"AAKA;IAEI;;;OAGG;IACH,UAFU,MAAM,CAEH;IAEb;;;OAGG;IACH,aAAY;IAEZ;;;OAGG;IACH,MAFU,QAAQ,CAER;IAEV;;;OAGG;IACH,UAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,WAFU,SAAS,CAES;IAE5B;;;;OAIG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,gBAAgB;IAGhB;;;;OAIG;IACH,YAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;;OAIG;IACH,iBAHW,MAAM,EAAE,GACN,OAAO,CAanB;IAED;;;OAGG;IACH,SAFa,UAAU,CAQtB;IAED;;;OAGG;IACH,YAFW,UAAU,QAcpB;IAED;;;;OAIG;IACH,gBAHW,UAAU,GACR,OAAO,CAOnB;IAIL;;;OAGG;IACH,uBAFU,OAAO,CAEgB;CANhC;oBAtHmB,4BAA4B;0BACtB,yCAAyC"}

package/src/generation/markers/MarkerNode.js

@@ -1,7 +1,7 @@
+import { array_copy_entire } from "../../core/collection/array/array_copy_entire.js";
+import { circle_intersects_circle } from "../../core/geom/2d/circle/circle_intersects_circle.js";
 import Vector2 from "../../core/geom/Vector2.js";
 import { Transform } from "../../engine/ecs/transform/Transform.js";
-import { circleIntersectsCircle } from "../../core/geom/2d/circle/circleIntersectsCircle.js";
-import { array_copy_entire } from "../../core/collection/array/array_copy_entire.js";
 
 export class MarkerNode {
 
@@ -115,7 +115,7 @@ export class MarkerNode {
         const p0 = this.transform.position;
         const p1 = other.transform.position;
 
-        return circleIntersectsCircle(p0.x, p0.y, this.size, p1.x, p1.y, other.size);
+        return circle_intersects_circle(p0.x, p0.y, this.size, p1.x, p1.y, other.size);
     }
 
 }

package/src/core/geom/2d/circle/circleIntersectsCircle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"circleIntersectsCircle.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circleIntersectsCircle.js"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,2CARW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,OAAO,CAQnB"}

package/src/core/geom/2d/circle/circleIntersectsPoint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"circleIntersectsPoint.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/circleIntersectsPoint.js"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,0CAPW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,OAAO,CAMnB"}

package/src/core/geom/2d/circle/computeCircleCirclePenetrationDistance.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"computeCircleCirclePenetrationDistance.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/circle/computeCircleCirclePenetrationDistance.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,2DARW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,MAAM,CAqBlB"}