merge JSMath and Maths and toolchain TS into AMD modules

production build achieved from assembly

Author: Huguenin-Elie Steve

.gitignore

@@ -1,3 +1,4 @@
+.vscode
 .rvmrc
 .DS_Store
 tmp

.size-snapshot.json

@@ -5,8 +5,8 @@
     "gzipped": 13273
   },
   "dist\\gl-matrix-min.js": {
-    "bundled": 2167,
-    "minified": 1888,
-    "gzipped": 980
+    "bundled": 223200,
+    "minified": 52941,
+    "gzipped": 13521
   }
 }

assembly/imports.ts

@@ -5,22 +5,21 @@
 // prettier-ignore
 
 /**
- * JS Importations
+ * Extended Math functions
  * @module glMatrix
  */
-export declare namespace JSMath {
+
+export namespace Maths {
   // @ts-ignore decorator
   @external("Math", "hypot")
-  function hypot(a: f64, b: f64, c?: f64, d?: f64, e?: f64, f?: f64, g?: f64, h?: f64, i?: f64, j?: f64, k?: f64, l?: f64, m?: f64, n?: f64, o?: f64, p?: f64): f64;
-}
+  export declare function hypot(a: f64, b: f64, c?: f64, d?: f64, e?: f64, f?: f64, g?: f64, h?: f64, i?: f64, j?: f64, k?: f64, l?: f64, m?: f64, n?: f64, o?: f64, p?: f64): f64;
 
-export namespace Maths {
   export function min(a: i32, b: i32): i32 {
     return a < b ? a : b;
   }
 
   export function max(a: f64, b: f64, c: f64): f64 {
-    const q = Math.max(b, c)
+    const q = Math.max(b, c);
     return Math.max(a, q);
   }
 }

assembly/mat2.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IndexedCollection, JSMath, Maths } from "./imports";
+import { IndexedCollection,  Maths } from "./imports";
 import { ReadonlyVec2 } from "./vec2";
 
 export type mat2 = IndexedCollection;
