melonjs 15.2.1 → 15.4.0

package/src/math/matrix3.js

@@ -5,7 +5,7 @@ import { EPSILON } from "./math.js";
  * @classdesc
  * a 4x4 Matrix3d Object
  */
- export default class Matrix3d {
+export default class Matrix3d {
     /**
      * @param {(Matrix3d|...number)} args - An instance of me.Matrix3d to copy from, or individual Matrix components (See {@link Matrix3d.setTransform}). If not arguments are given, the matrix will be set to Identity.
      */
@@ -34,10 +34,7 @@ import { EPSILON } from "./math.js";
 
     /**
      * tx component of the matrix
-     * @public
      * @type {number}
-     * @name tx
-     * @memberof Matrix3d
      */
     get tx() {
         return this.val[12];
@@ -45,10 +42,7 @@ import { EPSILON } from "./math.js";
 
     /**
      * ty component of the matrix
-     * @public
      * @type {number}
-     * @name ty
-     * @memberof Matrix3d
      */
     get ty() {
         return this.val[13];
@@ -56,10 +50,7 @@ import { EPSILON } from "./math.js";
 
     /**
      * ty component of the matrix
-     * @public
      * @type {number}
-     * @name tz
-     * @memberof Matrix3d
      */
     get tz() {
         return this.val[14];
@@ -69,8 +60,6 @@ import { EPSILON } from "./math.js";
      * reset the transformation matrix to the identity matrix (no transformation).<br>
      * the identity matrix and parameters position : <br>
      * <img src="images/identity-matrix_2x.png"/>
-     * @name identity
-     * @memberof Matrix3d
      * @returns {Matrix3d} Reference to this object for method chaining
      */
     identity() {
@@ -84,8 +73,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * set the matrix to the specified value
-     * @name setTransform
-     * @memberof Matrix3d
      * @param {number} m00
      * @param {number} m01
      * @param {number} m02
@@ -129,8 +116,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * Copies over the values from another me.Matrix3d.
-     * @name copy
-     * @memberof Matrix3d
      * @param {Matrix3d} m - the matrix object to copy from
      * @returns {Matrix3d} Reference to this object for method chaining
      */
@@ -141,8 +126,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * Copies over the upper-left 2x2 values from the given me.Matrix2d
-     * @name fromMat2d
-     * @memberof Matrix3d
      * @param {Matrix2d} m - the matrix object to copy from
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -159,8 +142,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * multiply both matrix
-     * @name multiply
-     * @memberof Matrix3d
      * @param {Matrix3d} m - Other matrix
      * @returns {Matrix3d} Reference to this object for method chaining
      */
@@ -214,8 +195,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * Transpose the value of this matrix.
-     * @name transpose
-     * @memberof Matrix3d
      * @returns {Matrix3d} Reference to this object for method chaining
      */
     transpose() {
@@ -227,93 +206,89 @@ import { EPSILON } from "./math.js";
             a13 = a[7],
             a23 = a[11];
 
-         a[1] = a[4];
-         a[2] = a[8];
-         a[3] = a[12];
-         a[4] = a01;
-         a[6] = a[9];
-         a[7] = a[13];
-         a[8] = a02;
-         a[9] = a12;
-         a[11] = a[14];
-         a[12] = a03;
-         a[13] = a13;
-         a[14] = a23;
-
-         return this;
+        a[1] = a[4];
+        a[2] = a[8];
+        a[3] = a[12];
+        a[4] = a01;
+        a[6] = a[9];
+        a[7] = a[13];
+        a[8] = a02;
+        a[9] = a12;
+        a[11] = a[14];
+        a[12] = a03;
+        a[13] = a13;
+        a[14] = a23;
+
+        return this;
     }
 
     /**
      * invert this matrix, causing it to apply the opposite transformation.
-     * @name invert
-     * @memberof Matrix3d
      * @returns {Matrix3d} Reference to this object for method chaining
      */
     invert() {
-         let a = this.val;
-
-         let a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3];
-         let a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7];
-         let a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11];
-         let a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
-
-         let b00 = a00 * a11 - a01 * a10;
-         let b01 = a00 * a12 - a02 * a10;
-         let b02 = a00 * a13 - a03 * a10;
-         let b03 = a01 * a12 - a02 * a11;
-
-         let b04 = a01 * a13 - a03 * a11;
-         let b05 = a02 * a13 - a03 * a12;
-         let b06 = a20 * a31 - a21 * a30;
-         let b07 = a20 * a32 - a22 * a30;
-
-         let b08 = a20 * a33 - a23 * a30;
-         let b09 = a21 * a32 - a22 * a31;
-         let b10 = a21 * a33 - a23 * a31;
-         let b11 = a22 * a33 - a23 * a32;
-
-         // Calculate the determinant
-         let det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
-
-         if (!det)
-         {
-             return null;
-         }
-
-         det = 1 / det;
-
-         a[0] = (a11 * b11 - a12 * b10 + a13 * b09) * det;
-         a[1] = (a02 * b10 - a01 * b11 - a03 * b09) * det;
-         a[2] = (a31 * b05 - a32 * b04 + a33 * b03) * det;
-         a[3] = (a22 * b04 - a21 * b05 - a23 * b03) * det;
-         a[4] = (a12 * b08 - a10 * b11 - a13 * b07) * det;
-         a[5] = (a00 * b11 - a02 * b08 + a03 * b07) * det;
-         a[6] = (a32 * b02 - a30 * b05 - a33 * b01) * det;
-         a[7] = (a20 * b05 - a22 * b02 + a23 * b01) * det;
-         a[8] = (a10 * b10 - a11 * b08 + a13 * b06) * det;
-         a[9] = (a01 * b08 - a00 * b10 - a03 * b06) * det;
-         a[10] = (a30 * b04 - a31 * b02 + a33 * b00) * det;
-         a[11] = (a21 * b02 - a20 * b04 - a23 * b00) * det;
-         a[12] = (a11 * b07 - a10 * b09 - a12 * b06) * det;
-         a[13] = (a00 * b09 - a01 * b07 + a02 * b06) * det;
-         a[14] = (a31 * b01 - a30 * b03 - a32 * b00) * det;
-         a[15] = (a20 * b03 - a21 * b01 + a22 * b00) * det;
-
-         return this;
+        let a = this.val;
+
+        let a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3];
+        let a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7];
+        let a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11];
+        let a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
+
+        let b00 = a00 * a11 - a01 * a10;
+        let b01 = a00 * a12 - a02 * a10;
+        let b02 = a00 * a13 - a03 * a10;
+        let b03 = a01 * a12 - a02 * a11;
+
+        let b04 = a01 * a13 - a03 * a11;
+        let b05 = a02 * a13 - a03 * a12;
+        let b06 = a20 * a31 - a21 * a30;
+        let b07 = a20 * a32 - a22 * a30;
+
+        let b08 = a20 * a33 - a23 * a30;
+        let b09 = a21 * a32 - a22 * a31;
+        let b10 = a21 * a33 - a23 * a31;
+        let b11 = a22 * a33 - a23 * a32;
+
+        // Calculate the determinant
+        let det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
+
+        if (!det)
+        {
+            return null;
+        }
+
+        det = 1 / det;
+
+        a[0] = (a11 * b11 - a12 * b10 + a13 * b09) * det;
+        a[1] = (a02 * b10 - a01 * b11 - a03 * b09) * det;
+        a[2] = (a31 * b05 - a32 * b04 + a33 * b03) * det;
+        a[3] = (a22 * b04 - a21 * b05 - a23 * b03) * det;
+        a[4] = (a12 * b08 - a10 * b11 - a13 * b07) * det;
+        a[5] = (a00 * b11 - a02 * b08 + a03 * b07) * det;
+        a[6] = (a32 * b02 - a30 * b05 - a33 * b01) * det;
+        a[7] = (a20 * b05 - a22 * b02 + a23 * b01) * det;
+        a[8] = (a10 * b10 - a11 * b08 + a13 * b06) * det;
+        a[9] = (a01 * b08 - a00 * b10 - a03 * b06) * det;
+        a[10] = (a30 * b04 - a31 * b02 + a33 * b00) * det;
+        a[11] = (a21 * b02 - a20 * b04 - a23 * b00) * det;
+        a[12] = (a11 * b07 - a10 * b09 - a12 * b06) * det;
+        a[13] = (a00 * b09 - a01 * b07 + a02 * b06) * det;
+        a[14] = (a31 * b01 - a30 * b03 - a32 * b00) * det;
+        a[15] = (a20 * b03 - a21 * b01 + a22 * b00) * det;
+
+        return this;
     }
 
     /**
      * apply the current transform to the given 2d or 3d vector
-     * @name apply
-     * @memberof Matrix3d
      * @param {Vector2d|Vector3d} v - the vector object to be transformed
      * @returns {Vector2d|Vector3d} result vector object.
      */
