@predy-js/math 0.3.0-beta.46 → 0.3.0-beta.48

package/dist/index.js

@@ -170,6 +170,13 @@ const temps = [0, 0, 0];
 function mat4create() {
     return new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
 }
+function mat4FromArray(arrLike, index = 0) {
+    const ret = new Float32Array(16);
+    for (let i = 0; i < 16; i++) {
+        ret[i] = (arrLike[index + i]) || 0;
+    }
+    return ret;
+}
 function mat4fromRotationTranslationScale(out, q, v, s) {
     const x = q[0];
     const y = q[1];
@@ -541,6 +548,29 @@ function mat4scale(out, a, v) {
     out[15] = a[15];
     return out;
 }
+function mat4transpose(out, a) {
+    //transpose mat4
+    const a01 = a[1], a02 = a[2], a03 = a[3];
+    const a12 = a[6], a13 = a[7];
+    const a23 = a[11];
+    out[0] = a[0];
+    out[1] = a[4];
+    out[2] = a[8];
+    out[3] = a[12];
+    out[4] = a01;
+    out[5] = a[5];
+    out[6] = a[9];
+    out[7] = a[13];
+    out[8] = a02;
+    out[9] = a12;
+    out[10] = a[10];
+    out[11] = a[14];
+    out[12] = a03;
+    out[13] = a13;
+    out[14] = a23;
+    out[15] = a[15];
+    return out;
+}
 function mat4rotate(out, a, rad, axis) {
     let x = axis[0];
     let y = axis[1];
@@ -1086,19 +1116,6 @@ function quatFromRotation(out, x, y, z) {
     out[3] = c1 * c2 * c3 + s1 * s2 * s3;
     return out;
 }
-function quatFromRotationXYZ(out, x, y, z) {
-    const c1 = Math.cos((x * d2r) / 2);
-    const c2 = Math.cos((y * d2r) / 2);
-    const c3 = Math.cos((z * d2r) / 2);
-    const s1 = Math.sin((x * d2r) / 2);
-    const s2 = Math.sin((y * d2r) / 2);
-    const s3 = Math.sin((z * d2r) / 2);
-    out[0] = s1 * c2 * c3 + c1 * s2 * s3;
-    out[1] = c1 * s2 * c3 - s1 * c2 * s3;
-    out[2] = c1 * c2 * s3 + s1 * s2 * c3;
-    out[3] = c1 * c2 * c3 - s1 * s2 * s3;
-    return out;
-}
 function quatStar(out, quat) {
     const x = quat[0], y = quat[1], z = quat[2], w = quat[3];
     out[0] = -x;
@@ -1107,33 +1124,6 @@ function quatStar(out, quat) {
     out[3] = w;
     return out;
 }
-/**
- * @param {vec3} vstart
- * @param {vec3} vend
- * @returns {vec4}
- */
-function quatFromVec3s(v1, v2) {
-    const cross = [
-        v1[1] * v2[2] - v1[2] * v2[1],
-        v1[2] * v2[0] - v1[0] * v2[2],
-        v1[0] * v2[1] - v1[1] * v2[0],
-    ];
-    const dot = v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
-    if (dot < -0.999999) {
-        let orthogonalAxis = [1, 0, 0];
-        if (Math.abs(v1[0]) > Math.abs(v1[2])) {
-            orthogonalAxis = [0, 0, 1];
-        }
-        const orthogonalCross = [
-            v1[1] * orthogonalAxis[2] - v1[2] * orthogonalAxis[1],
-            v1[2] * orthogonalAxis[0] - v1[0] * orthogonalAxis[2],
-            v1[0] * orthogonalAxis[1] - v1[1] * orthogonalAxis[0],
-        ];
-        return vecNormalize([orthogonalCross[0], orthogonalCross[1], orthogonalCross[2], 0]);
-    }
-    const w = Math.sqrt((Math.pow(v1[0], 2) + Math.pow(v1[1], 2) + Math.pow(v1[2], 2)) * (Math.pow(v2[0], 2) + Math.pow(v2[1], 2) + Math.pow(v2[2], 2))) + dot;
-    return vecNormalize([cross[0], cross[1], cross[2], w]);
-}
 
 exports.NumberEpsilon = NumberEpsilon;
 exports.clamp = clamp;
@@ -1154,6 +1144,7 @@ exports.mat3Translate = mat3Translate;
 exports.mat3create = mat3create;
 exports.mat4Clone = mat4Clone;
 exports.mat4Determinate = mat4Determinate;
+exports.mat4FromArray = mat4FromArray;
 exports.mat4create = mat4create;
 exports.mat4fromRotationTranslationScale = mat4fromRotationTranslationScale;
 exports.mat4identity = mat4identity;
@@ -1163,11 +1154,10 @@ exports.mat4perspective = mat4perspective;
 exports.mat4rotate = mat4rotate;
 exports.mat4scale = mat4scale;
 exports.mat4translate = mat4translate;
+exports.mat4transpose = mat4transpose;
 exports.quatCreate = quatCreate;
 exports.quatEquals = quatEquals;
 exports.quatFromRotation = quatFromRotation;
-exports.quatFromRotationXYZ = quatFromRotationXYZ;
-exports.quatFromVec3s = quatFromVec3s;
 exports.quatMultiply = quatMultiply;
 exports.quatStar = quatStar;
 exports.rotateVec2 = rotateVec2;

package/dist/index.mjs

@@ -166,6 +166,13 @@ const temps = [0, 0, 0];
 function mat4create() {
     return new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
 }
+function mat4FromArray(arrLike, index = 0) {
+    const ret = new Float32Array(16);
+    for (let i = 0; i < 16; i++) {
+        ret[i] = (arrLike[index + i]) || 0;
+    }
+    return ret;
+}
 function mat4fromRotationTranslationScale(out, q, v, s) {
     const x = q[0];
     const y = q[1];
@@ -537,6 +544,29 @@ function mat4scale(out, a, v) {
     out[15] = a[15];
     return out;
 }
+function mat4transpose(out, a) {
+    //transpose mat4
+    const a01 = a[1], a02 = a[2], a03 = a[3];
+    const a12 = a[6], a13 = a[7];
+    const a23 = a[11];
+    out[0] = a[0];
+    out[1] = a[4];
+    out[2] = a[8];
+    out[3] = a[12];
+    out[4] = a01;
+    out[5] = a[5];
+    out[6] = a[9];
+    out[7] = a[13];
+    out[8] = a02;
+    out[9] = a12;
+    out[10] = a[10];
+    out[11] = a[14];
+    out[12] = a03;
+    out[13] = a13;
+    out[14] = a23;
+    out[15] = a[15];
+    return out;
+}
 function mat4rotate(out, a, rad, axis) {
     let x = axis[0];
     let y = axis[1];
@@ -1082,19 +1112,6 @@ function quatFromRotation(out, x, y, z) {
     out[3] = c1 * c2 * c3 + s1 * s2 * s3;
     return out;
 }
-function quatFromRotationXYZ(out, x, y, z) {
-    const c1 = Math.cos((x * d2r) / 2);
-    const c2 = Math.cos((y * d2r) / 2);
-    const c3 = Math.cos((z * d2r) / 2);
-    const s1 = Math.sin((x * d2r) / 2);
-    const s2 = Math.sin((y * d2r) / 2);
-    const s3 = Math.sin((z * d2r) / 2);
-    out[0] = s1 * c2 * c3 + c1 * s2 * s3;
-    out[1] = c1 * s2 * c3 - s1 * c2 * s3;
-    out[2] = c1 * c2 * s3 + s1 * s2 * c3;
-    out[3] = c1 * c2 * c3 - s1 * s2 * s3;
-    return out;
-}
 function quatStar(out, quat) {
     const x = quat[0], y = quat[1], z = quat[2], w = quat[3];
     out[0] = -x;
@@ -1103,32 +1120,5 @@ function quatStar(out, quat) {
     out[3] = w;
     return out;
 }
-/**
- * @param {vec3} vstart
- * @param {vec3} vend
- * @returns {vec4}
- */
-function quatFromVec3s(v1, v2) {
-    const cross = [
-        v1[1] * v2[2] - v1[2] * v2[1],
-        v1[2] * v2[0] - v1[0] * v2[2],
-        v1[0] * v2[1] - v1[1] * v2[0],
-    ];
-    const dot = v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
-    if (dot < -0.999999) {
-        let orthogonalAxis = [1, 0, 0];
-        if (Math.abs(v1[0]) > Math.abs(v1[2])) {
-            orthogonalAxis = [0, 0, 1];
-        }
-        const orthogonalCross = [
-            v1[1] * orthogonalAxis[2] - v1[2] * orthogonalAxis[1],
-            v1[2] * orthogonalAxis[0] - v1[0] * orthogonalAxis[2],
-            v1[0] * orthogonalAxis[1] - v1[1] * orthogonalAxis[0],
-        ];
-        return vecNormalize([orthogonalCross[0], orthogonalCross[1], orthogonalCross[2], 0]);
-    }
-    const w = Math.sqrt((Math.pow(v1[0], 2) + Math.pow(v1[1], 2) + Math.pow(v1[2], 2)) * (Math.pow(v2[0], 2) + Math.pow(v2[1], 2) + Math.pow(v2[2], 2))) + dot;
-    return vecNormalize([cross[0], cross[1], cross[2], w]);
-}
 
-export { NumberEpsilon, clamp, ensureVec3, getMat4TR, getMat4TRS, getMat4Transform, invertMat4, isZeroVec, mat3FromQuat, mat3FromRotation, mat3FromRotationZ, mat3MulMat3, mat3NormalFromMat4, mat3Rotate, mat3Scale, mat3Translate, mat3create, mat4Clone, mat4Determinate, mat4create, mat4fromRotationTranslationScale, mat4identity, mat4invert, mat4multiply, mat4perspective, mat4rotate, mat4scale, mat4translate, quatCreate, quatEquals, quatFromRotation, quatFromRotationXYZ, quatFromVec3s, quatMultiply, quatStar, rotateVec2, rotationFromMat3, transposeMat3, transposeMat4, vec2AddVec2, vec2Create, vec2MulMat3, vec2MulVec2, vec2SubVec2, vec2TransformByMat3, vec3AddVec3, vec3Create, vec3Cross, vec3MulMat3, vec3MulMat4, vec3MulNum, vec3MulVec3, vec3RotateByMat4, vec3RotateByQuat, vec3TranslateByMat4, vec4Create, vecAdd, vecAddCombine, vecAssign, vecDot, vecFill, vecMinus, vecMulCombine, vecMulScalar, vecNormalize, vecSquareDistance, vecSub };
+export { NumberEpsilon, clamp, ensureVec3, getMat4TR, getMat4TRS, getMat4Transform, invertMat4, isZeroVec, mat3FromQuat, mat3FromRotation, mat3FromRotationZ, mat3MulMat3, mat3NormalFromMat4, mat3Rotate, mat3Scale, mat3Translate, mat3create, mat4Clone, mat4Determinate, mat4FromArray, mat4create, mat4fromRotationTranslationScale, mat4identity, mat4invert, mat4multiply, mat4perspective, mat4rotate, mat4scale, mat4translate, mat4transpose, quatCreate, quatEquals, quatFromRotation, quatMultiply, quatStar, rotateVec2, rotationFromMat3, transposeMat3, transposeMat4, vec2AddVec2, vec2Create, vec2MulMat3, vec2MulVec2, vec2SubVec2, vec2TransformByMat3, vec3AddVec3, vec3Create, vec3Cross, vec3MulMat3, vec3MulMat4, vec3MulNum, vec3MulVec3, vec3RotateByMat4, vec3RotateByQuat, vec3TranslateByMat4, vec4Create, vecAdd, vecAddCombine, vecAssign, vecDot, vecFill, vecMinus, vecMulCombine, vecMulScalar, vecNormalize, vecSquareDistance, vecSub };

package/dist/mat4.d.ts

@@ -1,6 +1,7 @@
 import type { mat4 } from '@predy-js/render-interface';
 import type { vec3, vec4 } from '@predy-js/render-interface';
 export declare function mat4create(): mat4;
+export declare function mat4FromArray(arrLike: ArrayLike<number>, index?: number): mat4;
 export declare function mat4fromRotationTranslationScale(out: mat4 | number[], q: vec4, v: vec3, s: vec3): mat4;
 export declare function invertMat4(out: mat4 | number[], a: mat4): mat4;
 export declare function mat4Determinate(a: mat4): number;
@@ -11,6 +12,7 @@ export declare function mat4Clone(out: mat4 | number[], from: mat4): mat4;
 export declare function mat4invert(out: mat4 | number[], a: mat4): mat4;
 export declare function mat4translate(out: mat4, a: mat4, v: vec3): mat4;
 export declare function mat4scale(out: mat4, a: mat4, v: vec3): mat4;
+export declare function mat4transpose(out: mat4, a: mat4): mat4;
 export declare function mat4rotate(out: mat4, a: mat4, rad: number, axis: vec3): mat4;
 export declare function mat4perspective(out: number[] | mat4, fovy: number, aspect: number, near: number, far: number, reverse?: boolean): mat4;
 export declare function mat4identity(out: mat4): void;

package/dist/quat.d.ts

@@ -1,14 +1,7 @@
-import type { mat3, vec3, vec4 } from '@predy-js/render-interface';
+import type { mat3, vec4 } from '@predy-js/render-interface';
 export declare function quatCreate(): vec4;
 export declare function quatMultiply(out: vec4, a: vec4, b: vec4): vec4;
 export declare function mat3FromQuat(out: mat3 | number[], quat: vec4): mat3;
 export declare function quatEquals(q1: vec4, q2: vec4): boolean;
 export declare function quatFromRotation(out: vec4, x: number, y: number, z: number): vec4;
-export declare function quatFromRotationXYZ(out: vec4, x: number, y: number, z: number): vec4;
 export declare function quatStar(out: vec4, quat: vec4): vec4;
-/**
- * @param {vec3} vstart
- * @param {vec3} vend
- * @returns {vec4}
- */
-export declare function quatFromVec3s(v1: vec3, v2: vec3): vec4;

package/dist/vec4.d.ts

@@ -1,2 +1,2 @@
 import type { vec4 } from '@predy-js/render-interface';
-export declare function vec4Create(v?: vec4): vec4;
+export declare function vec4Create(v: vec4): vec4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@predy-js/math",
-  "version": "0.3.0-beta.46",
+  "version": "0.3.0-beta.48",
   "description": "Mars JSON Specification",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -28,7 +28,7 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@predy-js/render-interface": "0.3.0-beta.46",
+    "@predy-js/render-interface": "0.3.0-beta.48",
     "@commitlint/cli": "^13.2.1",
     "@commitlint/config-conventional": "^13.2.0",
     "@rollup/plugin-commonjs": "^21.0.3",