@flighthq/geometry 0.5.1-next.973.788d3d7 → 0.6.0

package/src/matrix3.test.ts

@@ -7,7 +7,9 @@ import {
   copyMatrix3RowToVector3,
   createMatrix,
   createMatrix3,
+  createMatrix3FromValues,
   createMatrix4,
+  createMatrix4FromValues,
   createVector3,
   equalsMatrix3,
   getMatrix3Determinant,
@@ -28,9 +30,9 @@ import {
   transposeMatrix3,
   writeMatrix3ToFloat32Array,
 } from '@flighthq/geometry/contract';
-import type { Matrix3 } from '@flighthq/types/contract';
 
-import { initializeMatrix3 } from './matrix3';
+import { initializeMatrix3 } from './matrix3.ts';
+import type { Matrix3 } from './types.ts';
 
 // Matrix3 storage is column-major: element (row r, column c) lives at m[3 * c + r], matching
 // Matrix4 and the GL/GLSL/WGSL uniform ABI. A matrix-like {m} built from a raw Float32Array below
@@ -39,7 +41,7 @@ import { initializeMatrix3 } from './matrix3';
 
 describe('cloneMatrix3', () => {
   it('should clone the matrix correctly', () => {
-    const m1 = createMatrix3(2, 3, 4, 5, 6, 7, 8, 9, 10);
+    const m1 = createMatrix3FromValues(2, 3, 4, 5, 6, 7, 8, 9, 10);
     const m2 = cloneMatrix3(m1);
     expect(getMatrix3Element(m2, 0, 0)).toBe(2);
     expect(getMatrix3Element(m2, 0, 1)).toBe(3);
@@ -76,7 +78,7 @@ describe('cloneMatrix3', () => {
 
 describe('copyMatrix3', () => {
   it('should copy matrix values from another matrix', () => {
-    const m1 = createMatrix3(2, 3, 4, 5, 6, 7, 8, 9, 10);
+    const m1 = createMatrix3FromValues(2, 3, 4, 5, 6, 7, 8, 9, 10);
     const m2 = createMatrix3();
     copyMatrix3(m2, m1);
     expect(getMatrix3Element(m2, 0, 0)).toBe(2);
@@ -91,7 +93,7 @@ describe('copyMatrix3', () => {
   });
 
   it('supports out === source', () => {
-    const matrix = createMatrix3(2, 3, 4, 5, 6, 7, 8, 9, 10);
+    const matrix = createMatrix3FromValues(2, 3, 4, 5, 6, 7, 8, 9, 10);
     copyMatrix3(matrix, matrix);
     expect(Array.from(matrix.m)).toEqual([2, 5, 8, 3, 6, 9, 4, 7, 10]);
   });
@@ -135,7 +137,7 @@ describe('copyMatrix3ColumnFromVector3', () => {
 
 describe('copyMatrix3ColumnToVector3', () => {
   it('should copy column to a Vector3 from a Matrix3', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const v = createVector3();
     copyMatrix3ColumnToVector3(v, 0, m); // column 0
     expect(v.x).toBe(1);
@@ -144,7 +146,7 @@ describe('copyMatrix3ColumnToVector3', () => {
   });
 
   it('should copy column 1 into Vector3', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const v = createVector3();
     copyMatrix3ColumnToVector3(v, 1, m);
     expect(v.x).toBe(2);
@@ -153,7 +155,7 @@ describe('copyMatrix3ColumnToVector3', () => {
   });
 
   it('should copy column 2 into Vector3', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const v = createVector3();
     copyMatrix3ColumnToVector3(v, 2, m);
     expect(v.x).toBe(3);
@@ -217,7 +219,7 @@ describe('copyMatrix3RowFromVector3', () => {
 
 describe('copyMatrix3RowToVector3', () => {
   it('should copy row to a Vector3 from a Matrix3', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const v = createVector3();
     copyMatrix3RowToVector3(v, 0, m); // row 0
     expect(v.x).toBe(1); // m.a
@@ -226,7 +228,7 @@ describe('copyMatrix3RowToVector3', () => {
   });
 
   it('should copy row 1 (b, d, ty)', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const v = createVector3();
     copyMatrix3RowToVector3(v, 1, m);
     expect(v.x).toBe(4);
@@ -262,8 +264,15 @@ describe('copyMatrix3RowToVector3', () => {
 });
 
 describe('createMatrix3', () => {
-  it('should initialize matrix with provided values', () => {
-    const m = createMatrix3(2, 3, 4, 5, 6, 7, 8, 9, 10);
+  it('initializes to identity', () => {
+    const m = createMatrix3();
+    expect(Array.from(m.m)).toEqual([1, 0, 0, 0, 1, 0, 0, 0, 1]);
+  });
+});
+
+describe('createMatrix3FromValues', () => {
+  it('initializes matrix with provided values', () => {
+    const m = createMatrix3FromValues(2, 3, 4, 5, 6, 7, 8, 9, 10);
     expect(getMatrix3Element(m, 0, 0)).toBe(2);
     expect(getMatrix3Element(m, 0, 1)).toBe(3);
     expect(getMatrix3Element(m, 0, 2)).toBe(4);
@@ -276,22 +285,9 @@ describe('createMatrix3', () => {
   });
 
   it('stores its (row, column) arguments column-major', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     expect(Array.from(m.m)).toEqual([1, 4, 7, 2, 5, 8, 3, 6, 9]);
   });
-
-  it('should default to identity matrix when no values are provided', () => {
-    const m = createMatrix3();
-    expect(getMatrix3Element(m, 0, 0)).toBe(1);
-    expect(getMatrix3Element(m, 0, 1)).toBe(0);
-    expect(getMatrix3Element(m, 0, 2)).toBe(0);
-    expect(getMatrix3Element(m, 1, 0)).toBe(0);
-    expect(getMatrix3Element(m, 1, 1)).toBe(1);
-    expect(getMatrix3Element(m, 1, 2)).toBe(0);
-    expect(getMatrix3Element(m, 2, 0)).toBe(0);
-    expect(getMatrix3Element(m, 2, 1)).toBe(0);
-    expect(getMatrix3Element(m, 2, 2)).toBe(1);
-  });
 });
 
 describe('equalsMatrix3', () => {
@@ -325,7 +321,7 @@ describe('equalsMatrix3', () => {
   });
 
   it('should return true if one object is matrix-like and one is not', () => {
-    const mat1 = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const mat1 = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     // Column-major storage of the same matrix.
     const mat2 = { m: new Float32Array([1, 4, 7, 2, 5, 8, 3, 6, 9]) };
     expect(equalsMatrix3(mat1, mat2)).toBe(true);
@@ -345,18 +341,18 @@ describe('getMatrix3Determinant', () => {
 
   it('returns 0 for a singular matrix', () => {
     // Two identical rows → determinant = 0.
-    expect(getMatrix3Determinant(createMatrix3(1, 2, 3, 1, 2, 3, 4, 5, 6))).toBeCloseTo(0, 6);
+    expect(getMatrix3Determinant(createMatrix3FromValues(1, 2, 3, 1, 2, 3, 4, 5, 6))).toBeCloseTo(0, 6);
   });
 
   it('returns a negative value when a row is negated (sign flip)', () => {
     // Negate one row flips sign of det. Identity det = 1, negate row 0 → -1.
-    expect(getMatrix3Determinant(createMatrix3(-1, 0, 0, 0, 1, 0, 0, 0, 1))).toBeCloseTo(-1, 6);
+    expect(getMatrix3Determinant(createMatrix3FromValues(-1, 0, 0, 0, 1, 0, 0, 0, 1))).toBeCloseTo(-1, 6);
   });
 });
 
 describe('getMatrix3Element', () => {
   it('returns the element at the given row and column', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     expect(getMatrix3Element(m, 0, 0)).toBe(1);
     expect(getMatrix3Element(m, 0, 1)).toBe(2);
     expect(getMatrix3Element(m, 0, 2)).toBe(3);
@@ -374,7 +370,7 @@ describe('initializeMatrix3', () => {
 describe('inverseMatrix3', () => {
   it('should invert the matrix correctly', () => {
     // A scale of 2 with translation of (5, 3): rows [2,0,5],[0,2,3],[0,0,1].
-    const m = createMatrix3(2, 0, 5, 0, 2, 3, 0, 0, 1);
+    const m = createMatrix3FromValues(2, 0, 5, 0, 2, 3, 0, 0, 1);
 
     const out = createMatrix3();
     inverseMatrix3(out, m);
@@ -389,8 +385,8 @@ describe('inverseMatrix3', () => {
   });
 
   it('should not depend on initial out matrix values', () => {
-    const source = createMatrix3(2, 1, 5, 3, 4, 6, 0, 0, 1);
-    const out = createMatrix3(9, 9, 9, 9, 9, 9, 0, 0, 1);
+    const source = createMatrix3FromValues(2, 1, 5, 3, 4, 6, 0, 0, 1);
+    const out = createMatrix3FromValues(9, 9, 9, 9, 9, 9, 0, 0, 1);
 
     inverseMatrix3(out, source);
 
@@ -417,7 +413,7 @@ describe('inverseMatrix3', () => {
   });
 
   it('supports out === source for affine matrices', () => {
-    const matrix = createMatrix3(2, 1, 5, 3, 4, 6, 0, 0, 1);
+    const matrix = createMatrix3FromValues(2, 1, 5, 3, 4, 6, 0, 0, 1);
     const expected = createMatrix3();
     inverseMatrix3(expected, matrix);
 
@@ -427,7 +423,7 @@ describe('inverseMatrix3', () => {
   });
 
   it('supports out === source for non-affine matrices', () => {
-    const matrix = createMatrix3(1, 2, 3, 0, 1, 4, 5, 6, 0);
+    const matrix = createMatrix3FromValues(1, 2, 3, 0, 1, 4, 5, 6, 0);
     const expected = createMatrix3();
     inverseMatrix3(expected, matrix);
 
@@ -437,13 +433,13 @@ describe('inverseMatrix3', () => {
   });
 
   it('returns true on success', () => {
-    const m = createMatrix3(2, 0, 5, 0, 2, 3, 0, 0, 1);
+    const m = createMatrix3FromValues(2, 0, 5, 0, 2, 3, 0, 0, 1);
     const out = createMatrix3();
     expect(inverseMatrix3(out, m)).toBe(true);
   });
 
   it('returns false and fills NaN for a singular affine matrix', () => {
-    const m = createMatrix3(0, 0, 5, 0, 0, 3, 0, 0, 1); // zero linear part -> det 0
+    const m = createMatrix3FromValues(0, 0, 5, 0, 0, 3, 0, 0, 1); // zero linear part -> det 0
     const out = createMatrix3();
     expect(inverseMatrix3(out, m)).toBe(false);
     expect(out.m[0]).toBeNaN();
@@ -451,14 +447,14 @@ describe('inverseMatrix3', () => {
   });
 
   it('returns false and fills NaN for a singular non-affine matrix', () => {
-    const m = createMatrix3(1, 2, 3, 2, 4, 6, 1, 1, 1); // rows 0,1 linearly dependent -> det 0
+    const m = createMatrix3FromValues(1, 2, 3, 2, 4, 6, 1, 1, 1); // rows 0,1 linearly dependent -> det 0
     const out = createMatrix3();
     expect(inverseMatrix3(out, m)).toBe(false);
     expect(out.m[0]).toBeNaN();
   });
 
   it('returns false for a singular matrix with out === source', () => {
-    const m = createMatrix3(0, 0, 5, 0, 0, 3, 0, 0, 1);
+    const m = createMatrix3FromValues(0, 0, 5, 0, 0, 3, 0, 0, 1);
     expect(inverseMatrix3(m, m)).toBe(false);
     expect(m.m[0]).toBeNaN();
   });
@@ -471,21 +467,21 @@ describe('isAffineMatrix3', () => {
   });
 
   it('returns false when last row is not (0, 0, 1)', () => {
-    const m = createMatrix3(1, 0, 0, 0, 1, 0, 1, 0, 1);
+    const m = createMatrix3FromValues(1, 0, 0, 0, 1, 0, 1, 0, 1);
     expect(isAffineMatrix3(m)).toBe(false);
   });
 
   it('returns true for a matrix with translation', () => {
-    const m = createMatrix3(1, 0, 5, 0, 1, 10, 0, 0, 1);
+    const m = createMatrix3FromValues(1, 0, 5, 0, 1, 10, 0, 0, 1);
     expect(isAffineMatrix3(m)).toBe(true);
   });
 });
 
 describe('multiplyMatrix3', () => {
   it('multiplies a non-affine matrix into distinct and aliased outputs', () => {
-    const a = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 10);
-    const b = createMatrix3(2, 0, 1, 1, 3, 0, 0, 2, 4);
-    const expected = createMatrix3(4, 12, 13, 13, 27, 28, 22, 44, 47);
+    const a = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 10);
+    const b = createMatrix3FromValues(2, 0, 1, 1, 3, 0, 0, 2, 4);
+    const expected = createMatrix3FromValues(4, 12, 13, 13, 27, 28, 22, 44, 47);
     const out = createMatrix3();
     multiplyMatrix3(out, a, b);
     expect(equalsMatrix3(out, expected)).toBe(true);
@@ -495,8 +491,8 @@ describe('multiplyMatrix3', () => {
   });
 
   it('should support out === a', () => {
-    const a = createMatrix3(2, 3, 4, 5, 7, 8, 0, 0, 1);
-    const b = createMatrix3(11, 13, 17, 19, 23, 29, 0, 0, 1);
+    const a = createMatrix3FromValues(2, 3, 4, 5, 7, 8, 0, 0, 1);
+    const b = createMatrix3FromValues(11, 13, 17, 19, 23, 29, 0, 0, 1);
     const expected = createMatrix3();
     multiplyMatrix3(expected, a, b);
 
@@ -505,8 +501,8 @@ describe('multiplyMatrix3', () => {
   });
 
   it('should support out === b', () => {
-    const a = createMatrix3(2, 3, 4, 5, 7, 8, 0, 0, 1);
-    const b = createMatrix3(11, 13, 17, 19, 23, 29, 0, 0, 1);
+    const a = createMatrix3FromValues(2, 3, 4, 5, 7, 8, 0, 0, 1);
+    const b = createMatrix3FromValues(11, 13, 17, 19, 23, 29, 0, 0, 1);
     const expected = createMatrix3();
     multiplyMatrix3(expected, a, b);
 
@@ -516,7 +512,7 @@ describe('multiplyMatrix3', () => {
 
   it('should multiply identity correctly', () => {
     const a = createMatrix3();
-    const b = createMatrix3(2, 3, 4, 5, 6, 7);
+    const b = createMatrix3FromValues(2, 3, 4, 5, 6, 7, 0, 0, 1);
     const out = createMatrix3();
     multiplyMatrix3(out, a, b);
     expect(equalsMatrix3(out, b)).toBe(true);
@@ -524,8 +520,8 @@ describe('multiplyMatrix3', () => {
 
   it('composes an affine scale then translate (row/column semantics)', () => {
     // a = scale(2,2), b = translate(5,5). a * b applies b then a to a column vector.
-    const a = createMatrix3(2, 0, 0, 0, 2, 0, 0, 0, 1);
-    const b = createMatrix3(1, 0, 5, 0, 1, 5, 0, 0, 1);
+    const a = createMatrix3FromValues(2, 0, 0, 0, 2, 0, 0, 0, 1);
+    const b = createMatrix3FromValues(1, 0, 5, 0, 1, 5, 0, 0, 1);
     multiplyMatrix3(a, a, b);
     expect(getMatrix3Element(a, 0, 2)).toBe(10);
     expect(getMatrix3Element(a, 1, 2)).toBe(10);
@@ -543,7 +539,7 @@ describe('multiplyMatrix3', () => {
 
 describe('rotateMatrix3', () => {
   it('should rotate the matrix correctly', () => {
-    const m = createMatrix3(1, 0, 0, 0, 1, 0, 0, 0, 1);
+    const m = createMatrix3FromValues(1, 0, 0, 0, 1, 0, 0, 0, 1);
     const out = createMatrix3();
     rotateMatrix3(out, m, Math.PI / 2); // 90 degrees
     // Rotation (0,1)-plane: (0,0)=0, (0,1)=-1, (1,0)=1, (1,1)=0.
@@ -567,7 +563,7 @@ describe('rotateMatrix3', () => {
   });
 
   it('supports out === source', () => {
-    const matrix = createMatrix3(2, 3, 4, 5, 7, 8, 11, 13, 17);
+    const matrix = createMatrix3FromValues(2, 3, 4, 5, 7, 8, 11, 13, 17);
     const expected = createMatrix3();
     rotateMatrix3(expected, matrix, Math.PI / 2);
 
@@ -594,7 +590,7 @@ describe('scaleMatrix3', () => {
   });
 
   it('supports out === source', () => {
-    const matrix = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const matrix = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     scaleMatrix3(matrix, matrix, 2, 3);
     expect(Array.from(matrix.m)).toEqual([2, 8, 14, 6, 15, 24, 3, 6, 9]);
   });
@@ -744,7 +740,7 @@ describe('setMatrix3FromMatrix4', () => {
 
 describe('setMatrix3Identity', () => {
   it('resets a matrix to the identity', () => {
-    const m = createMatrix3(2, 3, 4, 5, 6, 7, 8, 9, 10);
+    const m = createMatrix3FromValues(2, 3, 4, 5, 6, 7, 8, 9, 10);
     setMatrix3Identity(m);
     expect(getMatrix3Element(m, 0, 0)).toBe(1);
     expect(getMatrix3Element(m, 1, 1)).toBe(1);
@@ -757,7 +753,7 @@ describe('setMatrix3Identity', () => {
 describe('setMatrix3NormalFromMatrix4', () => {
   it('equals the rotation basis for an orthonormal matrix', () => {
     // A 90-degree rotation about z (column-major Matrix4): +x -> +y.
-    const m4 = createMatrix4(0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    const m4 = createMatrix4FromValues(0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
     const out = createMatrix3();
     setMatrix3NormalFromMatrix4(out, m4);
     // For a pure rotation, normal matrix == rotation R (+x -> +y): (0,0)=0,(0,1)=-1,(1,0)=1,(1,1)=0.
@@ -771,7 +767,7 @@ describe('setMatrix3NormalFromMatrix4', () => {
   it('uploads column-major so a GL upload needs no transpose', () => {
     // The whole point of the migration: the normal matrix' storage matches uniformMatrix3fv(false).
     // 90-degree rotation about z, column-major storage: R = [[0,-1,0],[1,0,0],[0,0,1]] -> [0,1,0,-1,0,0,0,0,1].
-    const m4 = createMatrix4(0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    const m4 = createMatrix4FromValues(0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
     const out = createMatrix3();
     setMatrix3NormalFromMatrix4(out, m4);
     expect(out.m[0]).toBeCloseTo(0, 5);
@@ -782,7 +778,7 @@ describe('setMatrix3NormalFromMatrix4', () => {
 
   it('keeps a normal perpendicular under non-uniform scale', () => {
     // Scale x by 2, y by 1: a surface normal (1,1,0) on a plane should stay perpendicular.
-    const m4 = createMatrix4(2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    const m4 = createMatrix4FromValues(2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
     const normalMatrix = createMatrix3();
     setMatrix3NormalFromMatrix4(normalMatrix, m4);
     // Inverse-transpose of diag(2,1,1) = diag(0.5,1,1).
@@ -810,7 +806,7 @@ describe('translateMatrix3', () => {
   });
 
   it('supports out === source', () => {
-    const matrix = createMatrix3(1, 2, 3, 4, 5, 6, 0, 0, 1);
+    const matrix = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 0, 0, 1);
     translateMatrix3(matrix, matrix, 2, 3);
     expect(Array.from(matrix.m)).toEqual([1, 4, 0, 2, 5, 0, 11, 29, 1]);
   });
@@ -818,7 +814,7 @@ describe('translateMatrix3', () => {
 
 describe('transposeMatrix3', () => {
   it('swaps rows and columns', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const out = createMatrix3();
     transposeMatrix3(out, m);
     // Transpose of rows [1,2,3],[4,5,6],[7,8,9] is rows [1,4,7],[2,5,8],[3,6,9];
@@ -829,7 +825,7 @@ describe('transposeMatrix3', () => {
   });
 
   it('supports out === source', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     transposeMatrix3(m, m);
     expect(Array.from(m.m)).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9]);
   });
@@ -843,7 +839,7 @@ describe('transposeMatrix3', () => {
 });
 describe('writeMatrix3ToFloat32Array', () => {
   it('writes 9 values starting at the given offset', () => {
-    const m = createMatrix3(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    const m = createMatrix3FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
     const data = new Float32Array(10);
     writeMatrix3ToFloat32Array(data, 1, m);
     // Column-major storage of the matrix, written verbatim.
@@ -851,7 +847,7 @@ describe('writeMatrix3ToFloat32Array', () => {
   });
 
   it('round-trips through setMatrix3FromFloat32Array', () => {
-    const m = createMatrix3(9, 8, 7, 6, 5, 4, 3, 2, 1);
+    const m = createMatrix3FromValues(9, 8, 7, 6, 5, 4, 3, 2, 1);
     const data = new Float32Array(9);
     writeMatrix3ToFloat32Array(data, 0, m);
     const m2 = createMatrix3();

package/src/matrix3Pool.test.ts

@@ -1,8 +1,8 @@
 import { attachEntityBinding, getEntityBinding } from '@flighthq/entity/contract';
 import { getMatrix3Element } from '@flighthq/geometry/contract';
-import type { Matrix3 } from '@flighthq/types/contract';
 
-import { acquireIdentityMatrix3, acquireMatrix3, clearMatrix3Pool, releaseMatrix3 } from './matrix3Pool';
+import { acquireIdentityMatrix3, acquireMatrix3, clearMatrix3Pool, releaseMatrix3 } from './matrix3Pool.ts';
+import type { Matrix3 } from './types.ts';
 
 beforeEach(() => {
   clearMatrix3Pool();

package/src/matrix4.test.ts

@@ -12,8 +12,10 @@ import {
   copyMatrix4RowToVector4,
   createMatrix,
   createMatrix3,
+  createMatrix3FromValues,
   createMatrix4,
   createMatrix4From2D,
+  createMatrix4FromValues,
   createOrthographicMatrix4,
   createPerspectiveMatrix4,
   createQuaternion,
@@ -56,9 +58,9 @@ import {
   transposeMatrix4,
   writeMatrix4ToFloat32Array,
 } from '@flighthq/geometry/contract';
-import type { Matrix, Matrix4 } from '@flighthq/types/contract';
 
-import { initializeMatrix4 } from './matrix4';
+import { initializeMatrix4 } from './matrix4.ts';
+import type { Matrix, Matrix4 } from './types.ts';
 
 const X_AXIS = { x: 1, y: 0, z: 0, w: 0 };
 const Y_AXIS = { x: 0, y: 1, z: 0, w: 0 };
@@ -287,7 +289,7 @@ describe('appendTranslationMatrix4', () => {
   it('copies the whole source matrix when out is a distinct object', () => {
     const source = discriminatingMatrix4();
     const before = Array.from(source.m);
-    const out = createMatrix4(9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9);
+    const out = createMatrix4FromValues(9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9);
     const aliased = cloneMatrix4(source);
 
     appendTranslationMatrix4(out, source, 1, 2, 3);
@@ -308,7 +310,7 @@ describe('cloneMatrix4', () => {
   });
 
   it('copies all values from the source matrix', () => {
-    const source = createMatrix4(2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53);
+    const source = createMatrix4FromValues(2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53);
 
     const clone = cloneMatrix4(source);
 
@@ -368,7 +370,7 @@ describe('composeMatrix4', () => {
 
 describe('copyMatrix4', () => {
   it('copies all values from source into out', () => {
-    const source = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const source = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     const out = createMatrix4();
     copyMatrix4(out, source);
@@ -434,7 +436,7 @@ describe('copyMatrix4ColumnFromVector4', () => {
   // column catches a row/column transposition or a stray write that a single-index check misses.
   it('writes column c into elements 4c..4c+3 for every column', () => {
     for (let column = 0; column < 4; column++) {
-      const m = createMatrix4(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+      const m = createMatrix4FromValues(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
       copyMatrix4ColumnFromVector4(m, column, { x: 1, y: 2, z: 3, w: 4 });
 
@@ -450,7 +452,7 @@ describe('copyMatrix4ColumnFromVector4', () => {
 
 describe('copyMatrix4ColumnToVector4', () => {
   it('copies values from column 1 into a vector', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     const out = { x: 0, y: 0, z: 0, w: 0 };
 
@@ -473,7 +475,7 @@ describe('copyMatrix4ColumnToVector4', () => {
   });
 
   it('reads column c from elements 4c..4c+3 for every column', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     for (let column = 0; column < 4; column++) {
       const out = { x: 0, y: 0, z: 0, w: 0 };
@@ -527,7 +529,7 @@ describe('copyMatrix4RowFromVector4', () => {
   // column write in column-major storage.
   it('writes row r with a stride of four for every row', () => {
     for (let row = 0; row < 4; row++) {
-      const m = createMatrix4(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+      const m = createMatrix4FromValues(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
       copyMatrix4RowFromVector4(m, row, { x: 1, y: 2, z: 3, w: 4 });
 
@@ -543,7 +545,7 @@ describe('copyMatrix4RowFromVector4', () => {
 
 describe('copyMatrix4RowToVector4', () => {
   it('copies values from row 2 into a vector', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     const out = { x: 0, y: 0, z: 0, w: 0 };
 
@@ -566,7 +568,7 @@ describe('copyMatrix4RowToVector4', () => {
   });
 
   it('reads row r with a stride of four for every row', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     for (let row = 0; row < 4; row++) {
       const out = { x: 0, y: 0, z: 0, w: 0 };
@@ -591,34 +593,6 @@ describe('createMatrix4', () => {
     expect(m.m).toBeInstanceOf(Float32Array);
     expect(m.m.length).toBe(16);
   });
-
-  it('overrides only the provided constructor values', () => {
-    const m = createMatrix4(
-      2, // m00
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      3, // m11
-    );
-
-    expect(Array.from(m.m)).toEqual([2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
-  });
-
-  it('maps constructor arguments to correct column-major indices', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
-
-    expect(Array.from(m.m)).toEqual([
-      // column 0
-      1, 2, 3, 4,
-      // column 1
-      5, 6, 7, 8,
-      // column 2
-      9, 10, 11, 12,
-      // column 3
-      13, 14, 15, 16,
-    ]);
-  });
 });
 
 describe('createMatrix4From2D', () => {
@@ -644,6 +618,23 @@ describe('createMatrix4From2D', () => {
   });
 });
 
+describe('createMatrix4FromValues', () => {
+  it('maps constructor arguments to correct column-major indices', () => {
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+
+    expect(Array.from(m.m)).toEqual([
+      // column 0
+      1, 2, 3, 4,
+      // column 1
+      5, 6, 7, 8,
+      // column 2
+      9, 10, 11, 12,
+      // column 3
+      13, 14, 15, 16,
+    ]);
+  });
+});
+
 describe('createOrthographicMatrix4', () => {
   it('returns a Matrix4 equivalent to setOrtho', () => {
     const m1 = createOrthographicMatrix4(-1, 1, -1, 1, 0.1, 100);
@@ -780,9 +771,9 @@ describe('equalsMatrix4', () => {
   });
 
   it('returns true for two matrices with identical values', () => {
-    const a = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const a = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
-    const b = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const b = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     expect(equalsMatrix4(a, b)).toBe(true);
   });
@@ -806,7 +797,7 @@ describe('getMatrix4Determinant', () => {
 
 describe('getMatrix4Element', () => {
   it('returns the element at the given row and column', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
     expect(getMatrix4Element(m, 0, 0)).toBe(1);
     expect(getMatrix4Element(m, 1, 0)).toBe(2);
     expect(getMatrix4Element(m, 0, 1)).toBe(5);
@@ -1154,8 +1145,8 @@ describe('multiplyMatrix4', () => {
     });
 
     it('supports out === a', () => {
-      const a = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
-      const b = createMatrix4(17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79);
+      const a = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+      const b = createMatrix4FromValues(17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79);
       const expected = createMatrix4();
       multiplyMatrix4(expected, a, b);
 
@@ -1164,8 +1155,8 @@ describe('multiplyMatrix4', () => {
     });
 
     it('supports out === b', () => {
-      const a = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
-      const b = createMatrix4(17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79);
+      const a = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+      const b = createMatrix4FromValues(17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79);
       const expected = createMatrix4();
       multiplyMatrix4(expected, a, b);
 
@@ -1581,7 +1572,7 @@ describe('setMatrix4', () => {
   });
 
   it('overwrites existing matrix values completely', () => {
-    const m = createMatrix4(99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99);
+    const m = createMatrix4FromValues(99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99);
 
     setMatrix4(m, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
 
@@ -1738,7 +1729,7 @@ describe('setMatrix4FromMatrix3', () => {
 
   it('should handle scaling and translation', () => {
     // scale(2,3), translate(5,10)
-    const mat3 = createMatrix3(2, 0, 5, 0, 3, 10, 0, 0, 1);
+    const mat3 = createMatrix3FromValues(2, 0, 5, 0, 3, 10, 0, 0, 1);
 
     const mat = createMatrix4();
     setMatrix4FromMatrix3(mat, mat3);
@@ -1767,7 +1758,7 @@ describe('setMatrix4FromMatrix3', () => {
 
 describe('setMatrix4FromQuaternion', () => {
   it('identity quaternion writes the identity matrix', () => {
-    const m = createMatrix4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2);
+    const m = createMatrix4FromValues(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2);
     setMatrix4FromQuaternion(m, createQuaternion());
     expect(Array.from(m.m)).toEqual([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
   });
@@ -1787,7 +1778,7 @@ describe('setMatrix4FromQuaternion', () => {
 
 describe('setMatrix4Identity', () => {
   it('resets a matrix to identity', () => {
-    const m = createMatrix4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+    const m = createMatrix4FromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 
     setMatrix4Identity(m);
 
@@ -1964,7 +1955,7 @@ describe('translateMatrix4', () => {
   it('copies the whole source matrix when out is a distinct object', () => {
     const source = createMatrix4();
     setMatrix4(source, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 7, 8, 9, 1);
-    const out = createMatrix4(9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9);
+    const out = createMatrix4FromValues(9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9);
     const aliased = cloneMatrix4(source);
 
     translateMatrix4(out, source, 1, 2, 3);

package/src/matrix4Pool.test.ts

@@ -1,8 +1,8 @@
 import { attachEntityBinding, getEntityBinding } from '@flighthq/entity/contract';
 import { getMatrix4Element } from '@flighthq/geometry/contract';
-import type { Matrix4 } from '@flighthq/types/contract';
 
-import { acquireIdentityMatrix4, acquireMatrix4, clearMatrix4Pool, releaseMatrix4 } from './matrix4Pool';
+import { acquireIdentityMatrix4, acquireMatrix4, clearMatrix4Pool, releaseMatrix4 } from './matrix4Pool.ts';
+import type { Matrix4 } from './types.ts';
 
 beforeEach(() => {
   clearMatrix4Pool();