@fbltd/math 1.0.20 → 1.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/dist/bin/src/index.js +2 -1
  2. package/dist/bin/src/matrices/index.js +2 -0
  3. package/dist/bin/src/{matrix.js → matrices/matrix2d.js} +18 -2
  4. package/dist/bin/src/matrices/matrix3d.js +59 -0
  5. package/dist/types/src/index.d.ts +2 -1
  6. package/dist/types/src/index.d.ts.map +1 -1
  7. package/dist/types/src/matrices/index.d.ts +3 -0
  8. package/dist/types/src/matrices/index.d.ts.map +1 -0
  9. package/dist/types/src/{matrix.d.ts → matrices/matrix2d.d.ts} +8 -12
  10. package/dist/types/src/matrices/matrix2d.d.ts.map +1 -0
  11. package/dist/types/src/matrices/matrix3d.d.ts +11 -0
  12. package/dist/types/src/matrices/matrix3d.d.ts.map +1 -0
  13. package/package.json +1 -1
  14. package/dist/types/src/matrix.d.ts.map +0 -1
package/dist/bin/src/index.js CHANGED
@@ -1,6 +1,7 @@
1
1
  export * from './angle.js';
2
- export * from './matrix.js';
2
+ export * from './matrices/matrix2d.js';
3
3
  export * from './utils.js';
4
4
  export * from './colors/index.js';
5
5
  export * from './figures/index.js';
6
6
  export * from './algorithm/index.js';
7
+ export * from './matrices/index.js';
package/dist/bin/src/matrices/index.js ADDED
@@ -0,0 +1,2 @@
1
+ export * from './matrix2d.js';
2
+ export * from './matrix3d.js';
package/dist/bin/src/{matrix.js → matrices/matrix2d.js} RENAMED
@@ -1,5 +1,5 @@
1
- import { Angle, AngleUnits } from "./index.js";
2
- export const identityMatrix = [1, 0, 0, 1, 0, 0];
1
+ import { Angle, AngleUnits, approximately } from "../index.js";
2
+ export const identityMatrix2d = Object.freeze([1, 0, 0, 1, 0, 0]);
3
3
  export function getIdentityMatrix() {
4
4
  return [1, 0, 0, 1, 0, 0];
5
5
  }
@@ -66,4 +66,20 @@ export class Matrix2d {
66
66
  static skew(m, x, y = 0, units = AngleUnits.Deg) {
67
67
  return Matrix2d.multiply(m, Matrix2d.skewIdentity(x, y, units));
68
68
  }
69
+ static isApproximatelyEqual(m1, m2) {
70
+ return (approximately(m1[0], m2[0]) &&
71
+ approximately(m1[1], m2[1]) &&
72
+ approximately(m1[2], m2[2]) &&
73
+ approximately(m1[3], m2[3]) &&
74
+ approximately(m1[4], m2[4]) &&
75
+ approximately(m1[5], m2[5]));
76
+ }
77
+ static isEqual(m1, m2) {
78
+ return (m1[0], m2[0] &&
79
+ m1[1], m2[1] &&
80
+ m1[2], m2[2] &&
81
+ m1[3], m2[3] &&
82
+ m1[4], m2[4] &&
83
+ m1[5], m2[5]);
84
+ }
69
85
  }
