@openglobus/og 0.18.0 → 0.18.1

package/{src/math/Mat4.ts → lib/js/math/Mat4.js}

@@ -1,42 +1,31 @@
-import {Mat3} from "./Mat3";
-import {Quat} from "./Quat";
-import {Vec3} from "./Vec3";
-import {Vec4} from "./Vec4";
-
-export type NumberArray16 = [
-    number, number, number, number,
-    number, number, number, number,
-    number, number, number, number,
-    number, number, number, number
-];
-
+import { Mat3 } from "./Mat3";
+import { Quat } from "./Quat";
+import { Vec3 } from "./Vec3";
+import { Vec4 } from "./Vec4";
 /**
  * Class represents a 4x4 matrix.
  * @class
  */
 export class Mat4 {
-
-    /**
-     * A 4x4 matrix, index-able as a column-major order array.
-     * @public
-     * @type {Array.<number>}
-     */
-    public _m: NumberArray16 = [
-        0, 0, 0, 0,
-        0, 0, 0, 0,
-        0, 0, 0, 0,
-        0, 0, 0, 0
-    ];
-
     constructor() {
+        /**
+         * A 4x4 matrix, index-able as a column-major order array.
+         * @public
+         * @type {Array.<number>}
+         */
+        this._m = [
+            0, 0, 0, 0,
+            0, 0, 0, 0,
+            0, 0, 0, 0,
+            0, 0, 0, 0
+        ];
     }
-
     /**
      * Returns identity matrix instance.
      * @static
      * @returns {Mat4} -
      */
-    static identity(): Mat4 {
+    static identity() {
         let res = new Mat4();
         res._m[0] = 1;
         res._m[1] = 0;
@@ -56,14 +45,13 @@ export class Mat4 {
         res._m[15] = 1;
         return res;
     }
-
     /**
      * Sets column-major order array matrix.
      * @public
      * @param {Array.<number>} m - Matrix array.
      * @returns {Mat4} -
      */
-    public set(m: NumberArray16): Mat4 {
+    set(m) {
         this._m[0] = m[0];
         this._m[1] = m[1];
         this._m[2] = m[2];
@@ -82,37 +70,33 @@ export class Mat4 {
         this._m[15] = m[15];
         return this;
     }
-
     /**
      * Duplicates a Matrix3 instance.
      * @public
      * @returns {Mat4} -
      */
-    public clone(): Mat4 {
+    clone() {
         let res = new Mat4();
         res.set(this._m);
         return res;
     }
-
     /**
      * Copy matrix.
      * @public
      * @param {Mat4} a - Matrix to copy.
      * @return {Mat4}
      */
-    public copy(a: Mat4): Mat4 {
+    copy(a) {
         return this.set(a._m);
     }
-
     /**
      * Converts to 3x3 matrix.
      * @public
      * @returns {Mat3} -
      */
-    public toMatrix3(): Mat3 {
+    toMatrix3() {
         let res = new Mat3();
-        let a = this._m,
-            b = res._m;
+        let a = this._m, b = res._m;
         b[0] = a[0];
         b[1] = a[1];
         b[2] = a[2];
@@ -124,70 +108,38 @@ export class Mat4 {
         b[8] = a[10];
         return res;
     }
-
     /**
      * Multiply to 3d vector.
      * @public
      * @param {Vec3} p - 3d vector.
      * @returns {Vec3} -
      */
-    public mulVec3(p: Vec3): Vec3 {
-        let d = p.x,
-            e = p.y,
-            g = p.z;
-        return new Vec3(
-            this._m[0] * d + this._m[4] * e + this._m[8] * g + this._m[12],
-            this._m[1] * d + this._m[5] * e + this._m[9] * g + this._m[13],
-            this._m[2] * d + this._m[6] * e + this._m[10] * g + this._m[14]
-        );
+    mulVec3(p) {
+        let d = p.x, e = p.y, g = p.z;
+        return new Vec3(this._m[0] * d + this._m[4] * e + this._m[8] * g + this._m[12], this._m[1] * d + this._m[5] * e + this._m[9] * g + this._m[13], this._m[2] * d + this._m[6] * e + this._m[10] * g + this._m[14]);
     }
-
     /**
      * Multiply to 4d vector.
      * @public
      * @param {Vec4} p - 4d vector.
      * @returns {Vec4} -
      */
-    public mulVec4(p: Vec4): Vec4 {
-        let d = p.x,
-            e = p.y,
-            g = p.z,
-            f = p.w;
-        return new Vec4(
-            this._m[0] * d + this._m[4] * e + this._m[8] * g + this._m[12] * f,
-            this._m[1] * d + this._m[5] * e + this._m[9] * g + this._m[13] * f,
-            this._m[2] * d + this._m[6] * e + this._m[10] * g + this._m[14] * f,
-            this._m[3] * d + this._m[7] * e + this._m[11] * g + this._m[15] * f
-        );
+    mulVec4(p) {
+        let d = p.x, e = p.y, g = p.z, f = p.w;
+        return new Vec4(this._m[0] * d + this._m[4] * e + this._m[8] * g + this._m[12] * f, this._m[1] * d + this._m[5] * e + this._m[9] * g + this._m[13] * f, this._m[2] * d + this._m[6] * e + this._m[10] * g + this._m[14] * f, this._m[3] * d + this._m[7] * e + this._m[11] * g + this._m[15] * f);
     }
-
     /**
      * Creates an inverse 3x3 matrix of the current.
      * @public
      * @returns {Mat3} -
      */
-    public toInverseMatrix3(): Mat3 | undefined {
+    toInverseMatrix3() {
         let a = this._m;
-        let c = a[0],
-            d = a[1],
-            e = a[2],
-            g = a[4],
-            f = a[5],
-            h = a[6],
-            i = a[8],
-            j = a[9],
-            k = a[10],
-            l = k * f - h * j,
-            o = -k * g + h * i,
-            m = j * g - f * i,
-            n = c * l + d * o + e * m;
-
+        let c = a[0], d = a[1], e = a[2], g = a[4], f = a[5], h = a[6], i = a[8], j = a[9], k = a[10], l = k * f - h * j, o = -k * g + h * i, m = j * g - f * i, n = c * l + d * o + e * m;
         if (!n) {
             return;
         }
-
         n = 1.0 / n;
-
         let res = new Mat3();
         res._m[0] = l * n;
         res._m[1] = (-k * d + e * j) * n;
@@ -198,46 +150,15 @@ export class Mat4 {
         res._m[6] = m * n;
         res._m[7] = (-j * c + d * i) * n;
         res._m[8] = (f * c - d * g) * n;
-
         return res;
     }
-
     /**
      * Creates an inverse matrix of the current.
      * @public
      * @returns {Mat4} -
      */
-    public inverseTo(res: Mat4 = new Mat4): Mat4 {
-        let c = this._m[0],
-            d = this._m[1],
-            e = this._m[2],
-            g = this._m[3],
-            f = this._m[4],
-            h = this._m[5],
-            i = this._m[6],
-            j = this._m[7],
-            k = this._m[8],
-            l = this._m[9],
-            o = this._m[10],
-            m = this._m[11],
-            n = this._m[12],
-            p = this._m[13],
-            r = this._m[14],
-            s = this._m[15],
-            A = c * h - d * f,
-            B = c * i - e * f,
-            t = c * j - g * f,
-            u = d * i - e * h,
-            v = d * j - g * h,
-            w = e * j - g * i,
-            x = k * p - l * n,
-            y = k * r - o * n,
-            z = k * s - m * n,
-            C = l * r - o * p,
-            D = l * s - m * p,
-            E = o * s - m * r,
-            q = 1 / (A * E - B * D + t * C + u * z - v * y + w * x);
-
+    inverseTo(res = new Mat4()) {
+        let c = this._m[0], d = this._m[1], e = this._m[2], g = this._m[3], f = this._m[4], h = this._m[5], i = this._m[6], j = this._m[7], k = this._m[8], l = this._m[9], o = this._m[10], m = this._m[11], n = this._m[12], p = this._m[13], r = this._m[14], s = this._m[15], A = c * h - d * f, B = c * i - e * f, t = c * j - g * f, u = d * i - e * h, v = d * j - g * h, w = e * j - g * i, x = k * p - l * n, y = k * r - o * n, z = k * s - m * n, C = l * r - o * p, D = l * s - m * p, E = o * s - m * r, q = 1 / (A * E - B * D + t * C + u * z - v * y + w * x);
         res._m[0] = (h * E - i * D + j * C) * q;
         res._m[1] = (-d * E + e * D - g * C) * q;
         res._m[2] = (p * w - r * v + s * u) * q;
@@ -254,16 +175,14 @@ export class Mat4 {
         res._m[13] = (c * C - d * y + e * x) * q;
         res._m[14] = (-n * u + p * B - r * A) * q;
         res._m[15] = (k * u - l * B + o * A) * q;
-
         return res;
     }
-
     /**
      * Creates a transposed matrix of the current.
      * @public
      * @returns {Mat4} -
      */
-    public transposeTo(): Mat4 {
+    transposeTo() {
         let res = new Mat4();
         res._m[0] = this._m[0];
         res._m[1] = this._m[4];
@@ -283,13 +202,12 @@ export class Mat4 {
         res._m[15] = this._m[15];
         return res;
     }
-
     /**
      * Sets matrix to identity.
      * @public
      * @returns {Mat4} -
      */
-    public setIdentity(): Mat4 {
+    setIdentity() {
         this._m[0] = 1;
         this._m[1] = 0;
         this._m[2] = 0;
@@ -308,51 +226,16 @@ export class Mat4 {
         this._m[15] = 1;
         return this;
     }
-
     /**
      * Computes the product of two matrices.
      * @public
      * @param {Mat4} mx - Matrix to multiply.
      * @returns {Mat4} -
      */
-    public mul(mx: Mat4): Mat4 {
-
-        let d = this._m[0],
-            e = this._m[1],
-            g = this._m[2],
-            f = this._m[3],
-            h = this._m[4],
-            i = this._m[5],
-            j = this._m[6],
-            k = this._m[7],
-            l = this._m[8],
-            o = this._m[9],
-            m = this._m[10],
-            n = this._m[11],
-            p = this._m[12],
-            r = this._m[13],
-            s = this._m[14],
-            a = this._m[15];
-
-        let A = mx._m[0],
-            B = mx._m[1],
-            t = mx._m[2],
-            u = mx._m[3],
-            v = mx._m[4],
-            w = mx._m[5],
-            x = mx._m[6],
-            y = mx._m[7],
-            z = mx._m[8],
-            C = mx._m[9],
-            D = mx._m[10],
-            E = mx._m[11],
-            q = mx._m[12],
-            F = mx._m[13],
-            G = mx._m[14],
-            b = mx._m[15];
-
+    mul(mx) {
+        let d = this._m[0], e = this._m[1], g = this._m[2], f = this._m[3], h = this._m[4], i = this._m[5], j = this._m[6], k = this._m[7], l = this._m[8], o = this._m[9], m = this._m[10], n = this._m[11], p = this._m[12], r = this._m[13], s = this._m[14], a = this._m[15];
+        let A = mx._m[0], B = mx._m[1], t = mx._m[2], u = mx._m[3], v = mx._m[4], w = mx._m[5], x = mx._m[6], y = mx._m[7], z = mx._m[8], C = mx._m[9], D = mx._m[10], E = mx._m[11], q = mx._m[12], F = mx._m[13], G = mx._m[14], b = mx._m[15];
         let res = new Mat4();
-
         res._m[0] = A * d + B * h + t * l + u * p;
         res._m[1] = A * e + B * i + t * o + u * r;
         res._m[2] = A * g + B * j + t * m + u * s;
@@ -369,46 +252,36 @@ export class Mat4 {
         res._m[13] = q * e + F * i + G * o + b * r;
         res._m[14] = q * g + F * j + G * m + b * s;
         res._m[15] = q * f + F * k + G * n + b * a;
-
         return res;
     }
-
     /**
      * Add translation vector to the current matrix.
      * @public
      * @param {Vec3} v - Translate vector.
      * @returns {Mat4} -
      */
-    public translate(v: Vec3): Mat4 {
-
-        let d = v.x,
-            e = v.y,
-            b = v.z;
-
+    translate(v) {
+        let d = v.x, e = v.y, b = v.z;
         let a = this._m;
-
         a[12] = a[0] * d + a[4] * e + a[8] * b + a[12];
         a[13] = a[1] * d + a[5] * e + a[9] * b + a[13];
         a[14] = a[2] * d + a[6] * e + a[10] * b + a[14];
         a[15] = a[3] * d + a[7] * e + a[11] * b + a[15];
-
         return this;
     }
-
     /**
      * Sets translation matrix to the position.
      * @public
      * @param {Vec3} v - Translate to position.
      * @returns {Mat4} -
      */
-    public translateToPosition(v: Vec3): Mat4 {
+    translateToPosition(v) {
         let a = this._m;
         a[12] = v.x;
         a[13] = v.y;
         a[14] = v.z;
         return this;
     }
-
     /**
      * Rotate current matrix around the aligned axis and angle.
      * @public
@@ -416,14 +289,10 @@ export class Mat4 {
      * @param {number} angle - Aligned axis angle in radians.
      * @returns {Mat4} -
      */
-    public rotate(u: Vec3, angle: number): Mat4 {
-
-        let c = Math.cos(angle),
-            s = Math.sin(angle);
-
+    rotate(u, angle) {
+        let c = Math.cos(angle), s = Math.sin(angle);
         let rot = new Mat4();
         let mx = rot._m;
-
         mx[0] = c + (1 - c) * u.x * u.x;
         mx[1] = (1 - c) * u.y * u.x - s * u.z;
         mx[2] = (1 - c) * u.z * u.x + s * u.y;
@@ -440,10 +309,8 @@ export class Mat4 {
         mx[13] = 0;
         mx[14] = 0;
         mx[15] = 1;
-
         return this.mul(rot);
     }
-
     /**
      * Sets current rotation matrix around the aligned axis and angle.
      * @public
@@ -451,13 +318,9 @@ export class Mat4 {
      * @param {number} angle - Aligned axis angle in radians.
      * @returns {Mat4} -
      */
-    public setRotation(u: Vec3, angle: number): Mat4 {
-
-        let c = Math.cos(angle),
-            s = Math.sin(angle);
-
+    setRotation(u, angle) {
+        let c = Math.cos(angle), s = Math.sin(angle);
         let mx = this._m;
-
         mx[0] = c + (1 - c) * u.x * u.x;
         mx[1] = (1 - c) * u.y * u.x - s * u.z;
         mx[2] = (1 - c) * u.z * u.x + s * u.y;
@@ -474,10 +337,8 @@ export class Mat4 {
         mx[13] = 0;
         mx[14] = 0;
         mx[15] = 1;
-
         return this;
     }
-
     /**
      * Gets the rotation matrix from one vector to another.
      * @public
@@ -485,18 +346,17 @@ export class Mat4 {
      * @param {Vec3} b - Second vector.
      * @returns {Mat4} -
      */
-    public rotateBetweenVectors(a: Vec3, b: Vec3): Mat4 {
+    rotateBetweenVectors(a, b) {
         let q = Quat.getRotationBetweenVectors(a, b);
         return q.getMat4();
     }
-
     /**
      * Scale current matrix to the vector values.
      * @public
      * @param {Vec3} v - Scale vector.
      * @returns {Mat4} -
      */
-    public scale(v: Vec3): Mat4 {
+    scale(v) {
         let mx = this._m;
         mx[0] = mx[0] * v.x;
         mx[1] = mx[1] * v.x;
@@ -512,7 +372,6 @@ export class Mat4 {
         mx[11] = mx[11] * v.z;
         return this;
     }
-
     /**
      * Sets perspective projection matrix frustum values.
      * @public
@@ -524,12 +383,8 @@ export class Mat4 {
      * @param {number} far -
      * @returns {Mat4} -
      */
-    public setPerspective(left: number, right: number, bottom: number, top: number, near: number, far: number): Mat4 {
-
-        let h = right - left,
-            i = top - bottom,
-            j = far - near;
-
+    setPerspective(left, right, bottom, top, near, far) {
+        let h = right - left, i = top - bottom, j = far - near;
         this._m[0] = (near * 2) / h;
         this._m[1] = 0;
         this._m[2] = 0;
@@ -546,10 +401,8 @@ export class Mat4 {
         this._m[13] = 0;
         this._m[14] = -(far * near * 2) / j;
         this._m[15] = 0;
-
         return this;
     }
-
     /**
      * Creates current orthographic projection matrix.
      * @public
@@ -561,13 +414,8 @@ export class Mat4 {
      * @param {number} far -
      * @return {Mat4} -
      */
-    public setOrtho(left: number, right: number, bottom: number, top: number, near: number, far: number): Mat4 {
-
-        let lr = 1.0 / (left - right),
-            bt = 1.0 / (bottom - top),
-            nf = 1.0 / (near - far),
-            m = this._m;
-
+    setOrtho(left, right, bottom, top, near, far) {
+        let lr = 1.0 / (left - right), bt = 1.0 / (bottom - top), nf = 1.0 / (near - far), m = this._m;
         m[0] = -2.0 * lr;
         m[1] = 0;
         m[2] = 0;
@@ -584,10 +432,8 @@ export class Mat4 {
         m[13] = (top + bottom) * bt;
         m[14] = (far + near) * nf;
         m[15] = 1.0;
-
         return this;
     }
-
     /**
      * Sets current rotation matrix by euler's angles.
      * @public
@@ -596,20 +442,10 @@ export class Mat4 {
      * @param {number} az - Rotation angle in radians around Z axis.
      * @returns {Mat4} -
      */
-    public eulerToMatrix(ax: number, ay: number, az: number): Mat4 {
-
-        let a = Math.cos(ax),
-            b = Math.sin(ax),
-            c = Math.cos(ay),
-            d = Math.sin(ay),
-            e = Math.cos(az),
-            f = Math.sin(az);
-
-        let ad = a * d,
-            bd = b * d;
-
+    eulerToMatrix(ax, ay, az) {
+        let a = Math.cos(ax), b = Math.sin(ax), c = Math.cos(ay), d = Math.sin(ay), e = Math.cos(az), f = Math.sin(az);
+        let ad = a * d, bd = b * d;
         let mat = this._m;
-
         mat[0] = c * e;
         mat[1] = -c * f;
         mat[2] = -d;
@@ -621,16 +457,14 @@ export class Mat4 {
         mat[10] = a * c;
         mat[3] = mat[7] = mat[11] = mat[12] = mat[13] = mat[14] = 0;
         mat[15] = 1;
-
         return this;
     }
 }
-
 /**
  * Mat4 factory.
  * @static
  * @returns {Mat4} -
  */
-export function mat4(): Mat4 {
+export function mat4() {
     return new Mat4();
 }

package/lib/js/math/Plane.d.ts

@@ -0,0 +1,20 @@
+import { Vec3 } from "./Vec3";
+import { Line3 } from "./Line3";
+/**
+ * Plane class.
+ * @constructor
+ * @param {Vec3} [p] - Plane point.
+ * @param {Vec3} [n] - Planet normal.
+ */
+declare class Plane {
+    p: Vec3;
+    n: Vec3;
+    constructor(p: Vec3, n: Vec3);
+    set(p: Vec3, n: Vec3): void;
+    getNormal(): Vec3;
+    distance(p: Vec3): number;
+    getProjection(v: Vec3, def?: Vec3): Vec3;
+    getProjectionPoint(p: Vec3, vh?: Vec3): Vec3;
+    getIntersection(Pn1: Plane, Pn2: Plane, L: Line3): number;
+}
+export { Plane };