glmaths 0.0.3 → 0.0.4

package/src/mat3.ts

@@ -12,9 +12,9 @@ import { Mat4 } from './mat4'
  */
 export class Mat3 extends Float32Array {
 
-  static get identity() { return new Mat3(1, 0, 0, 0, 1, 0, 0, 0, 1) }
-  static get Identity() { return new Mat3(1, 0, 0, 0, 1, 0, 0, 0, 1) }
-  static get IDENTITY() { return new Mat3(1, 0, 0, 0, 1, 0, 0, 0, 1) }
+  static get identity() { return mat3(1, 0, 0, 0, 1, 0, 0, 0, 1) }
+  static get Identity() { return mat3(1, 0, 0, 0, 1, 0, 0, 0, 1) }
+  static get IDENTITY() { return mat3(1, 0, 0, 0, 1, 0, 0, 0, 1) }
 
   /**
    * Create a new mat3 with the given values
@@ -48,16 +48,16 @@ export class Mat3 extends Float32Array {
    * @returns {Mat3} a new Mat3
    */
   clone() {
-    return new Mat3(this[0], this[1], this[2], this[3], this[4], this[5], this[6], this[7], this[8])
+    return mat3(this[0], this[1], this[2], this[3], this[4], this[5], this[6], this[7], this[8])
   }
 
   /**
    * Transposes a mat3
    *
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  transpose(out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  transpose(out = glmaths.ALWAYS_COPY ? mat3() : this) {
     if (out === this) {
       const a01 = this[1], a02 = this[2], a12 = this[5]
       out[1] = this[3]
@@ -83,10 +83,10 @@ export class Mat3 extends Float32Array {
   /**
    * Inverts a mat3
    *
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3|null} out, or null if not invertible
    */
-  invert(out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  invert(out = glmaths.ALWAYS_COPY ? mat3() : this) {
     const a00 = this[0], a01 = this[1], a02 = this[2]
     const a10 = this[3], a11 = this[4], a12 = this[5]
     const a20 = this[6], a21 = this[7], a22 = this[8]
@@ -114,10 +114,10 @@ export class Mat3 extends Float32Array {
   /**
    * Calculates the adjugate of a mat3
    *
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  adjoint(out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  adjoint(out = glmaths.ALWAYS_COPY ? mat3() : this) {
     const a00 = this[0], a01 = this[1], a02 = this[2]
     const a10 = this[3], a11 = this[4], a12 = this[5]
     const a20 = this[6], a21 = this[7], a22 = this[8]
@@ -150,13 +150,13 @@ export class Mat3 extends Float32Array {
    * Multiplies two mat3's
    *
    * @param {Mat3} b the second operand
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
   multiply(b: Vec2): Vec2
   multiply(b: Vec3): Vec3
   multiply(b: Mat3, out?: Mat3): Mat3
-  multiply(b: Mat3 | Vec3 | Vec2, out: Mat3 = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  multiply(b: Mat3 | Vec3 | Vec2, out: Mat3 = glmaths.ALWAYS_COPY ? mat3() : this) {
     if (b instanceof Vec2)
       return b.transformMat3(this)
     if (b instanceof Vec3)
@@ -186,10 +186,10 @@ export class Mat3 extends Float32Array {
    * Translates a mat3 by the given vector
    *
    * @param {Vec2} v vector to translate by
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  translate(v: Vec2, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  translate(v: Vec2, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     const a00 = this[0], a01 = this[1], a02 = this[2]
     const a10 = this[3], a11 = this[4], a12 = this[5]
     const a20 = this[6], a21 = this[7], a22 = this[8]
@@ -211,10 +211,10 @@ export class Mat3 extends Float32Array {
    * Rotates a mat3 by the given angle
    *
    * @param {Number} rad the angle to rotate the matrix by
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  rotate(rad: number, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  rotate(rad: number, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     const a00 = this[0], a01 = this[1], a02 = this[2]
     const a10 = this[3], a11 = this[4], a12 = this[5]
     const a20 = this[6], a21 = this[7], a22 = this[8]
@@ -236,10 +236,10 @@ export class Mat3 extends Float32Array {
    * Scales a mat3 by the given vector
    *
    * @param {Vec2} v the vector to scale by
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  scale(v: Vec2, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  scale(v: Vec2, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     const x = v[0], y = v[1]
     out[0] = x * this[0]
     out[1] = x * this[1]
@@ -257,10 +257,10 @@ export class Mat3 extends Float32Array {
    * Creates a matrix from a translation vector
    *
    * @param {Vec2} v translation vector
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static fromTranslation(v: Vec2, out = new Mat3()) {
+  static fromTranslation(v: Vec2, out = mat3()) {
     out[0] = 1
     out[1] = 0
     out[2] = 0
@@ -277,10 +277,10 @@ export class Mat3 extends Float32Array {
    * Creates a matrix from a given angle
    *
    * @param {Number} rad the angle to rotate the matrix by
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static fromRotation(rad: number, out = new Mat3()) {
+  static fromRotation(rad: number, out = mat3()) {
     const s = Math.sin(rad), c = Math.cos(rad)
     out[0] = c
     out[1] = s
@@ -298,10 +298,10 @@ export class Mat3 extends Float32Array {
    * Creates a matrix from a scaling vector
    *
    * @param {Vec2} v scaling vector
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static fromScaling(v: Vec2, out = new Mat3()) {
+  static fromScaling(v: Vec2, out = mat3()) {
     out[0] = v[0]
     out[1] = 0
     out[2] = 0
@@ -318,10 +318,10 @@ export class Mat3 extends Float32Array {
    * Creates a mat3 from a Mat2x3
    *
    * @param {Mat2x3} a the Mat2x3 to convert
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static fromMat2x3(a: Mat2x3, out = new Mat3()) {
+  static fromMat2x3(a: Mat2x3, out = mat3()) {
     out[0] = a[0]
     out[1] = a[1]
     out[2] = 0
@@ -339,10 +339,10 @@ export class Mat3 extends Float32Array {
    * Calculates a mat3 from the given quaternion
    *
    * @param {Quat} q quaternion to create matrix from
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static fromQuat(q: Quat, out = new Mat3()) {
+  static fromQuat(q: Quat, out = mat3()) {
     const x = q[0], y = q[1], z = q[2], w = q[3]
     const x2 = x + x, y2 = y + y, z2 = z + z
     const xx = x * x2, yx = y * x2, yy = y * y2
@@ -367,10 +367,10 @@ export class Mat3 extends Float32Array {
    * Calculates a mat3 normal matrix (transpose inverse) from a mat4
    *
    * @param {Mat4} a the source mat4 to derive the normal matrix from
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3|null} out, or null if not invertible
    */
-  static normalFromMat4(a: Mat4, out = new Mat3()) {
+  static normalFromMat4(a: Mat4, out = mat3()) {
     const a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3]
     const a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7]
     const a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11]
@@ -409,10 +409,10 @@ export class Mat3 extends Float32Array {
    * Copies the upper-left 3x3 values of a mat4 into a mat3
    *
    * @param {Mat4} a the source mat4
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static fromMat4(a: Mat4, out = new Mat3()) {
+  static fromMat4(a: Mat4, out = mat3()) {
     out[0] = a[0]
     out[1] = a[1]
     out[2] = a[2]
@@ -431,10 +431,10 @@ export class Mat3 extends Float32Array {
    *
    * @param {Number} width width of the projection
    * @param {Number} height height of the projection
-   * @param {Mat3} out the receiving matrix, defaults to new Mat3()
+   * @param {Mat3} out the receiving matrix, defaults to mat3()
    * @returns {Mat3} out
    */
-  static projection(width: number, height: number, out = new Mat3()) {
+  static projection(width: number, height: number, out = mat3()) {
     out[0] = 2 / width
     out[1] = 0
     out[2] = 0
@@ -464,10 +464,10 @@ export class Mat3 extends Float32Array {
    * Adds two mat3's
    *
    * @param {Mat3} b the second operand
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  plus(b: Mat3, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  plus(b: Mat3, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     out[0] = this[0] + b[0]
     out[1] = this[1] + b[1]
     out[2] = this[2] + b[2]
@@ -484,10 +484,10 @@ export class Mat3 extends Float32Array {
    * Subtracts matrix b from this
    *
    * @param {Mat3} b the second operand
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  minus(b: Mat3, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  minus(b: Mat3, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     out[0] = this[0] - b[0]
     out[1] = this[1] - b[1]
     out[2] = this[2] - b[2]
@@ -504,10 +504,10 @@ export class Mat3 extends Float32Array {
    * Multiplies each element of a mat3 by a scalar number
    *
    * @param {Number} b amount to scale the matrix's elements by
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  scaleScalar(b: number, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  scaleScalar(b: number, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     out[0] = this[0] * b
     out[1] = this[1] * b
     out[2] = this[2] * b
@@ -525,10 +525,10 @@ export class Mat3 extends Float32Array {
    *
    * @param {Mat3} b the second operand
    * @param {Number} scale the amount to scale b's elements by before adding
-   * @param {Mat3} out the receiving matrix, defaults to this
+   * @param {Mat3} out the receiving matrix, defaults to new mat3()
    * @returns {Mat3} out
    */
-  multiplyScalarAndAdd(b: Mat3, scale: number, out = glmaths.ALWAYS_COPY ? new Mat3() : this) {
+  multiplyScalarAndAdd(b: Mat3, scale: number, out = glmaths.ALWAYS_COPY ? mat3() : this) {
     out[0] = this[0] + b[0] * scale
     out[1] = this[1] + b[1] * scale
     out[2] = this[2] + b[2] * scale
@@ -614,16 +614,15 @@ Mat3.prototype.times = Mat3.prototype.multiply
 Mat3.prototype.str = Mat3.prototype.toString
 Mat3.prototype.multiplyScalar = Mat3.prototype.scaleScalar
 
-export const mat3 = Object.assign(
-  (...args: (number | Float32Array)[]): Mat3 => {
-    const out = new Mat3()
-    let i = 0
-    for (const a of args) {
-      if (typeof a === 'number') out[i++] = a
-      else for (const v of a) out[i++] = v
-    }
-    return out
-  },
-  Mat3
-)
+const createMat3 = (...args: (number | Float32Array)[]): Mat3 => {
+  const out = new Mat3()
+  let i = 0
+  for (const a of args) {
+    if (typeof a === 'number') out[i++] = a
+    else for (const v of a) out[i++] = v
+  }
+  return out
+}
+Object.setPrototypeOf(createMat3, Mat3)
+export const mat3 = createMat3 as typeof createMat3 & typeof Mat3
 export const mat3x3 = mat3