-     apply(v) {
+    apply(v) {
         let a = this.val,
-        x = v.x,
-        y = v.y,
-        z = (typeof v.z !== "undefined") ? v.z : 1;
+            x = v.x,
+            y = v.y,
+            z = (typeof v.z !== "undefined") ? v.z : 1;
 
         let w = (a[3] * x + a[7] * y + a[11] * z + a[15]) || 1.0;
 
@@ -325,32 +300,28 @@ import { EPSILON } from "./math.js";
         }
 
         return v;
-     }
+    }
 
-     /**
+    /**
       * apply the inverted current transform to the given 2d or 3d vector
-      * @name applyInverse
-      * @memberof Matrix3d
       * @param {Vector2d|Vector3d} v - the vector object to be transformed
       * @returns {Vector2d|Vector3d} result vector object.
       */
-     applyInverse(v) {
-         // invert the current matrix
-         let im = pool.pull("Matrix3d", this).invert();
+    applyInverse(v) {
+        // invert the current matrix
+        let im = pool.pull("Matrix3d", this).invert();
 
-         // apply the inverted matrix
-         im.apply(v);
+        // apply the inverted matrix
+        im.apply(v);
 
-         pool.push(im);
+        pool.push(im);
 
-         return v;
-     }
+        return v;
+    }
 
     /**
      * generate an orthogonal projection matrix, with the result replacing the current matrix
      * <img src="images/glOrtho.gif"/><br>
-     * @name ortho
-     * @memberof Matrix3d
      * @param {number} left - farthest left on the x-axis
      * @param {number} right - farthest right on the x-axis
      * @param {number} bottom - farthest down on the y-axis
@@ -387,8 +358,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * scale the matrix
-     * @name scale
-     * @memberof Matrix3d
      * @param {number} x - a number representing the abscissa of the scaling vector.
      * @param {number} [y=x] - a number representing the ordinate of the scaling vector.
      * @param {number} [z=0] - a number representing the depth vector
@@ -417,8 +386,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * adds a 2D scaling transformation.
-     * @name scaleV
-     * @memberof Matrix3d
      * @param {Vector2d|Vector3d} v - scaling vector
      * @returns {Matrix3d} Reference to this object for method chaining
      */