package/dist/bin/src/matrices/matrix3d.js ADDED
@@ -0,0 +1,59 @@
1
+ import { approximately } from "../../index.js";
2
+ export const identityMatrix3d = [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0];
3
+ Object.freeze(identityMatrix3d);
4
+ export class Matrix3d {
5
+ static multiply(matrix, ...rest) {
6
+ for (let m of rest) {
7
+ matrix = [
8
+ m[0] * matrix[0] + m[1] * matrix[3] + m[2] * matrix[6],
9
+ m[0] * matrix[1] + m[1] * matrix[4] + m[2] * matrix[7],
10
+ m[0] * matrix[2] + m[1] * matrix[5] + m[2] * matrix[8],
11
+ m[3] * matrix[0] + m[4] * matrix[3] + m[5] * matrix[6],
12
+ m[3] * matrix[1] + m[4] * matrix[4] + m[5] * matrix[7],
13
+ m[3] * matrix[2] + m[4] * matrix[5] + m[5] * matrix[8],
14
+ m[6] * matrix[0] + m[7] * matrix[3] + m[8] * matrix[6],
15
+ m[6] * matrix[1] + m[7] * matrix[4] + m[8] * matrix[7],
16
+ m[6] * matrix[2] + m[7] * matrix[5] + m[8] * matrix[8],
17
+ m[9] * matrix[0] + m[10] * matrix[3] + m[11] * matrix[6] + matrix[9],
18
+ m[9] * matrix[1] + m[10] * matrix[4] + m[11] * matrix[7] + matrix[10],
19
+ m[9] * matrix[2] + m[10] * matrix[5] + m[11] * matrix[8] + matrix[11],
20
+ ];
21
+ }
22
+ return matrix;
23
+ }
24
+ static apply(matrix, point) {
25
+ return [
26
+ point[0] * matrix[0] + point[1] * matrix[3] + point[2] * matrix[6] + matrix[9],
27
+ point[0] * matrix[1] + point[1] * matrix[4] + point[2] * matrix[7] + matrix[10],
28
+ point[0] * matrix[2] + point[1] * matrix[5] + point[2] * matrix[8] + matrix[11],
29
+ ];
30
+ }
31
+ static isApproximatelyEqual(m1, m2) {
32
+ return (approximately(m1[0], m2[0]) &&
33
+ approximately(m1[1], m2[1]) &&
34
+ approximately(m1[2], m2[2]) &&
35
+ approximately(m1[3], m2[3]) &&
36
+ approximately(m1[4], m2[4]) &&
37
+ approximately(m1[5], m2[5]) &&
38
+ approximately(m1[6], m2[6]) &&
39
+ approximately(m1[7], m2[7]) &&
40
+ approximately(m1[8], m2[8]) &&
41
+ approximately(m1[9], m2[9]) &&
42
+ approximately(m1[10], m2[10]) &&
43
+ approximately(m1[11], m2[11]));
44
+ }
45
+ static isEqual(m1, m2) {
46
+ return (m1[0], m2[0] &&
47
+ m1[1], m2[1] &&
48
+ m1[2], m2[2] &&
49
+ m1[3], m2[3] &&
50
+ m1[4], m2[4] &&
51
+ m1[5], m2[5] &&
52
+ m1[6], m2[6] &&
53
+ m1[7], m2[7] &&
54
+ m1[8], m2[8] &&
55
+ m1[9], m2[9] &&
56
+ m1[10], m2[10] &&
57
+ m1[11], m2[11]);
58
+ }
59
+ }
package/dist/types/src/index.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  export * from './angle.js';
2
- export * from './matrix.js';
2
+ export * from './matrices/matrix2d.js';
3
3
  export * from './utils.js';
4
4
  export * from './colors/index.js';
5
5
  export * from './figures/index.js';
6
6
  export * from './algorithm/index.js';
7
+ export * from './matrices/index.js';
7
8
  //# sourceMappingURL=index.d.ts.map
package/dist/types/src/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,wBAAwB,CAAA;AACtC,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA"}
package/dist/types/src/matrices/index.d.ts ADDED
@@ -0,0 +1,3 @@
1
+ export * from './matrix2d.js';
2
+ export * from './matrix3d.js';
3
+ //# sourceMappingURL=index.d.ts.map
package/dist/types/src/matrices/index.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/matrices/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA"}
package/dist/types/src/{matrix.d.ts → matrices/matrix2d.d.ts} RENAMED
@@ -1,16 +1,10 @@
1
- import { AngleUnits, type IPoint2 } from "./index.js";
2
- export type IMatrix2d = [
3
- number,
4
- number,
5
- number,
6
- number,
7
- number,
8
- number
9
- ];
10
- export declare const identityMatrix: IMatrix2d;
1
+ import { AngleUnits, type IPoint2 } from "../index.js";
2
+ import type { IFixedLengthArray } from "../type.utils.js";
3
+ export type IMatrix2d = IFixedLengthArray<6, number>;
4
+ export declare const identityMatrix2d: IMatrix2d;
11
5
  export declare function getIdentityMatrix(): IMatrix2d;
