@vpmedia/phaser 1.111.0 → 1.113.0

package/src/phaser/geom/line.ts

@@ -4,9 +4,9 @@ import { wrap } from '../util/math.js';
 import { GEOM_LINE } from '../core/const.js';
 
 export class Line {
-  start: Point;
-  end: Point;
-  type: number;
+  public start: Point;
+  public end: Point;
+  public type: number;
 
   /**
    * Creates a new Line instance.
@@ -15,7 +15,7 @@ export class Line {
    * @param {number} x2 - The x coordinate of the end point (default: 0).
    * @param {number} y2 - The y coordinate of the end point (default: 0).
    */
-  constructor(x1: number = 0, y1: number = 0, x2: number = 0, y2: number = 0) {
+  public constructor(x1 = 0, y1 = 0, x2 = 0, y2 = 0) {
     /** @type {Point} */
     this.start = new Point(x1, y1);
     /** @type {Point} */
@@ -32,7 +32,7 @@ export class Line {
    * @param {number} y2 - The new y coordinate of the end point.
    * @returns {Line} This line instance for chaining.
    */
-  setTo(x1: number, y1: number, x2: number, y2: number) {
+  public setTo(x1: number, y1: number, x2: number, y2: number) {
     this.start.setTo(x1, y1);
     this.end.setTo(x2, y2);
     return this;
@@ -45,7 +45,7 @@ export class Line {
    * @param {boolean} useCenter - Whether to use the center of the sprites (default: false).
    * @returns {Line} This line instance for chaining.
    */
-  fromSprite(startSprite: any, endSprite: any, useCenter: boolean = false) {
+  public fromSprite(startSprite: any, endSprite: any, useCenter = false) {
     if (useCenter) {
       return this.setTo(startSprite.center.x, startSprite.center.y, endSprite.center.x, endSprite.center.y);
     }
@@ -60,7 +60,7 @@ export class Line {
    * @param {number} length - The length of the line.
    * @returns {Line} This line instance for chaining.
    */
-  fromAngle(x: number, y: number, angle: number, length: number) {
+  public fromAngle(x: number, y: number, angle: number, length: number) {
     this.start.setTo(x, y);
     this.end.setTo(x + Math.cos(angle) * length, y + Math.sin(angle) * length);
     return this;
@@ -72,7 +72,7 @@ export class Line {
    * @param {boolean} asDegrees - Whether the angle is provided in degrees (default: false).
    * @returns {Line} This line instance for chaining.
    */
-  rotate(angle: number, asDegrees: boolean = false) {
+  public rotate(angle: number, asDegrees = false) {
     const cx = (this.start.x + this.end.x) / 2;
     const cy = (this.start.y + this.end.y) / 2;
     this.start.rotate(cx, cy, angle, asDegrees);
@@ -88,7 +88,7 @@ export class Line {
    * @param {boolean} asDegrees - Whether the angle is provided in degrees (default: false).
    * @returns {Line} This line instance for chaining.
    */
-  rotateAround(x: number, y: number, angle: number, asDegrees: boolean = false) {
+  public rotateAround(x: number, y: number, angle: number, asDegrees = false) {
     this.start.rotate(x, y, angle, asDegrees);
     this.end.rotate(x, y, angle, asDegrees);
     return this;
@@ -101,7 +101,7 @@ export class Line {
    * @param {Point} result - The point to store the intersection in (optional).
    * @returns {Point} The intersection point, or null if no intersection occurs.
    */
-  intersects(line: Line, asSegment: boolean, result: Point) {
+  public intersects(line: Line, asSegment = true, result: Point | null = null) {
     return intersectsPoints(this.start, this.end, line.start, line.end, asSegment, result);
   }
 
@@ -110,7 +110,7 @@ export class Line {
    * @param {Line} line - The line to reflect off.
    * @returns {number} The angle of reflection in radians.
    */
-  reflect(line: Line) {
+  public reflect(line: Line) {
     return reflect(this, line);
   }
 
@@ -119,8 +119,8 @@ export class Line {
    * @param {Point} output - The point to store the result in (optional).
    * @returns {Point} The midpoint of this line.
    */
-  midPoint(output: Point | null = null) {
-    const result = output || new Point();
+  public midPoint(output: Point | null = null) {
+    const result = output ?? new Point();
     result.x = (this.start.x + this.end.x) / 2;
     result.y = (this.start.y + this.end.y) / 2;
     return result;
@@ -131,7 +131,7 @@ export class Line {
    * @param {number} x - The x coordinate to center the line on.
    * @param {number} y - The y coordinate to center the line on.
    */
-  centerOn(x: number, y: number) {
+  public centerOn(x: number, y: number) {
     const cx = (this.start.x + this.end.x) / 2;
     const cy = (this.start.y + this.end.y) / 2;
     const tx = x - cx;
@@ -146,7 +146,7 @@ export class Line {
    * @param {number} y - The y coordinate of the point to check.
    * @returns {boolean} True if the point lies on this line, false otherwise.
    */
-  pointOnLine(x: number, y: number) {
+  public pointOnLine(x: number, y: number) {
     return (x - this.start.x) * (this.end.y - this.start.y) === (this.end.x - this.start.x) * (y - this.start.y);
   }
 
@@ -156,7 +156,7 @@ export class Line {
    * @param {number} y - The y coordinate of the point to check.
    * @returns {boolean} True if the point lies on this line segment, false otherwise.
    */
-  pointOnSegment(x: number, y: number) {
+  public pointOnSegment(x: number, y: number) {
     const xMin = Math.min(this.start.x, this.end.x);
     const xMax = Math.max(this.start.x, this.end.x);
     const yMin = Math.min(this.start.y, this.end.y);
@@ -169,8 +169,8 @@ export class Line {
    * @param {Point} output - The point to store the result in (optional).
    * @returns {Point} A random point on this line.
    */
-  random(output: Point | null = null) {
-    const result = output || new Point();
+  public random(output: Point | null = null) {
+    const result = output ?? new Point();
     const t = Math.random();
     result.x = this.start.x + t * (this.end.x - this.start.x);
     result.y = this.start.y + t * (this.end.y - this.start.y);
@@ -183,7 +183,7 @@ export class Line {
    * @param {number[][]} results - The array to store the results in (optional).
    * @returns {number[][]} An array of coordinate pairs representing points along this line.
    */
-  coordinatesOnLine(stepRate: number = 1, results: number[][] = []) {
+  public coordinatesOnLine(stepRate = 1, results: number[][] = []) {
     let x1 = Math.round(this.start.x);
     let y1 = Math.round(this.start.y);
     const x2 = Math.round(this.end.x);
@@ -217,7 +217,7 @@ export class Line {
    * Creates a clone of this line.
    * @returns {Line} A new line with the same values as this one.
    */
-  clone() {
+  public clone() {
     return clone(this);
   }
 
@@ -225,7 +225,7 @@ export class Line {
    * Gets the length of this line.
    * @returns {number} The length of this line.
    */
-  get length() {
+  public get length() {
     return Math.sqrt(
       (this.end.x - this.start.x) * (this.end.x - this.start.x) +
         (this.end.y - this.start.y) * (this.end.y - this.start.y)
@@ -236,7 +236,7 @@ export class Line {
    * Gets the angle of this line in radians.
    * @returns {number} The angle of this line in radians.
    */
-  get angle() {
+  public get angle() {
     return Math.atan2(this.end.y - this.start.y, this.end.x - this.start.x);
   }
 
@@ -244,7 +244,7 @@ export class Line {
    * Gets the slope of this line.
    * @returns {number} The slope of this line.
    */
-  get slope() {
+  public get slope() {
     return (this.end.y - this.start.y) / (this.end.x - this.start.x);
   }
 
@@ -252,7 +252,7 @@ export class Line {
    * Gets the perpendicular slope of this line.
    * @returns {number} The perpendicular slope of this line.
    */
-  get perpSlope() {
+  public get perpSlope() {
     return -((this.end.x - this.start.x) / (this.end.y - this.start.y));
   }
 
@@ -260,7 +260,7 @@ export class Line {
    * Gets the x coordinate of the leftmost point on this line.
    * @returns {number} The x coordinate of the leftmost point on this line.
    */
-  get x() {
+  public get x() {
     return Math.min(this.start.x, this.end.x);
   }
 
@@ -268,7 +268,7 @@ export class Line {
    * Gets the y coordinate of the topmost point on this line.
    * @returns {number} The y coordinate of the topmost point on this line.
    */
-  get y() {
+  public get y() {
     return Math.min(this.start.y, this.end.y);
   }
 
@@ -276,7 +276,7 @@ export class Line {
    * Gets the x coordinate of the leftmost point on this line.
    * @returns {number} The x coordinate of the leftmost point on this line.
    */
-  get left() {
+  public get left() {
     return Math.min(this.start.x, this.end.x);
   }
 
@@ -284,7 +284,7 @@ export class Line {
    * Gets the x coordinate of the rightmost point on this line.
    * @returns {number} The x coordinate of the rightmost point on this line.
    */
-  get right() {
+  public get right() {
     return Math.max(this.start.x, this.end.x);
   }
 
@@ -292,7 +292,7 @@ export class Line {
    * Gets the y coordinate of the topmost point on this line.
    * @returns {number} The y coordinate of the topmost point on this line.
    */
-  get top() {
+  public get top() {
     return Math.min(this.start.y, this.end.y);
   }
 
@@ -300,7 +300,7 @@ export class Line {
    * Gets the y coordinate of the bottommost point on this line.
    * @returns {number} The y coordinate of the bottommost point on this line.
    */
-  get bottom() {
+  public get bottom() {
     return Math.max(this.start.y, this.end.y);
   }
 
@@ -308,7 +308,7 @@ export class Line {
    * Gets the width of this line (absolute difference between x coordinates).
    * @returns {number} The width of this line.
    */
-  get width() {
+  public get width() {
     return Math.abs(this.start.x - this.end.x);
   }
 
@@ -316,7 +316,7 @@ export class Line {
    * Gets the height of this line (absolute difference between y coordinates).
    * @returns {number} The height of this line.
    */
-  get height() {
+  public get height() {
     return Math.abs(this.start.y - this.end.y);
   }
 
@@ -324,7 +324,7 @@ export class Line {
    * Gets the normal vector x component of this line (perpendicular to the line).
    * @returns {number} The normal vector x component of this line.
    */
-  get normalX() {
+  public get normalX() {
     return Math.cos(this.angle - 1.5707963267948966);
   }
 
@@ -332,7 +332,7 @@ export class Line {
    * Gets the normal vector y component of this line (perpendicular to the line).
    * @returns {number} The normal vector y component of this line.
    */
-  get normalY() {
+  public get normalY() {
     return Math.sin(this.angle - 1.5707963267948966);
   }
 
@@ -340,7 +340,7 @@ export class Line {
    * Gets the angle of the normal vector of this line in radians.
    * @returns {number} The angle of the normal vector of this line in radians.
    */
-  get normalAngle() {
+  public get normalAngle() {
     return wrap(this.angle - 1.5707963267948966, -Math.PI, Math.PI);
   }
 }

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

@@ -1,4 +1,4 @@
-import { expect } from 'vitest';
+import { expect, describe, it } from 'vitest';
 import { Matrix } from './matrix.js';
 import { Point } from './point.js';
 

package/src/phaser/geom/matrix.ts

@@ -3,13 +3,13 @@ import { clone } from './util/matrix.js';
 import { GEOM_MATRIX } from '../core/const.js';
 
 export class Matrix {
-  a: number;
-  b: number;
-  c: number;
-  d: number;
-  tx: number;
-  ty: number;
-  type: number;
+  public a: number;
+  public b: number;
+  public c: number;
+  public d: number;
+  public tx: number;
+  public ty: number;
+  public type: number;
 
   /**
    * Creates a new Matrix instance.
@@ -20,7 +20,7 @@ export class Matrix {
    * @param {number} tx - The tx component of the matrix (default: 0).
    * @param {number} ty - The ty component of the matrix (default: 0).
    */
-  constructor(a: number = 1, b: number = 0, c: number = 0, d: number = 1, tx: number = 0, ty: number = 0) {
+  public constructor(a = 1, b = 0, c = 0, d = 1, tx = 0, ty = 0) {
     /** @type {number} */
     this.a = a;
     /** @type {number} */
@@ -42,8 +42,8 @@ export class Matrix {
    * @param {number[]} array - The array to read the matrix components from (should have 6 elements).
    * @returns {Matrix} This matrix instance for chaining.
    */
-  fromArray(array: number[]) {
-    return this.setTo(array[0], array[1], array[3], array[4], array[2], array[5]);
+  public fromArray(array: number[]) {
+    return this.setTo(array[0]!, array[1]!, array[3]!, array[4]!, array[2]!, array[5]!);
   }
 
   /**
@@ -56,7 +56,7 @@ export class Matrix {
    * @param {number} ty - The new ty component of the matrix.
    * @returns {Matrix} This matrix instance for chaining.
    */
-  setTo(a: number, b: number, c: number, d: number, tx: number, ty: number) {
+  public setTo(a: number, b: number, c: number, d: number, tx: number, ty: number) {
     this.a = a;
     this.b = b;
     this.c = c;
@@ -70,7 +70,7 @@ export class Matrix {
    * Creates a clone of this matrix.
    * @returns {Matrix} A new matrix with the same values as this one.
    */
-  clone() {
+  public clone() {
     return clone(this);
   }
 
@@ -79,7 +79,7 @@ export class Matrix {
    * @param {Matrix} matrix - The matrix to copy values to.
    * @returns {Matrix} The destination matrix.
    */
-  copyTo(matrix: Matrix) {
+  public copyTo(matrix: Matrix) {
     matrix.copyFrom(this);
     return matrix;
   }
@@ -89,7 +89,7 @@ export class Matrix {
    * @param {Matrix} matrix - The matrix to copy values from.
    * @returns {Matrix} This matrix instance for chaining.
    */
-  copyFrom(matrix: Matrix) {
+  public copyFrom(matrix: Matrix) {
     this.a = matrix.a;
     this.b = matrix.b;
     this.c = matrix.c;
@@ -105,8 +105,8 @@ export class Matrix {
    * @param {Float32Array} output - The array to store the result in (optional).
    * @returns {Float32Array} A Float32Array containing the matrix elements.
    */
-  toArray(transpose: boolean = false, output: Float32Array | null = null) {
-    const result = output || new Float32Array(9);
+  public toArray(transpose = false, output: Float32Array | null = null) {
+    const result = output ?? new Float32Array(9);
     if (transpose) {
       result[0] = this.a;
       result[1] = this.b;
@@ -137,8 +137,8 @@ export class Matrix {
    * @param {Point} output - The point to store the result in (optional).
    * @returns {Point} The transformed point.
    */
-  apply(pos: Point, output: Point | null = null) {
-    const result = output || new Point();
+  public apply(pos: Point, output: Point | null = null) {
+    const result = output ?? new Point();
     result.x = this.a * pos.x + this.c * pos.y + this.tx;
     result.y = this.b * pos.x + this.d * pos.y + this.ty;
     return result;
@@ -150,11 +150,11 @@ export class Matrix {
    * @param {Point} output - The point to store the result in (optional).
    * @returns {Point} The transformed point.
    */
-  applyInverse(pos: Point, output: Point | null = null) {
-    const result = output || new Point();
+  public applyInverse(pos: Point, output: Point | null = null) {
+    const result = output ?? new Point();
     const id = 1 / (this.a * this.d + this.c * -this.b);
-    const x = pos.x;
-    const y = pos.y;
+    const { x } = pos;
+    const { y } = pos;
     result.x = this.d * id * x + -this.c * id * y + (this.ty * this.c - this.tx * this.d) * id;
     result.y = this.a * id * y + -this.b * id * x + (-this.ty * this.a + this.tx * this.b) * id;
     return result;
@@ -166,7 +166,7 @@ export class Matrix {
    * @param {number} y - The amount to translate in the y direction.
    * @returns {Matrix} This matrix instance for chaining.
    */
-  translate(x: number, y: number) {
+  public translate(x: number, y: number) {
     this.tx += x;
     this.ty += y;
     return this;
@@ -178,7 +178,7 @@ export class Matrix {
    * @param {number} y - The amount to scale in the y direction.
    * @returns {Matrix} This matrix instance for chaining.
    */
-  scale(x: number, y: number) {
+  public scale(x: number, y: number) {
     this.a *= x;
     this.d *= y;
     this.c *= x;
@@ -193,7 +193,7 @@ export class Matrix {
    * @param {number} angle - The angle in radians to rotate by.
    * @returns {Matrix} This matrix instance for chaining.
    */
-  rotate(angle: number) {
+  public rotate(angle: number) {
     const cos = Math.cos(angle);
     const sin = Math.sin(angle);
     const a1 = this.a;
@@ -213,7 +213,7 @@ export class Matrix {
    * @param {Matrix} matrix - The matrix to append.
    * @returns {Matrix} This matrix instance for chaining.
    */
-  append(matrix: Matrix) {
+  public append(matrix: Matrix) {
     const a1 = this.a;
     const b1 = this.b;
     const c1 = this.c;
@@ -231,7 +231,7 @@ export class Matrix {
    * Sets this matrix to an identity matrix (no transformation).
    * @returns {Matrix} This matrix instance for chaining.
    */
-  identity() {
+  public identity() {
     return this.setTo(1, 0, 0, 1, 0, 0);
   }
 }

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

@@ -1,4 +1,4 @@
-import { expect } from 'vitest';
+import { expect, describe, it } from 'vitest';
 import { Point } from './point.js';
 
 describe('Point', () => {
@@ -68,7 +68,6 @@ describe('Point', () => {
 
   it('should divide points', () => {
     const point1 = new Point(10, 20);
-    const point2 = new Point(2, 3);
     const quotient = point1.divide(2, 3);
     expect(quotient.x).toBe(5);
     expect(quotient.y).toBeCloseTo(6.67);