@@ -428,8 +395,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * specifies a 2D scale operation using the [sx, 1] scaling vector
-     * @name scaleX
-     * @memberof Matrix3d
      * @param {number} x - x scaling vector
      * @returns {Matrix3d} Reference to this object for method chaining
      */
@@ -439,8 +404,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * specifies a 2D scale operation using the [1,sy] scaling vector
-     * @name scaleY
-     * @memberof Matrix3d
      * @param {number} y - y scaling vector
      * @returns {Matrix3d} Reference to this object for method chaining
      */
@@ -450,8 +413,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * rotate this matrix (counter-clockwise) by the specified angle (in radians).
-     * @name rotate
-     * @memberof Matrix3d
      * @param {number} angle - Rotation angle in radians.
      * @param {Vector3d} v - the axis to rotate around
      * @returns {Matrix3d} Reference to this object for method chaining
@@ -529,21 +490,11 @@ import { EPSILON } from "./math.js";
 
     /**
      * translate the matrix position using the given vector
-     * @name translate
-     * @memberof Matrix3d
-     * @method
-     * @param {number} x - a number representing the abscissa of the vector.
-     * @param {number} [y=x] - a number representing the ordinate of the vector.
+     * @param {number|Vector2d|Vector3d} x - a number representing the abscissa of the vector, or a vector object
+     * @param {number} [y] - a number representing the ordinate of the vector.
      * @param {number} [z=0] - a number representing the depth of the vector
      * @returns {Matrix3d} Reference to this object for method chaining
      */
