@vpmedia/phaser 1.111.0 → 1.113.0

package/src/phaser/geom/util/circle.ts

@@ -9,7 +9,7 @@ import { Point } from '../point.js';
  * @returns {Circle} The cloned circle.
  */
 export const clone = (input: Circle, output: Circle | null = null) => {
-  const result = output || new Circle();
+  const result = output ?? new Circle();
   result.x = input.x;
   result.y = input.y;
   result.diameter = input.diameter;
@@ -38,9 +38,7 @@ export const contains = (a: Circle, x: number, y: number) => {
  * @param {Circle} b - The second circle to compare.
  * @returns {boolean} True if the circles are equal, false otherwise.
  */
-export const equals = (a: Circle, b: Circle) => {
-  return a.x === b.x && a.y === b.y && a.diameter === b.diameter;
-};
+export const equals = (a: Circle, b: Circle) => a.x === b.x && a.y === b.y && a.diameter === b.diameter;
 
 /**
  * Checks if two circles intersect.
@@ -48,9 +46,7 @@ export const equals = (a: Circle, b: Circle) => {
  * @param {Circle} b - The second circle to check.
  * @returns {boolean} True if the circles intersect, false otherwise.
  */
-export const intersects = (a: Circle, b: Circle) => {
-  return distance(a.x, a.y, b.x, b.y) <= a.radius + b.radius;
-};
+export const intersects = (a: Circle, b: Circle) => distance(a.x, a.y, b.x, b.y) <= a.radius + b.radius;
 
 /**
  * Gets a point on the circumference of the circle at the specified angle.
@@ -60,14 +56,9 @@ export const intersects = (a: Circle, b: Circle) => {
  * @param {Point} output - Optional point to store the result in.
  * @returns {Point} The point on the circumference of the circle.
  */
-export const circumferencePoint = (
-  a: Circle,
-  angle: number,
-  asDegrees: boolean = false,
-  output: Point | null = null
-) => {
-  const result = output || new Point();
-  if (asDegrees === true) {
+export const circumferencePoint = (a: Circle, angle: number, asDegrees = false, output: Point | null = null) => {
+  const result = output ?? new Point();
+  if (asDegrees) {
     angle = degToRad(angle);
   }
   result.x = a.x + a.radius * Math.cos(angle);
@@ -83,9 +74,9 @@ export const circumferencePoint = (
  * @param {Point} output - Optional point to store the result in.
  * @returns {Point} The point on the circumference of the circle.
  */
-export const intersectsPoint = (a: Circle, angle: number, asDegrees: boolean = false, output: Point | null = null) => {
-  const result = output || new Point();
-  if (asDegrees === true) {
+export const intersectsPoint = (a: Circle, angle: number, asDegrees = false, output: Point | null = null) => {
+  const result = output ?? new Point();
+  if (asDegrees) {
     angle = degToRad(angle);
   }
   result.x = a.x + a.radius * Math.cos(angle);

package/src/phaser/geom/util/ellipse.test.ts

@@ -1,9 +1,11 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Ellipse } from '../ellipse.js';
 import { contains } from './ellipse.js';
 
-it('should contain an ellipse the given coordinates', () => {
-  const ellipse = new Ellipse(0, 0, 10, 10);
-  expect(contains(ellipse, 5, 5)).toBe(true);
-  expect(contains(ellipse, 15, 15)).toBe(false);
+describe('ellipse utils', () => {
+  it('should contain an ellipse the given coordinates', () => {
+    const ellipse = new Ellipse(0, 0, 10, 10);
+    expect(contains(ellipse, 5, 5)).toBe(true);
+    expect(contains(ellipse, 15, 15)).toBe(false);
+  });
 });

package/src/phaser/geom/util/ellipse.ts

@@ -1,11 +1,12 @@
+import type { Ellipse } from '../ellipse.js';
 /**
  * Checks if a point is contained within the ellipse.
- * @param {import('../ellipse.js').Ellipse} a - The ellipse to check.
+ * @param {Ellipse} a - The ellipse to check.
  * @param {number} x - The x coordinate of the point.
  * @param {number} y - The y coordinate of the point.
  * @returns {boolean} True if the point is contained within the ellipse, false otherwise.
  */
-export const contains = (a: import('../ellipse.js').Ellipse, x: number, y: number) => {
+export const contains = (a: Ellipse, x: number, y: number) => {
   if (a.width <= 0 || a.height <= 0) {
     return false;
   }

package/src/phaser/geom/util/line.test.ts

@@ -1,12 +1,14 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Line } from '../line.js';
 import { clone } from './line.js';
 
-it('should clone a line', () => {
-  const line1 = new Line(0, 0, 10, 0);
-  const line2 = clone(line1);
-  expect(line1.start.x).toBe(line2.start.x);
-  expect(line1.start.y).toBe(line2.start.y);
-  expect(line1.end.x).toBe(line2.end.x);
-  expect(line1.end.y).toBe(line2.end.y);
+describe('line utils', () => {
+  it('should clone a line', () => {
+    const line1 = new Line(0, 0, 10, 0);
+    const line2 = clone(line1);
+    expect(line1.start.x).toBe(line2.start.x);
+    expect(line1.start.y).toBe(line2.start.y);
+    expect(line1.end.x).toBe(line2.end.x);
+    expect(line1.end.y).toBe(line2.end.y);
+  });
 });

package/src/phaser/geom/util/line.ts

@@ -9,7 +9,7 @@ import { intersects as intersectsRect } from './rectangle.js';
  * @returns {Line} The cloned line.
  */
 export const clone = (input: Line, output: Line | null = null) => {
-  const result = output || new Line();
+  const result = output ?? new Line();
   result.start.x = input.start.x;
   result.start.y = input.start.y;
   result.end.x = input.end.x;
@@ -27,15 +27,8 @@ export const clone = (input: Line, output: Line | null = null) => {
  * @param {Point} output - Optional point to store the result in.
  * @returns {Point} The intersection point, or null if there is no intersection.
  */
-export const intersectsPoints = (
-  a: any,
-  b: any,
-  e: any,
-  f: any,
-  asSegment: boolean = true,
-  output: Point | null = null
-) => {
-  const result = output || new Point();
+export const intersectsPoints = (a: any, b: any, e: any, f: any, asSegment = true, output: Point | null = null) => {
+  const result = output ?? new Point();
   const a1 = b.y - a.y;
   const a2 = f.y - e.y;
   const b1 = a.x - b.x;
@@ -68,9 +61,8 @@ export const intersectsPoints = (
  * @param {Point} result - Optional point to store the result in.
  * @returns {Point} The intersection point, or null if there is no intersection.
  */
-export const intersects = (a: any, b: any, asSegment: boolean, result: Point) => {
-  return intersectsPoints(a.start, a.end, b.start, b.end, asSegment, result);
-};
+export const intersects = (a: any, b: any, asSegment: boolean, result: Point) =>
+  intersectsPoints(a.start, a.end, b.start, b.end, asSegment, result);
 
 /**
  * Checks if a line intersects with a rectangle.
@@ -132,6 +124,4 @@ export const intersectsRectangle = (line: any, rect: any) => {
  * @param {object} b - The second point (with x, y properties).
  * @returns {number} The distance between the points.
  */
-export const reflect = (a: any, b: any) => {
-  return 2 * b.normalAngle - 3.141592653589793 - a.angle;
-};
+export const reflect = (a: any, b: any) => 2 * b.normalAngle - Math.PI - a.angle;

package/src/phaser/geom/util/matrix.test.ts

@@ -1,24 +1,26 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Matrix } from '../matrix.js';
 import { clone, getIdentityMatrix, getTempMatrix } from './matrix.js';
 
-it('should clone a matrix', () => {
-  const matrix1 = new Matrix(2, 0, 0, 2, 0, 0);
-  const matrix2 = clone(matrix1);
-  expect(matrix1.a).toBe(matrix2.a);
-  expect(matrix1.b).toBe(matrix2.b);
-  expect(matrix1.c).toBe(matrix2.c);
-  expect(matrix1.d).toBe(matrix2.d);
-  expect(matrix1.tx).toBe(matrix2.tx);
-  expect(matrix1.ty).toBe(matrix2.ty);
-});
+describe('matrix utils', () => {
+  it('should clone a matrix', () => {
+    const matrix1 = new Matrix(2, 0, 0, 2, 0, 0);
+    const matrix2 = clone(matrix1);
+    expect(matrix1.a).toBe(matrix2.a);
+    expect(matrix1.b).toBe(matrix2.b);
+    expect(matrix1.c).toBe(matrix2.c);
+    expect(matrix1.d).toBe(matrix2.d);
+    expect(matrix1.tx).toBe(matrix2.tx);
+    expect(matrix1.ty).toBe(matrix2.ty);
+  });
 
-it('should create an identity matrix', () => {
-  const matrix = getIdentityMatrix();
-  expect(matrix.a).toBe(1);
-});
+  it('should create an identity matrix', () => {
+    const matrix = getIdentityMatrix();
+    expect(matrix.a).toBe(1);
+  });
 
-it('should create a temporary matrix', () => {
-  const matrix = getTempMatrix();
-  expect(matrix.a).toBe(1);
+  it('should create a temporary matrix', () => {
+    const matrix = getTempMatrix();
+    expect(matrix.a).toBe(1);
+  });
 });

package/src/phaser/geom/util/matrix.ts

@@ -1,4 +1,5 @@
 import { Matrix } from '../matrix.js';
+import { getRegistry } from '../../core/registry.js';
 
 /**
  * Clones a matrix.
@@ -7,7 +8,7 @@ import { Matrix } from '../matrix.js';
  * @returns {Matrix} The cloned matrix.
  */
 export const clone = (input: Matrix, output: Matrix | null = null) => {
-  const result = output || new Matrix();
+  const result = output ?? new Matrix();
   result.a = input.a;
   result.b = input.b;
   result.c = input.c;
@@ -22,13 +23,9 @@ export const clone = (input: Matrix, output: Matrix | null = null) => {
  * @returns {Matrix} A new identity matrix.
  */
 export const getIdentityMatrix = () => {
-  if (!window.PhaserRegistry) {
-    window.PhaserRegistry = {};
-  }
-  if (!window.PhaserRegistry.IDENTITY_MATRIX) {
-    window.PhaserRegistry.IDENTITY_MATRIX = new Matrix();
-  }
-  return window.PhaserRegistry.IDENTITY_MATRIX;
+  getRegistry();
+  globalThis.PhaserRegistry.IDENTITY_MATRIX ??= new Matrix();
+  return globalThis.PhaserRegistry.IDENTITY_MATRIX;
 };
 
 /**
@@ -36,11 +33,7 @@ export const getIdentityMatrix = () => {
  * @returns {Matrix} A new matrix.
  */
 export const getTempMatrix = () => {
-  if (!window.PhaserRegistry) {
-    window.PhaserRegistry = {};
-  }
-  if (!window.PhaserRegistry.TEMP_MATRIX) {
-    window.PhaserRegistry.TEMP_MATRIX = new Matrix();
-  }
-  return window.PhaserRegistry.TEMP_MATRIX;
+  getRegistry();
+  globalThis.PhaserRegistry.TEMP_MATRIX ??= new Matrix();
+  return globalThis.PhaserRegistry.TEMP_MATRIX;
 };

package/src/phaser/geom/util/point.test.ts

@@ -1,10 +1,12 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Point } from '../point.js';
 import { clone } from './point.js';
 
-it('should clone a point', () => {
-  const point1 = new Point(1, 2);
-  const point2 = clone(point1);
-  expect(point1.x).toBe(point2.x);
-  expect(point1.y).toBe(point2.y);
+describe('point utils', () => {
+  it('should clone a point', () => {
+    const point1 = new Point(1, 2);
+    const point2 = clone(point1);
+    expect(point1.x).toBe(point2.x);
+    expect(point1.y).toBe(point2.y);
+  });
 });

package/src/phaser/geom/util/point.ts

@@ -8,7 +8,7 @@ import { Point } from '../point.js';
  * @returns {Point} A new point containing the sum of the two points.
  */
 export const add = (a: Point, b: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   result.x = a.x + b.x;
   result.y = a.y + b.y;
   return result;
@@ -22,7 +22,7 @@ export const add = (a: Point, b: Point, output: Point | null = null) => {
  * @returns {Point} A new point containing the difference of the two points.
  */
 export const subtract = (a: Point, b: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   result.x = a.x - b.x;
   result.y = a.y - b.y;
   return result;
@@ -36,7 +36,7 @@ export const subtract = (a: Point, b: Point, output: Point | null = null) => {
  * @returns {Point} A new point containing the product of the two points.
  */
 export const multiply = (a: Point, b: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   result.x = a.x * b.x;
   result.y = a.y * b.y;
   return result;
@@ -50,7 +50,7 @@ export const multiply = (a: Point, b: Point, output: Point | null = null) => {
  * @returns {Point} A new point containing the quotient of the two points.
  */
 export const divide = (a: Point, b: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   result.x = a.x / b.x;
   result.y = a.y / b.y;
   return result;
@@ -62,9 +62,7 @@ export const divide = (a: Point, b: Point, output: Point | null = null) => {
  * @param {Point} b - The second point to compare.
  * @returns {boolean} True if the points are equal, false otherwise.
  */
-export const equals = (a: Point, b: Point) => {
-  return a.x === b.x && a.y === b.y;
-};
+export const equals = (a: Point, b: Point) => a.x === b.x && a.y === b.y;
 
 /**
  * Calculates the angle between two points.
@@ -72,9 +70,7 @@ export const equals = (a: Point, b: Point) => {
  * @param {Point} b - The second point to calculate the angle to.
  * @returns {number} The angle between the two points in radians.
  */
-export const angle = (a: Point, b: Point) => {
-  return Math.atan2(a.y - b.y, a.x - b.x);
-};
+export const angle = (a: Point, b: Point) => Math.atan2(a.y - b.y, a.x - b.x);
 
 /**
  * Creates a new point with the same coordinates as the input point but with inverted signs.
@@ -83,7 +79,7 @@ export const angle = (a: Point, b: Point) => {
  * @returns {Point} A new point with negated coordinates.
  */
 export const negative = (a: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   return result.setTo(-a.x, -a.y);
 };
 
@@ -96,7 +92,7 @@ export const negative = (a: Point, output: Point | null = null) => {
  * @returns {Point} A new point with the result of the operation.
  */
 export const multiplyAdd = (a: Point, b: Point, s: number, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   return result.setTo(a.x + b.x * s, a.y + b.y * s);
 };
 
@@ -109,7 +105,7 @@ export const multiplyAdd = (a: Point, b: Point, s: number, output: Point | null
  * @returns {Point} A new point interpolated between the two points.
  */
 export const interpolate = (a: Point, b: Point, f: number, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   return result.setTo(a.x + (b.x - a.x) * f, a.y + (b.y - a.y) * f);
 };
 
@@ -120,7 +116,7 @@ export const interpolate = (a: Point, b: Point, f: number, output: Point | null
  * @returns {Point} A new point that is perpendicular to the input point.
  */
 export const perp = (a: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   return result.setTo(-a.y, a.x);
 };
 
@@ -131,7 +127,7 @@ export const perp = (a: Point, output: Point | null = null) => {
  * @returns {Point} A new point that is perpendicular to the input point (rotated clockwise).
  */
 export const rperp = (a: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   return result.setTo(a.y, -a.x);
 };
 
@@ -142,7 +138,7 @@ export const rperp = (a: Point, output: Point | null = null) => {
  * @param {boolean} round - Whether to round the result (default: false).
  * @returns {number} The distance between the two points.
  */
-export const distance = (a: Point, b: Point, round: boolean = false) => {
+export const distance = (a: Point, b: Point, round = false) => {
   const dx = a.x - b.x;
   const dy = a.y - b.y;
   const abDistance = Math.sqrt(dx * dx + dy * dy);
@@ -157,7 +153,7 @@ export const distance = (a: Point, b: Point, round: boolean = false) => {
  * @returns {Point} A new point with the projected result.
  */
 export const project = (a: Point, b: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   const amt = a.dot(b) / b.getMagnitudeSq();
   if (amt !== 0) {
     result.setTo(amt * b.x, amt * b.y);
@@ -173,7 +169,7 @@ export const project = (a: Point, b: Point, output: Point | null = null) => {
  * @returns {Point} A new point with the projected result.
  */
 export const projectUnit = (a: Point, b: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   const amt = a.dot(b);
   if (amt !== 0) {
     result.setTo(amt * b.x, amt * b.y);
@@ -188,7 +184,7 @@ export const projectUnit = (a: Point, b: Point, output: Point | null = null) =>
  * @returns {Point} A new point with the same x coordinate but negated y coordinate.
  */
 export const normalRightHand = (a: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   return result.setTo(a.y * -1, a.x);
 };
 
@@ -199,7 +195,7 @@ export const normalRightHand = (a: Point, output: Point | null = null) => {
  * @returns {Point} A new normalized point.
  */
 export const normalize = (a: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   const m = a.getMagnitude();
   if (m !== 0) {
     result.setTo(a.x / m, a.y / m);
@@ -252,17 +248,17 @@ export const rotate = (
  * @throws {Error} If the points array is empty.
  */
 export const centroid = (points: Point[], output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   const pointsLen = points.length;
   if (pointsLen < 1) {
     throw new Error('Point(points) array must not be empty');
   }
   if (pointsLen === 1) {
-    result.copyFrom(points[0]);
+    result.copyFrom(points[0]!);
     return result;
   }
-  for (let i = 0; i < pointsLen; i += 1) {
-    add(result, points[i], result);
+  for (const point of points) {
+    add(result, point, result);
   }
   result.divide(pointsLen, pointsLen);
   return result;
@@ -275,13 +271,13 @@ export const centroid = (points: Point[], output: Point | null = null) => {
  * @param {string} yProp - The name of the property containing the y value (default: 'y').
  * @returns {Point} A new point with parsed x and y values.
  */
-export const parse = (obj: any, xProp: string = 'x', yProp: string = 'y') => {
+export const parse = (obj: any, xProp = 'x', yProp = 'y') => {
   const point = new Point();
   if (obj[xProp]) {
-    point.x = Number.parseInt(obj[xProp], 10);
+    point.x = Math.trunc(Number(obj[xProp]));
   }
   if (obj[yProp]) {
-    point.y = Number.parseInt(obj[yProp], 10);
+    point.y = Math.trunc(Number(obj[yProp]));
   }
   return point;
 };
@@ -293,7 +289,7 @@ export const parse = (obj: any, xProp: string = 'x', yProp: string = 'y') => {
  * @returns {Point} A new point with the same coordinates as the input.
  */
 export const clone = (input: Point, output: Point | null = null) => {
-  const result = output || new Point();
+  const result = output ?? new Point();
   result.setTo(input.x, input.y);
   return result;
 };

package/src/phaser/geom/util/polygon.test.ts

@@ -1,14 +1,16 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Polygon } from '../polygon.js';
 import { clone } from './polygon.js';
 
-it('should clone a polygon', () => {
-  const polygon = new Polygon([0, 0, 1, 0, 1, 1]);
-  const points = clone(polygon).toNumberArray();
-  expect(points[0]).toBe(0);
-  expect(points[1]).toBe(0);
-  expect(points[2]).toBe(1);
-  expect(points[3]).toBe(0);
-  expect(points[4]).toBe(1);
-  expect(points[5]).toBe(1);
+describe('polygon utils', () => {
+  it('should clone a polygon', () => {
+    const polygon = new Polygon([0, 0, 1, 0, 1, 1]);
+    const points = clone(polygon).toNumberArray();
+    expect(points[0]).toBe(0);
+    expect(points[1]).toBe(0);
+    expect(points[2]).toBe(1);
+    expect(points[3]).toBe(0);
+    expect(points[4]).toBe(1);
+    expect(points[5]).toBe(1);
+  });
 });

package/src/phaser/geom/util/polygon.ts

@@ -7,7 +7,7 @@ import { Polygon } from '../polygon.js';
  * @returns {Polygon} The cloned polygon.
  */
 export const clone = (input: Polygon, output: Polygon | null = null) => {
-  const result = output || new Polygon();
-  result.setTo(input._points.slice());
+  const result = output ?? new Polygon();
+  result.setTo([...input._points]);
   return result;
 };

package/src/phaser/geom/util/rectangle.test.ts

@@ -1,12 +1,14 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Rectangle } from '../rectangle.js';
 import { clone } from './rectangle.js';
 
-it('should clone a rectangle', () => {
-  const rectangle1 = new Rectangle(0, 0, 10, 10);
-  const rectangle2 = clone(rectangle1);
-  expect(rectangle1.x).toBe(rectangle2.x);
-  expect(rectangle1.y).toBe(rectangle2.y);
-  expect(rectangle1.width).toBe(rectangle2.width);
-  expect(rectangle1.height).toBe(rectangle2.height);
+describe('rectangle utils', () => {
+  it('should clone a rectangle', () => {
+    const rectangle1 = new Rectangle(0, 0, 10, 10);
+    const rectangle2 = clone(rectangle1);
+    expect(rectangle1.x).toBe(rectangle2.x);
+    expect(rectangle1.y).toBe(rectangle2.y);
+    expect(rectangle1.width).toBe(rectangle2.width);
+    expect(rectangle1.height).toBe(rectangle2.height);
+  });
 });