@daneren2005/shared-memory-physics 1.2.0 → 1.2.2

package/dist/index.js

@@ -1,8 +1,9 @@
 import e from "flatbush";
-import { addAtomicFloat32 as t, loadFloat32 as n, storeFloat32 as r } from "@daneren2005/shared-memory-objects";
-import { ComponentSystem as i } from "@daneren2005/shared-memory-ecs";
+import { ComponentSystem as t, DEAD_INDEX as n } from "@daneren2005/shared-memory-ecs";
+import { addAtomicFloat32 as r } from "@daneren2005/shared-memory-objects/utils/atomic-math";
+import { loadFloat32 as i, storeFloat32 as a } from "@daneren2005/shared-memory-objects/utils/float32-atomics";
 //#region src/components/transform-component.ts
-var a = 0, o = 1, s = 2, c = 3, l = 4, u = 5, d = {
+var o = 0, s = 1, c = 2, l = 3, u = 4, d = 5, f = {
 	type: Float32Array,
 	size: 5,
 	loadProperties: [
@@ -63,7 +64,7 @@ var a = 0, o = 1, s = 2, c = 3, l = 4, u = 5, d = {
 			y: e.y
 		};
 	}
-}, f = 0, p = 1, m = 2, h = {
+}, p = 0, m = 1, h = 2, g = {
 	type: Float32Array,
 	size: 2,
 	loadProperties: ["velocityX", "velocityY"],
@@ -91,19 +92,19 @@ var a = 0, o = 1, s = 2, c = 3, l = 4, u = 5, d = {
 			velocityY: e.velocityY
 		};
 	}
-}, g = 1, _ = 2, v = 3, y = [
+}, _ = 1, v = 2, y = 3, b = [
 	1,
 	2,
 	3
-], b = 1, x = 4294967295;
-function ee(e, t, n, r) {
+], x = 1, S = 4294967295;
+function C(e, t, n, r) {
 	return (t & n) !== 0 && (r & e) !== 0;
 }