-    /**
-     * translate the matrix by a vector on the horizontal and vertical axis
-     * @name translateV
-     * @memberof Matrix3d
-     * @param {Vector2d|Vector3d} v - the vector to translate the matrix by
-     * @returns {Matrix3d} Reference to this object for method chaining
-     */
     translate() {
         let a = this.val;
         let _x, _y, _z;
@@ -570,8 +521,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * returns true if the matrix is an identity matrix.
-     * @name isIdentity
-     * @memberof Matrix3d
      * @returns {boolean}
      */
     isIdentity() {
@@ -599,8 +548,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * return true if the two matrices are identical
-     * @name equals
-     * @memberof Matrix3d
      * @param {Matrix3d} m - the other matrix
      * @returns {boolean} true if both are equals
      */
@@ -630,8 +577,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * Clone the Matrix
-     * @name clone
-     * @memberof Matrix3d
      * @returns {Matrix3d}
      */
     clone() {
@@ -640,8 +585,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * return an array representation of this Matrix
-     * @name toArray
-     * @memberof Matrix3d
      * @returns {Float32Array}
      */
     toArray() {
@@ -650,8 +593,6 @@ import { EPSILON } from "./math.js";
 
     /**
      * convert the object to a string representation
-     * @name toString
-     * @memberof Matrix3d
      * @returns {string}
      */
     toString() {

package/src/math/observable_vector2.js

@@ -7,7 +7,7 @@ import {clamp} from "./math.js";
  * A Vector2d object that provide notification by executing the given callback when the vector is changed.
  * @augments Vector2d
  */
- export default class ObservableVector2d extends Vector2d {
+export default class ObservableVector2d extends Vector2d {
     /**
      * @param {number} x - x value of the vector
      * @param {number} y - y value of the vector
@@ -87,10 +87,10 @@ import {clamp} from "./math.js";
             this._x = ret.x;
             this._y = ret.y;
         } else {
-          this._x = x;
-          this._y = y;
-       }
-       return this;
+            this._x = x;
+            this._y = y;
+        }
+        return this;
     }
 
     /**
@@ -402,7 +402,7 @@ import {clamp} from "./math.js";
      * @param {number} step - the maximum step per iteration (Negative values will push the vector away from the target)
      * @returns {ObservableVector2d} Reference to this object for method chaining
      */
-     moveTowards(target, step) {
+    moveTowards(target, step) {
         let angle = Math.atan2(target.y - this._y, target.x - this._x);
 
         let distance = this.distance(target);

package/src/math/observable_vector3.js

@@ -7,7 +7,7 @@ import pool from "./../system/pooling.js";
  * A Vector3d object that provide notification by executing the given callback when the vector is changed.
  * @augments Vector3d
  */
- export default class ObservableVector3d extends Vector3d {
+export default class ObservableVector3d extends Vector3d {
     /**
      * @param {number} x - x value of the vector
      * @param {number} y - y value of the vector
@@ -113,9 +113,9 @@ import pool from "./../system/pooling.js";
             this._y = ret.y;
             this._z = ret.z;
         } else {
-          this._x = x;
-          this._y = y;
-          this._z = z || 0;
+            this._x = x;
+            this._y = y;
+            this._z = z || 0;
         }
         return this;
     }