12
6
  export declare class Matrix2d {
13
- static multiply(matrix: IMatrix2d, ...matrices: IMatrix2d[]): IMatrix2d;
7
+ static multiply(matrix: IMatrix2d, ...matrices: IMatrix2d[]): [number, number, number, number, number, number];
14
8
  static apply(matrix: IMatrix2d, point: IPoint2): IPoint2;
15
9
  static scaleIdentity(x: number, y?: number): IMatrix2d;
16
10
  static scale(m: IMatrix2d, x: number, y?: number): IMatrix2d;
@@ -24,5 +18,7 @@ export declare class Matrix2d {
24
18
  static skewX(m: IMatrix2d, x: number, units?: AngleUnits): IMatrix2d;
25
19
  static skewY(m: IMatrix2d, y: number, units?: AngleUnits): IMatrix2d;
26
20
  static skew(m: IMatrix2d, x: number, y?: number, units?: AngleUnits): IMatrix2d;
21
+ static isApproximatelyEqual(m1: IMatrix2d, m2: IMatrix2d): boolean;
22
+ static isEqual(m1: IMatrix2d, m2: IMatrix2d): number;
27
23
  }
28
- //# sourceMappingURL=matrix.d.ts.map
24
+ //# sourceMappingURL=matrix2d.d.ts.map
package/dist/types/src/matrices/matrix2d.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"matrix2d.d.ts","sourceRoot":"","sources":["../../../../src/matrices/matrix2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAiB,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;AAEpD,eAAO,MAAM,gBAAgB,EAAE,SAA0D,CAAC;AAE1F,wBAAgB,iBAAiB,IAAI,SAAS,CAE7C;AA2BD,qBAAa,QAAQ;IAWjB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,SAAS,EAAE;IAe3D,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAOxD,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAIzD,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAI/D,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAOvE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAI7E,MAAM,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAI7D,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAInE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrD,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrD,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAQ5E,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAIxE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAIxE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,SAAI,EAAE,KAAK,aAAiB,GAAG,SAAS;IAI9E,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS;IAWxD,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS;CAU9C"}
package/dist/types/src/matrices/matrix3d.d.ts ADDED
@@ -0,0 +1,11 @@
1
+ import { type IPoint3 } from "../../index.js";
2
+ import type { IFixedLengthArray, INonEmptyArray } from "../type.utils.js";
3
+ export type IMatrix3d = IFixedLengthArray<12, number>;
4
+ export declare const identityMatrix3d: IMatrix3d;
5
+ export declare class Matrix3d {
6
+ static multiply(matrix: IMatrix3d, ...rest: INonEmptyArray<IMatrix3d>): [number, number, number, number, number, number, number, number, number, number, number, number];
7
+ static apply(matrix: IMatrix3d, point: IPoint3): IPoint3;
8
+ static isApproximatelyEqual(m1: IMatrix3d, m2: IMatrix3d): boolean;
9
+ static isEqual(m1: IMatrix3d, m2: IMatrix3d): number;
10
+ }
11
+ //# sourceMappingURL=matrix3d.d.ts.map
package/dist/types/src/matrices/matrix3d.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"matrix3d.d.ts","sourceRoot":"","sources":["../../../../src/matrices/matrix3d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE1E,MAAM,MAAM,SAAS,GAAG,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;AAErD,eAAO,MAAM,gBAAgB,EAAE,SAAgD,CAAC;AAGhF,qBAAa,QAAQ;IACjB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,cAAc,CAAC,SAAS,CAAC;IAyBrE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAQxD,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS;IAiBxD,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS;CAgB9C"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fbltd/math",
3
- "version": "1.0.20",
3
+ "version": "1.0.22",
4
4
  "description": "Math and geometry utilities",
5
5
  "sideEffects": false,
6
6
  "main": "dist/bin/index.js",
package/dist/types/src/matrix.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../../src/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,MAAM,SAAS,GAAG;IACpB,MAAM;IAAE,MAAM;IAAE,MAAM;IACtB,MAAM;IAAE,MAAM;IAAE,MAAM;CACzB,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,SAA8B,CAAA;AAC3D,wBAAgB,iBAAiB,IAAI,SAAS,CAE7C;AA2BD,qBAAa,QAAQ;IAWjB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,SAAS,EAAE;IAe3D,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAOxD,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAIzD,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAI/D,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAOvE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAI7E,MAAM,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAI7D,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAE,MAAU,GAAG,SAAS;IAInE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrD,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrD,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAQ5E,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAIxE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,aAAiB,GAAG,SAAS;IAIxE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,SAAI,EAAE,KAAK,aAAiB,GAAG,SAAS;CAGjF"}