@@ -313,7 +313,7 @@ export function str(a: ReadonlyMat2): string {
  * @returns {Number} Frobenius norm
  */
 export function frob(a: ReadonlyMat2): f64 {
-  return JSMath.hypot(a[0], a[1], a[2], a[3]);
+  return Maths.hypot(a[0], a[1], a[2], a[3]);
 }
 
 /**

assembly/mat2d.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IndexedCollection, JSMath, Maths } from "./imports";
+import { IndexedCollection,  Maths } from "./imports";
 import { ReadonlyVec2 } from "./vec2";
 
 export type mat2d = IndexedCollection;
@@ -381,7 +381,7 @@ export function str(a: ReadonlyMat2d): string {
  * @returns {Number} Frobenius norm
  */
 export function frob(a: ReadonlyMat2d): f64 {
-  return JSMath.hypot(a[0], a[1], a[2], a[3], a[4], a[5], 1);
+  return Maths.hypot(a[0], a[1], a[2], a[3], a[4], a[5], 1);
 }
 
 /**

assembly/mat3.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IndexedCollection, JSMath, Maths } from "./imports";
+import { IndexedCollection,  Maths } from "./imports";
 import { ReadonlyMat2 } from "./mat2";
 import { ReadonlyMat4 } from "./mat4";
 import { ReadonlyVec2 } from "./vec2";
@@ -704,7 +704,7 @@ export function str(a: ReadonlyMat3): string {
  * @returns {Number} Frobenius norm
  */
 export function frob(a: ReadonlyMat3): f64 {
-  return JSMath.hypot(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8]);
+  return Maths.hypot(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8]);
 }
 
 /**

assembly/mat4.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IndexedCollection, JSMath, Maths } from "./imports";
+import { IndexedCollection,  Maths } from "./imports";
 import * as quat from "./quat";
 import { ReadonlyQuat2 } from "./quat2";
 import * as vec3 from "./vec3";
@@ -634,7 +634,7 @@ export function rotate(out: mat4, a: ReadonlyMat4, rad: f64, axis: vec3.Readonly
   let x = axis[0],
     y = axis[1],
     z = axis[2];
-  let len = JSMath.hypot(x, y, z);
+  let len = Maths.hypot(x, y, z);
   let s: f64, c: f64, t: f64;
   let a00: f64, a01: f64, a02: f64, a03: f64;
   let a10: f64, a11: f64, a12: f64, a13: f64;
@@ -914,7 +914,7 @@ export function fromRotation(out: mat4, rad: f64, axis: vec3.ReadonlyVec3): mat4
   let x = axis[0],
     y = axis[1],
     z = axis[2];
-  let len = JSMath.hypot(x, y, z);
+  let len = Maths.hypot(x, y, z);
   let s: f64, c: f64, t: f64;
 
   if (len < glMatrix.EPSILON) {
@@ -1181,9 +1181,9 @@ export function getScaling(out: mat4, mat: ReadonlyMat4): mat4 {
   let m32 = mat[9];
   let m33 = mat[10];
 
-  out[0] = JSMath.hypot(m11, m12, m13);
-  out[1] = JSMath.hypot(m21, m22, m23);
-  out[2] = JSMath.hypot(m31, m32, m33);
+  out[0] = Maths.hypot(m11, m12, m13);
+  out[1] = Maths.hypot(m21, m22, m23);
+  out[2] = Maths.hypot(m31, m32, m33);
 
   return out;
 }
@@ -1271,9 +1271,9 @@ export function decompose(out_r: quat.quat, out_t: vec3.vec3, out_s: vec3.vec3,
   let m32 = mat[9];
   let m33 = mat[10];
 
-  out_s[0] = JSMath.hypot(m11, m12, m13);
-  out_s[1] = JSMath.hypot(m21, m22, m23);
-  out_s[2] = JSMath.hypot(m31, m32, m33);
+  out_s[0] = Maths.hypot(m11, m12, m13);
+  out_s[1] = Maths.hypot(m21, m22, m23);
+  out_s[2] = Maths.hypot(m31, m32, m33);
 
   let is1 = 1 / out_s[0];
   let is2 = 1 / out_s[1];
@@ -1786,15 +1786,15 @@ export function lookAt(out: mat4, eye: vec3.ReadonlyVec3, center: vec3.ReadonlyV
   z1 = eyey - centery;
   z2 = eyez - centerz;
 
-  len = 1 / JSMath.hypot(z0, z1, z2);
+  len = 1 / Maths.hypot(z0, z1, z2);
   z0 *= len;
   z1 *= len;
   z2 *= len;
 
   x0 = upy * z2 - upz * z1;
   x1 = upz * z0 - upx * z2;
   x2 = upx * z1 - upy * z0;
-  len = JSMath.hypot(x0, x1, x2);
+  len = Maths.hypot(x0, x1, x2);
   if (!len) {
     x0 = 0;
     x1 = 0;
@@ -1810,7 +1810,7 @@ export function lookAt(out: mat4, eye: vec3.ReadonlyVec3, center: vec3.ReadonlyV
   y1 = z2 * x0 - z0 * x2;
   y2 = z0 * x1 - z1 * x0;
 
-  len = JSMath.hypot(y0, y1, y2);
+  len = Maths.hypot(y0, y1, y2);
   if (!len) {
     y0 = 0;
     y1 = 0;
@@ -1953,7 +1953,7 @@ export function str(a: ReadonlyMat4): string {
  * @returns {Number} Frobenius norm
  */
 export function frob(a: ReadonlyMat4): f64 {
-  return JSMath.hypot(
+  return Maths.hypot(
     a[0],
     a[1],
     a[2],

assembly/quat2.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IndexedCollection, JSMath, Maths } from "./imports";
+import { IndexedCollection,  Maths } from "./imports";
 import * as mat4 from "./mat4";
 import * as quat from "./quat";
 import * as vec3 from "./vec3";
@@ -543,7 +543,7 @@ export function rotateAroundAxis(out: quat2, a: ReadonlyQuat2, axis: vec3.Readon
   if (Math.abs(rad) < glMatrix.EPSILON) {
     return copy(out, a);
   }
-  let axisLength = JSMath.hypot(axis[0], axis[1], axis[2]);
+  let axisLength = Maths.hypot(axis[0], axis[1], axis[2]);
 
   rad = rad * 0.5;
   let s = Math.sin(rad);

assembly/vec2.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IArguments, IndexedCollection, JSMath, Maths } from "./imports";
+import { IArguments, IndexedCollection,  Maths } from "./imports";
 import { ReadonlyMat2 } from "./mat2";
 import { ReadonlyMat2d } from "./mat2d";
 import { ReadonlyMat3 } from "./mat3";
@@ -244,7 +244,7 @@ export function scaleAndAdd(out: vec2, a: ReadonlyVec2, b: ReadonlyVec2, scale:
 export function distance(a: ReadonlyVec2, b: ReadonlyVec2): f64 {
   var x = b[0] - a[0],
     y = b[1] - a[1];
-  return JSMath.hypot(x, y);
+  return Maths.hypot(x, y);
 }
 
 /**

assembly/vec3.ts

@@ -1,5 +1,5 @@
 import * as glMatrix from "./common";
-import { IArguments, IndexedCollection, JSMath, Maths } from "./imports";
+import { IArguments, IndexedCollection,  Maths } from "./imports";
 import { ReadonlyMat3 } from "./mat3";
 import { ReadonlyMat4 } from "./mat4";
 import { ReadonlyQuat } from "./quat";
@@ -52,7 +52,7 @@ export function length(a: ReadonlyVec3): f64 {
   let x = a[0];
   let y = a[1];
   let z = a[2];
-  return JSMath.hypot(x, y, z);
+  return Maths.hypot(x, y, z);
 }
 
 /**
@@ -275,7 +275,7 @@ export function distance(a: ReadonlyVec3, b: ReadonlyVec3): f64 {
   let x = b[0] - a[0];
   let y = b[1] - a[1];
   let z = b[2] - a[2];
-  return JSMath.hypot(x, y, z);
+  return Maths.hypot(x, y, z);
 }
 
 /**