-var te = 0, ne = 1, re = 2, ie = 3, ae = 4;
-function oe(e) {
+var w = 0, T = 1, E = 2, D = 3, O = 4;
+function k(e) {
 	return e[3] !== 0;
 }
-var S = {
+var A = {
 	type: Uint32Array,
 	size: 4,
 	loadProperties: [
@@ -117,7 +118,7 @@ var S = {
 	],
 	load(e, t, n) {
 		let r = t.create([
-			se(n),
+			ee(n),
 			n.collideCategory ?? 1,
 			n.collideMask ?? 4294967295,
 			+!!n.sensor
@@ -151,15 +152,15 @@ var S = {
 		};
 	}
 };
-function se(e) {
+function ee(e) {
 	let t = e.shape;
 	if (t === void 0) return e.radius === void 0 ? 1 : 2;
-	if (!y.includes(t)) throw Error(`Unknown body shape: ${t}`);
+	if (!b.includes(t)) throw Error(`Unknown body shape: ${t}`);
 	return t;
 }
 //#endregion
 //#region src/components/bounciness-component.ts
-var ce = 0, le = 1, C = {
+var te = 0, ne = 1, re = {
 	type: Float32Array,
 	size: 1,
 	loadProperties: ["bounciness"],
@@ -175,7 +176,7 @@ var ce = 0, le = 1, C = {
 			}
 		};
 	}
-}, ue = 0, de = 1, fe = 2, pe = 3, me = 4, he = 5, ge = 6, _e = 7, ve = 8, w = {
+}, ie = 0, ae = 1, oe = 2, se = 3, ce = 4, le = 5, ue = 6, de = 7, fe = 8, pe = {
 	type: Float32Array,
 	size: 8,
 	loadProperties: ["interpolate"],
@@ -219,106 +220,153 @@ var ce = 0, le = 1, C = {
 		};
 	}
 };
-function ye(e) {
+function me(e) {
 	let { transform: t, interpolation: n } = e.components;
 	!t || !n || (n.prevX = n.x = t.x, n.prevY = n.y = t.y);
 }
 //#endregion
 //#region src/components/registry.ts
-var be = {
-	transform: d,
-	velocity: h,
-	body: S,
-	bounciness: C,
-	interpolation: w
+var he = {
+	transform: f,
+	velocity: g,
+	body: A,
+	bounciness: re,
+	interpolation: pe
+}, j = {
+	x: 0,
+	y: 0
+}, M = {
+	x: 0,
+	y: 0
 };
-//#endregion
-//#region src/math/shapes.ts
-function T(e, t) {
+function N(e, t) {
 	return Math.max(0, (e - t) / 2);
 }
-function E(e, t, n) {
+function P(e, t, n) {
 	return e === 2 ? t / 2 : e === 3 ? n / 2 : 0;
 }
-function D(e, t, n) {
+function F(e, t, n) {
 	return e === 2 ? t <= 0 : e === 3 ? n <= 0 : t <= 0 || n <= 0;
 }
-function O(e, t, n, r) {
-	return e === 2 ? t / 2 : e === 3 ? Math.abs(Math.cos(r)) * T(t, n) + n / 2 : M(t, n, r);
+function I(e, t, n, r) {
+	return e === 2 ? t / 2 : e === 3 ? Math.abs(Math.cos(r)) * N(t, n) + n / 2 : Se(t, n, r);
 }
-function k(e, t, n, r) {
-	return e === 2 ? t / 2 : e === 3 ? Math.abs(Math.sin(r)) * T(t, n) + n / 2 : N(t, n, r);
+function L(e, t, n, r) {
+	return e === 2 ? t / 2 : e === 3 ? Math.abs(Math.sin(r)) * N(t, n) + n / 2 : Ce(t, n, r);
 }
-function A(e, t, n, r, i, a, o, s, c, l, u, d) {
-	if (D(e, r, i) || D(o, l, u)) return !1;
+function R(e, t, n, r, i, a, o, s, c, l, u, d) {
+	if (F(e, r, i) || F(o, l, u)) return !1;
 	let f = e !== 1, p = o !== 1;
-	if (!f && !p) return P(t, n, r, i, a, s, c, l, u, d);
-	if (f && !p) return A(o, s, c, l, u, d, e, t, n, r, i, a);
-	let m = j(o, l, u), h = Math.cos(d) * m, g = Math.sin(d) * m, _ = E(o, l, u);
-	if (!f) return L(s - h, c - g, s + h, c + g, t, n, r, i, a) < _ * _;
-	let v = j(e, r, i), y = Math.cos(a) * v, b = Math.sin(a) * v, x = E(e, r, i) + _;
-	return I(t - y, n - b, t + y, n + b, s - h, c - g, s + h, c + g) < x * x;
-}
-function j(e, t, n) {
-	return e === 3 ? T(t, n) : 0;
-}
-function M(e, t, n) {
+	if (!f && !p) return we(t, n, r, i, a, s, c, l, u, d);
+	if (f && !p) return R(o, s, c, l, u, d, e, t, n, r, i, a);
+	let m = z(o, l, u), h = Math.cos(d) * m, g = Math.sin(d) * m, _ = P(o, l, u);
+	if (!f) return U(s - h, c - g, s + h, c + g, t, n, r, i, a) < _ * _;
+	let v = z(e, r, i), y = Math.cos(a) * v, b = Math.sin(a) * v, x = P(e, r, i) + _;
+	return H(t - y, n - b, t + y, n + b, s - h, c - g, s + h, c + g) < x * x;
+}
+function z(e, t, n) {
+	return e === 3 ? N(t, n) : 0;
+}
+function ge(e, t, n, r, i, a, o, s, c, l, u, d, f) {
+	let p = e !== 1, m = o !== 1;
+	return !p && !m ? _e(t, n, r, i, a, s, c, l, u, d, f) : p && m ? ve(e, t, n, r, i, a, o, s, c, l, u, d, f) : p ? ye(s, c, l, u, d, e, t, n, r, i, a, f) : ye(t, n, r, i, a, o, s, c, l, u, d, f) ? (f.x = -f.x, f.y = -f.y, !0) : !1;
+}
+function _e(e, t, n, r, i, a, o, s, c, l, u) {
+	let d = Math.cos(i), f = Math.sin(i), p = Math.cos(l), m = Math.sin(l), h = n / 2, g = r / 2, _ = s / 2, v = c / 2, y = e - a, b = t - o, x = V(d, f, y, b, h, g, d, f, _, v, p, m);
+	u.x = d, u.y = f;
+	let S = V(-f, d, y, b, h, g, d, f, _, v, p, m);
+	return S < x && (x = S, u.x = -f, u.y = d), S = V(p, m, y, b, h, g, d, f, _, v, p, m), S < x && (x = S, u.x = p, u.y = m), S = V(-m, p, y, b, h, g, d, f, _, v, p, m), S < x && (u.x = -m, u.y = p), be(y, b, u), !0;
+}
+function ve(e, t, n, r, i, a, o, s, c, l, u, d, f) {
+	let p = z(e, r, i), m = Math.cos(a) * p, h = Math.sin(a) * p, g = z(o, l, u), _ = Math.cos(d) * g, v = Math.sin(d) * g, y = Math.sqrt(H(t - m, n - h, t + m, n + h, s - _, c - v, s + _, c + v, j));
+	return y > 0 ? (f.x = j.x / y, f.y = j.y / y, !0) : xe(t - s, n - c, f);
+}
+function ye(e, t, n, r, i, a, o, s, c, l, u, d) {
+	let f = z(a, c, l), p = Math.cos(u) * f, m = Math.sin(u) * f, h = Math.sqrt(U(o - p, s - m, o + p, s + m, e, t, n, r, i, j));
+	if (h > 0) return d.x = j.x / h, d.y = j.y / h, !0;
+	let g = Math.cos(i), _ = Math.sin(i), v = o - e, y = s - t, b = v * g + y * _, x = -v * _ + y * g, S = p * g + m * _, C = -p * _ + m * g, w = P(a, c, l), T = n / 2, E = r / 2, D = B(1, 0, b, x, S, C, w, T, E);
+	d.x = 1, d.y = 0;
+	let O = B(0, 1, b, x, S, C, w, T, E);
+	O < D && (D = O, d.x = 0, d.y = 1), xe(-C, S, M) && (O = B(M.x, M.y, b, x, S, C, w, T, E), O < D && (d.x = M.x, d.y = M.y)), be(b, x, d);
+	let k = d.x, A = d.y;
+	return d.x = k * g - A * _, d.y = k * _ + A * g, !0;
+}
+function B(e, t, n, r, i, a, o, s, c) {
+	return s * Math.abs(e) + c * Math.abs(t) + (Math.abs(i * e + a * t) + o) - Math.abs(n * e + r * t);
+}
+function be(e, t, n) {
+	e * n.x + t * n.y < 0 && (n.x = -n.x, n.y = -n.y);
+}
+function xe(e, t, n) {
+	let r = Math.sqrt(e * e + t * t);
+	return r === 0 ? !1 : (n.x = e / r, n.y = t / r, !0);
+}
+function Se(e, t, n) {
 	return (Math.abs(Math.cos(n)) * e + Math.abs(Math.sin(n)) * t) / 2;
 }
-function N(e, t, n) {
+function Ce(e, t, n) {
 	return (Math.abs(Math.sin(n)) * e + Math.abs(Math.cos(n)) * t) / 2;
 }
-function P(e, t, n, r, i, a, o, s, c, l) {
+function we(e, t, n, r, i, a, o, s, c, l) {
 	if (n <= 0 || r <= 0 || s <= 0 || c <= 0) return !1;
 	let u = Math.cos(i), d = Math.sin(i), f = Math.cos(l), p = Math.sin(l), m = n / 2, h = r / 2, g = s / 2, _ = c / 2, v = a - e, y = o - t;
-	return !F(u, d, v, y, m, h, u, d, g, _, f, p) && !F(-d, u, v, y, m, h, u, d, g, _, f, p) && !F(f, p, v, y, m, h, u, d, g, _, f, p) && !F(-p, f, v, y, m, h, u, d, g, _, f, p);
+	return V(u, d, v, y, m, h, u, d, g, _, f, p) > 0 && V(-d, u, v, y, m, h, u, d, g, _, f, p) > 0 && V(f, p, v, y, m, h, u, d, g, _, f, p) > 0 && V(-p, f, v, y, m, h, u, d, g, _, f, p) > 0;
 }
-function F(e, t, n, r, i, a, o, s, c, l, u, d) {
-	let f = i * Math.abs(o * e + s * t) + a * Math.abs(-s * e + o * t), p = c * Math.abs(u * e + d * t) + l * Math.abs(-d * e + u * t);
-	return Math.abs(n * e + r * t) >= f + p;
+function V(e, t, n, r, i, a, o, s, c, l, u, d) {
+	return i * Math.abs(o * e + s * t) + a * Math.abs(-s * e + o * t) + (c * Math.abs(u * e + d * t) + l * Math.abs(-d * e + u * t)) - Math.abs(n * e + r * t);
 }
-function I(e, t, n, r, i, a, o, s) {
-	let c = n - e, l = r - t, u = o - i, d = s - a, f = e - i, p = t - a, m = c * c + l * l, h = u * u + d * d, g = u * f + d * p, _ = 0, v = 0;
-	if (m <= 0 && h <= 0) return f * f + p * p;
-	if (m <= 0) v = B(g / h);
+function H(e, t, n, r, i, a, o, s, c) {
+	let l = n - e, u = r - t, d = o - i, f = s - a, p = e - i, m = t - a, h = l * l + u * u, g = d * d + f * f, _ = d * p + f * m, v = 0, y = 0;
+	if (h <= 0 && g <= 0) return c && (c.x = p, c.y = m), p * p + m * m;
+	if (h <= 0) y = q(_ / g);
 	else {
-		let e = c * f + l * p;
-		if (h <= 0) _ = B(-e / m);
+		let e = l * p + u * m;
+		if (g <= 0) v = q(-e / h);
 		else {
-			let t = c * u + l * d, n = m * h - t * t;
-			n !== 0 && (_ = B((t * g - e * h) / n)), v = (t * _ + g) / h, v < 0 ? (v = 0, _ = B(-e / m)) : v > 1 && (v = 1, _ = B((t - e) / m));
+			let t = l * d + u * f, n = h * g - t * t;
+			n !== 0 && (v = q((t * _ - e * g) / n)), y = (t * v + _) / g, y < 0 ? (y = 0, v = q(-e / h)) : y > 1 && (y = 1, v = q((t - e) / h));
 		}
 	}
-	let y = e + c * _ - (i + u * v), b = t + l * _ - (a + d * v);
-	return y * y + b * b;
-}
-function L(e, t, n, r, i, a, o, s, c) {
-	let l = Math.cos(c), u = Math.sin(c), d = o / 2, f = s / 2, p = e - i, m = t - a, h = n - i, g = r - a, _ = p * l + m * u, v = -p * u + m * l, y = h * l + g * u, b = -h * u + g * l;
-	return xe(_, v, y, b, d, f) ? Math.min(z(_, v, d, f), z(y, b, d, f), R(-d, -f, _, v, y, b), R(d, -f, _, v, y, b), R(d, f, _, v, y, b), R(-d, f, _, v, y, b)) : 0;
-}
-function R(e, t, n, r, i, a) {
-	let o = i - n, s = a - r, c = o * o + s * s, l = c > 0 ? B(((e - n) * o + (t - r) * s) / c) : 0, u = e - (n + o * l), d = t - (r + s * l);
-	return u * u + d * d;
-}
-function xe(e, t, n, r, i, a) {
+	let b = e + l * v - (i + d * y), x = t + u * v - (a + f * y);
+	return c && (c.x = b, c.y = x), b * b + x * x;
+}
+function U(e, t, n, r, i, a, o, s, c, l) {
+	let u = Math.cos(c), d = Math.sin(c), f = o / 2, p = s / 2, m = e - i, h = t - a, g = n - i, _ = r - a, v = m * u + h * d, y = -m * d + h * u, b = g * u + _ * d, x = -g * d + _ * u;
+	if (!Te(v, y, b, x, f, p)) return l && (l.x = 0, l.y = 0), 0;
+	if (!l) return Math.min(K(v, y, f, p), K(b, x, f, p), G(-f, -p, v, y, b, x), G(f, -p, v, y, b, x), G(f, p, v, y, b, x), G(-f, p, v, y, b, x));
+	let S = K(v, y, f, p, l);
+	S = W(S, K(b, x, f, p, M), M, l, !1), S = W(S, G(-f, -p, v, y, b, x, M), M, l, !0), S = W(S, G(f, -p, v, y, b, x, M), M, l, !0), S = W(S, G(f, p, v, y, b, x, M), M, l, !0), S = W(S, G(-f, p, v, y, b, x, M), M, l, !0);
+	let C = l.x, w = l.y;
+	return l.x = C * u - w * d, l.y = C * d + w * u, S;
+}
+function W(e, t, n, r, i) {
+	return t >= e ? e : (r.x = i ? -n.x : n.x, r.y = i ? -n.y : n.y, t);
+}
+function G(e, t, n, r, i, a, o) {
+	let s = i - n, c = a - r, l = s * s + c * c, u = l > 0 ? q(((e - n) * s + (t - r) * c) / l) : 0, d = e - (n + s * u), f = t - (r + c * u);
+	return o && (o.x = d, o.y = f), d * d + f * f;
+}
+function Te(e, t, n, r, i, a) {
 	if (Math.max(e, n) < -i || Math.min(e, n) > i || Math.max(t, r) < -a || Math.min(t, r) > a) return !0;
 	let o = -(r - t), s = n - e;
 	return Math.abs(o * e + s * t) > i * Math.abs(o) + a * Math.abs(s);
 }
-function z(e, t, n, r) {
-	let i = Math.abs(e) - n, a = Math.abs(t) - r, o = i > 0 ? i : 0, s = a > 0 ? a : 0;
-	return o * o + s * s;
+function K(e, t, n, r, i) {
+	let a = Math.abs(e) - n, o = Math.abs(t) - r, s = a > 0 ? a : 0, c = o > 0 ? o : 0;
+	return i && (i.x = e < 0 ? -s : s, i.y = t < 0 ? -c : c), s * s + c * c;
 }
-function B(e) {
+function q(e) {
 	return e < 0 ? 0 : e > 1 ? 1 : e;
 }
 //#endregion
 //#region src/systems/collision.ts
-var V = 1e-4, Se = 24, H = "collidable", U = [], W = {
+var Ee = 1e-4, De = 24, Oe = "collidable", J = [], ke = 2 ** 26, Ae = {
 	fraction: 1,
-	blocking: U
-}, G = class {
+	blocking: J
+}, je = class {
 	buckets = [];
+	hasBounciness = !1;
+	resolved = /* @__PURE__ */ new Set();
 	constructor(t, n) {
 		let r = /* @__PURE__ */ new Map();
 		for (let e of t) {
@@ -327,8 +375,10 @@ var V = 1e-4, Se = 24, H = "collidable", U = [], W = {
 			let o = a[1];
 			if (o === 0) continue;
 			let s = a[0], c = i[2], l = i[3];
-			if (D(s, c, l)) continue;
-			let u = i[4], d = O(s, c, l, u), f = k(s, c, l, u), p = t.velocity, m = p ? Math.abs(p[0]) * n : 0, h = p ? Math.abs(p[1]) * n : 0, g = i[0], _ = i[1], v = r.get(o);
+			if (F(s, c, l)) continue;
+			let u = i[4], d = I(s, c, l, u), f = L(s, c, l, u);
+			t.bounciness && (this.hasBounciness = !0);
+			let p = t.velocity, m = p ? Math.abs(p[0]) * n : 0, h = p ? Math.abs(p[1]) * n : 0, g = i[0], _ = i[1], v = r.get(o);
 			v || (v = {
 				entries: [],
 				bounds: []
@@ -347,55 +397,59 @@ var V = 1e-4, Se = 24, H = "collidable", U = [], W = {
 			});
 		}
 	}
+	claimContact(e, t) {
+		let n = e < t ? e * ke + t : t * ke + e;
+		return this.resolved.has(n) ? !1 : (this.resolved.add(n), !0);
+	}
 	forEachOverlapping(e, t) {
-		let n = K(e);
+		let n = Y(e);
 		if (!n) return;
 		let { x: r, y: i, halfWidth: a, halfHeight: o } = n;
 		this.forEachCandidate(n, r - a, i - o, r + a, i + o, (e) => {
-			q(n, r, i, e) && t(e);
+			X(n, r, i, e) && t(e);
 		});
 	}
 	sweep(e, t, n) {
-		let r = Math.sqrt(t * t + n * n), i = K(e);
+		let r = Math.sqrt(t * t + n * n), i = Y(e);
 		if (!i || r === 0) return {
 			fraction: 1,
-			blocking: U
+			blocking: J
 		};
 		let a = this.gatherCandidates(i, t, n);
 		return a.length === 0 ? {
 			fraction: 1,
-			blocking: U
+			blocking: J
 		} : this.refine(i, a, t, n, r);
 	}
 	resolveMove(e, t, n, r) {
-		let i = Math.sqrt(t * t + n * n), a = K(e);
+		let i = Math.sqrt(t * t + n * n), a = Y(e);
 		if (!a || i === 0) return {
 			moveX: t,
 			moveY: n,
-			blocking: U
+			blocking: J
 		};
 		let o = this.gatherCandidates(a, t, n);
 		if (o.length === 0) return {
 			moveX: t,
 			moveY: n,
-			blocking: U
+			blocking: J
 		};
 		if (r && t !== 0 && n !== 0) {
 			let e = this.gatherCandidates(a, t, 0), r = this.gatherCandidates(a, 0, n);
 			if (e.length === 0 && r.length === 0) return Math.abs(t) >= Math.abs(n) ? {
 				moveX: t,
 				moveY: 0,
-				blocking: U
+				blocking: J
 			} : {
 				moveX: 0,
 				moveY: n,
-				blocking: U
+				blocking: J
 			};
-			let i = e.length === 0 ? W : this.refine(a, e, t, 0, Math.abs(t)), o = r.length === 0 ? W : this.refine(a, r, 0, n, Math.abs(n));
+			let i = e.length === 0 ? Ae : this.refine(a, e, t, 0, Math.abs(t)), o = r.length === 0 ? Ae : this.refine(a, r, 0, n, Math.abs(n));
 			return {
 				moveX: t * i.fraction,
 				moveY: n * o.fraction,
-				blocking: Ce(i.blocking, o.blocking)
+				blocking: Me(i.blocking, o.blocking)
 			};
 		}
 		let s = this.refine(a, o, t, n, i);
@@ -410,48 +464,48 @@ var V = 1e-4, Se = 24, H = "collidable", U = [], W = {
 		if (e.sensor) return [];
 		let s = r + t, c = i + n, l = [];
 		return this.forEachCandidate(e, s - a, c - o, s + a, c + o, (t) => {
-			q(e, s, c, t) && t.components.body[3] === 0 && (q(e, r, i, t) || l.push(t));
+			X(e, s, c, t) && t.components.body[3] === 0 && (X(e, r, i, t) || l.push(t));
 		}), l;
 	}
 	refine(e, t, n, r, i) {
-		let { x: a, y: o } = e, s = 0, c = 1, l = V / i;
-		for (let i = 0; i < Se && c - s > l; i++) {
+		let { x: a, y: o } = e, s = 0, c = 1, l = Ee / i;
+		for (let i = 0; i < De && c - s > l; i++) {
 			let i = (s + c) / 2;
 			this.blockedAt(e, t, n, r, i) ? c = i : s = i;
 		}
 		let u = [], d = a + n * c, f = o + r * c;
-		for (let n of t) q(e, d, f, n) && u.push(n);
+		for (let n of t) X(e, d, f, n) && u.push(n);
 		return {
-			fraction: s * i > V ? s : 0,
+			fraction: s * i > Ee ? s : 0,
 			blocking: u
 		};
 	}
 	blockedAt(e, t, n, r, i) {
 		let a = e.x + n * i, o = e.y + r * i;
-		for (let n of t) if (q(e, a, o, n)) return !0;
+		for (let n of t) if (X(e, a, o, n)) return !0;
 		return !1;
 	}
-	forEachCandidate(e, t, n, r, i, a) {
-		for (let o of this.buckets) if ((e.mask & o.category) !== 0) for (let s of o.index.search(t, n, r, i)) {
-			let t = o.entries[s];
-			t.entityId !== e.entityId && (t.components.body[2] & e.category) !== 0 && a(t);
+	forEachCandidate(e, t, r, i, a, o) {
+		for (let s of this.buckets) if ((e.mask & s.category) !== 0) for (let c of s.index.search(t, r, i, a)) {
+			let t = s.entries[c];
+			t.entityId !== e.entityId && (t.components.body[2] & e.category) !== 0 && t.components.entity?.[n] !== 1 && o(t);
 		}
 	}
 };
-function Ce(e, t) {
+function Me(e, t) {
 	if (e.length === 0) return t;
 	if (t.length === 0) return e;
 	let n = [...e];
 	for (let e of t) n.some((t) => t.entityId === e.entityId) || n.push(e);
 	return n;
 }
-function K(e) {
+function Y(e) {
 	let t = e.components.body;
 	if (!t) return;
 	let n = t[2];
 	if (n === 0) return;
 	let r = e.components.transform, i = t[0], a = r[2], o = r[3];
-	if (D(i, a, o)) return;
+	if (F(i, a, o)) return;
 	let s = r[4];
 	return {
 		entityId: e.entityId,
@@ -461,20 +515,20 @@ function K(e) {
 		width: a,
 		height: o,
 		angle: s,
-		halfWidth: O(i, a, o, s),
-		halfHeight: k(i, a, o, s),
+		halfWidth: I(i, a, o, s),
+		halfHeight: L(i, a, o, s),
 		category: t[1],
 		mask: n,
 		sensor: t[3] !== 0
 	};
 }
-function q(e, t, n, r) {
+function X(e, t, n, r) {
 	let i = r.components.transform;
-	return A(e.shape, t, n, e.width, e.height, e.angle, r.components.body[0], i[0], i[1], i[2], i[3], i[4]);
+	return R(e.shape, t, n, e.width, e.height, e.angle, r.components.body[0], i[0], i[1], i[2], i[3], i[4]);
 }
 //#endregion
 //#region src/systems/spatial-index.ts
-var we = class {
+var Ne = class {
 	entries = [];
 	index;
 	constructor(t) {
@@ -482,7 +536,7 @@ var we = class {
 		for (let e of t) {
 			let t = e.components, r = t.transform;
 			if (!r) continue;
-			let i = t.body, a = i ? i[0] : 1, o = r[2], s = r[3], c = r[4], l = r[0], u = r[1], d = O(a, o, s, c), f = k(a, o, s, c);
+			let i = t.body, a = i ? i[0] : 1, o = r[2], s = r[3], c = r[4], l = r[0], u = r[1], d = I(a, o, s, c), f = L(a, o, s, c);
 			this.entries.push({
 				entityId: e.entityId,
 				components: t
@@ -514,96 +568,101 @@ var we = class {
 		let o = this.entries;
 		return (i ? a.neighbors(e, t, n, r, (e) => i(o[e])) : a.neighbors(e, t, n, r)).map((e) => o[e]);
 	}
-}, J = {
-	x: 0,
-	y: 0
-}, Y = {
-	x: 0,
-	y: 0
-}, X = {
+}, Z = {
 	x: 0,
 	y: 0
 };
-function Z(e, t) {
-	let n = e.components.bounciness;
-	if (!n || De(e.components.body) || De(t.components.body) || !Te(e, t, J)) return;
-	let r = e.components.velocity, i = r[0], a = r[1], o = i * J.x + a * J.y;
-	if (o >= 0) return;
-	let s = (1 + n[0]) * o;
-	r[0] = i - s * J.x, r[1] = a - s * J.y;
-}
-function Te(e, t, n) {
-	let r = e.components.transform, i = t.components.transform, a = r[0] - i[0], o = r[1] - i[1], s = Ee(e.components.body), c = Ee(t.components.body);
-	if (s === 2 && c === 2) {
-		let e = Math.sqrt(a * a + o * o);
-		return e === 0 ? !1 : (n.x = a / e, n.y = o / e, !0);
-	}
-	return Oe(r, s, Y), Oe(i, c, X), Y.x + X.x - Math.abs(a) < Y.y + X.y - Math.abs(o) ? (n.x = a < 0 ? -1 : 1, n.y = 0) : (n.x = 0, n.y = o < 0 ? -1 : 1), !0;
+function Pe(e, t) {
+	!Ie(e) && !Ie(t) || Le(e, t) && Re(e, t, Z) && (Fe(e, Z.x, Z.y), Fe(t, -Z.x, -Z.y));
+}
+function Fe(e, t, n) {
+	let r = e.components.bounciness, i = e.components.velocity;
+	if (!r || !i) return;
+	let a = i[0], o = i[1], s = a * t + o * n;
+	if (s >= 0) return;
+	let c = (1 + r[0]) * s;
+	i[0] = a - c * t, i[1] = o - c * n;
+}
+function Ie(e) {
+	return e.components.bounciness !== void 0 && e.components.velocity !== void 0;
 }
-function Ee(e) {
+function Le(e, t) {
+	return !Be(e.components.body) && !Be(t.components.body);
+}
+function Re(e, t, n) {
+	let r = e.components.transform, i = t.components.transform;
+	return ge(ze(e.components.body), r[0], r[1], r[2], r[3], r[4], ze(t.components.body), i[0], i[1], i[2], i[3], i[4], n);
+}
+function ze(e) {
 	return e ? e[0] : 1;
 }
-function De(e) {
+function Be(e) {
 	return e !== void 0 && e[3] !== 0;
 }
-function Oe(e, t, n) {
-	let r = e[2], i = e[3], a = e[4];
-	n.x = O(t, r, i, a), n.y = k(t, r, i, a);
-}
 //#endregion
 //#region src/systems/physics-update.ts
-var ke = "position-updated";
-function Ae(e = {}) {
-	let { onCollision: t, optional: n = [] } = e, r, i = Object.assign((e, n, i, a, o) => {
-		let s = {
-			entityId: n,
-			components: i
-		}, c = i.interpolation, l = e.elapsedTime / 1e3, u = i.velocity[0] * l, d = i.velocity[1] * l;
-		if (Me(c, i.transform, e.elapsedTime), !r) {
-			$(n, i.transform, u, d, o, e.reportMoves), Q(c, e.tick);
+var Ve = "position-updated";
+function He(e = {}) {
+	let { onCollision: t, optional: r = [] } = e, i, a = Object.assign((e, r, a, o, s) => {
+		if (a.entity?.[n] === 1) return;
+		let c = {
+			entityId: r,
+			components: a
+		}, l = a.interpolation, u = e.elapsedTime / 1e3, d = a.velocity[0] * u, f = a.velocity[1] * u;
+		Ge(l, a.transform, e.elapsedTime);
+		let p = i;
+		if (!p) {
+			$(r, a.transform, d, f, s, e.reportMoves), Q(l, e.tick);
 			return;
 		}
-		let f = i.bounciness !== void 0, p = r.resolveMove(s, u, d, !f);
-		if ($(n, i.transform, p.moveX, p.moveY, o, e.reportMoves), Q(c, e.tick), !(!f && !t)) {
-			r.forEachOverlapping(s, (n) => {
-				f && Z(s, n), t && t(e, s, n, a, o);
+		let m = a.bounciness !== void 0, h = p.resolveMove(c, d, f, !m);
+		if ($(r, a.transform, h.moveX, h.moveY, s, e.reportMoves), Q(l, e.tick), !(!p.hasBounciness && !t)) {
+			p.forEachOverlapping(c, (n) => {
+				p.claimContact(r, n.entityId) && Ue(e, c, n, o, s, t);
 			});
-			for (let n of p.blocking) f && Z(s, n), t && t(e, s, n, a, o);
+			for (let n of h.blocking) p.claimContact(r, n.entityId) && Ue(e, c, n, o, s, t);
 		}
 	}, { physics: {
 		collision: !0,
-		optional: n
+		optional: r
 	} });
-	return i.preRun = (e, t, n) => {
-		r = new G(n.collidable ?? [], e.elapsedTime / 1e3);
-	}, i;
+	return a.preRun = (e, t, n) => {
+		i = new je(n.collidable ?? [], e.elapsedTime / 1e3);
+	}, a;
 }
-var je = (e, t, n, r, i) => {
+function Ue(e, t, n, r, i, a) {
+	Pe(t, n), a && a(e, t, n, r, i);
+}
+function We(e, t, n, r, i) {
 	let a = e.elapsedTime / 1e3, o = n.interpolation;
-	Me(o, n.transform, e.elapsedTime), $(t, n.transform, n.velocity[0] * a, n.velocity[1] * a, i, e.reportMoves), Q(o, e.tick);
-};
-function Me(e, t, n) {
+	Ge(o, n.transform, e.elapsedTime), $(t, n.transform, n.velocity[0] * a, n.velocity[1] * a, i, e.reportMoves), Q(o, e.tick);
+}
+function Ge(e, t, n) {
 	e && (e[2] = t[0], e[3] = t[1], e[6] = n);
 }
 function Q(e, t) {
-	e && r(e, 7, t);
+	e && a(e, 7, t);
 }
-function $(e, n, r, i, a, o) {
-	r === 0 && i === 0 || (r !== 0 && t(n, 0, r, Infinity), i !== 0 && t(n, 1, i, Infinity), o !== !1 && a.emitSystemEvent(ke, e));
+function $(e, t, n, i, a, o) {
+	n === 0 && i === 0 || (n !== 0 && r(t, 0, n, Infinity), i !== 0 && r(t, 1, i, Infinity), o !== !1 && a.emitSystemEvent(Ve, e));
 }
 //#endregion
 //#region src/systems/physics-system.ts
-var Ne = 50, Pe = class extends i {
+var Ke = 50, qe = class extends t {
 	tick = 0;
 	reportMoves;
 	constructor(e, t = {}) {
-		let n = t.updateFunction ?? je, r = t.optional ?? n.physics?.optional ?? [], i = t.collision ?? n.physics?.collision ?? !1, a = [];
-		i && !r.includes("body") && a.push("body"), i && !r.includes("bounciness") && a.push("bounciness"), r.includes("interpolation") || a.push("interpolation");
-		let o = a.length ? [...a, ...r] : r, s = i ? { [H]: {
+		let n = t.updateFunction ?? We, r = t.optional ?? n.physics?.optional ?? [], i = t.collision ?? n.physics?.collision ?? !1, a = [];
+		i && !r.includes("body") && a.push("body"), i && !r.includes("bounciness") && a.push("bounciness"), r.includes("interpolation") || a.push("interpolation"), i && a.push("entity");
+		let o = a.length ? [...a, ...r] : r, s = r.includes("bounciness") ? r : ["bounciness", ...r], c = i ? { [Oe]: {
 			required: ["transform", "body"],
-			optional: ["velocity", ...r]
-		} } : void 0, c = s || t.queries ? {
-			...s,
+			optional: [
+				"velocity",
+				"entity",
+				...s
+			]
+		} } : void 0, l = c || t.queries ? {
+			...c,
 			...t.queries
 		} : void 0;
 		super(e, {
@@ -614,7 +673,7 @@ var Ne = 50, Pe = class extends i {
 			optional: o,
 			filter: t.filter,
 			updateFunction: n,
-			queries: c,
+			queries: l,
 			forceMainThread: t.forceMainThread ?? !t.getWorker,
 			getWorker: t.getWorker ?? (() => {
 				throw Error("PhysicsSystem cannot start a worker: no getWorker was supplied");
@@ -624,23 +683,23 @@ var Ne = 50, Pe = class extends i {
 	addDataToWorld(e) {
 		e.tick = ++this.tick, e.reportMoves = this.reportMoves ?? this.listenerCount("position-updated") > 0;
 	}
-}, Fe = (e, t, r) => {
-	let i = r.interpolation, a = r.transform, o = n(i, 7), s = i[2], c = i[3], l = i[6], u = a[0], d = a[1], f = n(i, 7);
+}, Je = (e, t, n) => {
+	let r = n.interpolation, a = n.transform, o = i(r, 7), s = r[2], c = r[3], l = r[6], u = a[0], d = a[1], f = i(r, 7);
 	if (o !== f) return;
 	if (l <= 0) {
-		i[4] = 1, i[5] = f, i[0] = u, i[1] = d;
+		r[4] = 1, r[5] = f, r[0] = u, r[1] = d;
 		return;
 	}
-	let p = i[4];
-	f !== i[5] && (p = 0, i[5] = f), p += e.elapsedTime / l, p > 1 && (p = 1), i[4] = p, i[0] = s + (u - s) * p, i[1] = c + (d - c) * p;
-}, Ie = class extends i {
+	let p = r[4];
+	f !== r[5] && (p = 0, r[5] = f), p += e.elapsedTime / l, p > 1 && (p = 1), r[4] = p, r[0] = s + (u - s) * p, r[1] = c + (d - c) * p;
+}, Ye = class extends t {
 	constructor(e, t = {}) {
 		super(e, {
 			name: t.name ?? "InterpolationSystem",
 			deltaBetweenRuns: 0,
 			firstRun: t.firstRun,
 			required: ["transform", "interpolation"],
-			updateFunction: Fe,
+			updateFunction: Je,
 			forceMainThread: t.forceMainThread ?? !t.getWorker,
 			getWorker: t.getWorker ?? (() => {
 				throw Error("InterpolationSystem cannot start a worker: no getWorker was supplied");
@@ -649,6 +708,6 @@ var Ne = 50, Pe = class extends i {
 	}
 };
 //#endregion
-export { ne as BODY_CATEGORY_INDEX, re as BODY_MASK_INDEX, ie as BODY_SENSOR_INDEX, te as BODY_SHAPE_INDEX, ae as BODY_SIZE, ce as BOUNCINESS_INDEX, le as BOUNCINESS_SIZE, H as COLLIDABLE_QUERY, G as CollisionBroadphase, b as DEFAULT_COLLIDE_CATEGORY, x as DEFAULT_COLLIDE_MASK, Ne as DEFAULT_PHYSICS_STEP_MS, ge as INTERPOLATION_DURATION_INDEX, fe as INTERPOLATION_PREV_X_INDEX, pe as INTERPOLATION_PREV_Y_INDEX, me as INTERPOLATION_PROGRESS_INDEX, ve as INTERPOLATION_SIZE, he as INTERPOLATION_SYNCED_TICK_INDEX, _e as INTERPOLATION_TICK_INDEX, ue as INTERPOLATION_X_INDEX, de as INTERPOLATION_Y_INDEX, Ie as InterpolationSystem, ke as POSITION_UPDATED_EVENT, Pe as PhysicsSystem, v as SHAPE_CAPSULE, _ as SHAPE_CIRCLE, g as SHAPE_RECTANGLE, we as SpatialIndex, l as TRANSFORM_ANGLE_INDEX, c as TRANSFORM_HEIGHT_INDEX, u as TRANSFORM_SIZE, s as TRANSFORM_WIDTH_INDEX, a as TRANSFORM_X_INDEX, o as TRANSFORM_Y_INDEX, m as VELOCITY_SIZE, f as VELOCITY_X_INDEX, p as VELOCITY_Y_INDEX, S as bodyDefinition, C as bouncinessDefinition, N as boundsHalfHeight, M as boundsHalfWidth, ee as canCollide, T as capsuleHalfLength, Ae as createPhysicsUpdate, w as interpolationDefinition, Fe as interpolationUpdate, oe as isSensor, P as orientedBoxesOverlap, be as physicsRegistry, je as physicsUpdate, R as pointSegmentDistanceSquared, L as segmentBoxDistanceSquared, I as segmentSegmentDistanceSquared, k as shapeHalfHeight, O as shapeHalfWidth, D as shapeIsEmpty, E as shapeRadius, A as shapesOverlap, ye as snapEntity, d as transformDefinition, h as velocityDefinition };
+export { T as BODY_CATEGORY_INDEX, E as BODY_MASK_INDEX, D as BODY_SENSOR_INDEX, w as BODY_SHAPE_INDEX, O as BODY_SIZE, te as BOUNCINESS_INDEX, ne as BOUNCINESS_SIZE, Oe as COLLIDABLE_QUERY, je as CollisionBroadphase, x as DEFAULT_COLLIDE_CATEGORY, S as DEFAULT_COLLIDE_MASK, Ke as DEFAULT_PHYSICS_STEP_MS, ue as INTERPOLATION_DURATION_INDEX, oe as INTERPOLATION_PREV_X_INDEX, se as INTERPOLATION_PREV_Y_INDEX, ce as INTERPOLATION_PROGRESS_INDEX, fe as INTERPOLATION_SIZE, le as INTERPOLATION_SYNCED_TICK_INDEX, de as INTERPOLATION_TICK_INDEX, ie as INTERPOLATION_X_INDEX, ae as INTERPOLATION_Y_INDEX, Ye as InterpolationSystem, Ve as POSITION_UPDATED_EVENT, qe as PhysicsSystem, y as SHAPE_CAPSULE, v as SHAPE_CIRCLE, _ as SHAPE_RECTANGLE, Ne as SpatialIndex, u as TRANSFORM_ANGLE_INDEX, l as TRANSFORM_HEIGHT_INDEX, d as TRANSFORM_SIZE, c as TRANSFORM_WIDTH_INDEX, o as TRANSFORM_X_INDEX, s as TRANSFORM_Y_INDEX, h as VELOCITY_SIZE, p as VELOCITY_X_INDEX, m as VELOCITY_Y_INDEX, A as bodyDefinition, re as bouncinessDefinition, Ce as boundsHalfHeight, Se as boundsHalfWidth, C as canCollide, N as capsuleHalfLength, ge as contactNormal, He as createPhysicsUpdate, pe as interpolationDefinition, Je as interpolationUpdate, k as isSensor, we as orientedBoxesOverlap, he as physicsRegistry, We as physicsUpdate, G as pointSegmentDistanceSquared, U as segmentBoxDistanceSquared, H as segmentSegmentDistanceSquared, L as shapeHalfHeight, I as shapeHalfWidth, F as shapeIsEmpty, P as shapeRadius, R as shapesOverlap, me as snapEntity, f as transformDefinition, g as velocityDefinition };
 
 //# sourceMappingURL=index.js.map