@openglobus/og 0.17.1 → 0.18.0

package/src/{og/math/Mat3.js → math/Mat3.ts}

@@ -1,20 +1,30 @@
-"use strict";
+import {Mat4} from "./Mat4";
+import {Vec3} from "./Vec3";
 
-import { Mat4 } from "./Mat4.js";
-import { Vec3 } from "./Vec3.js";
+export type NumberArray9 = [
+    number, number, number,
+    number, number, number,
+    number, number, number
+];
 
 /**
  * Class represents a 3x3 matrix.
  * @class
  */
 export class Mat3 {
+
+    /**
+     * A 3x3 matrix, indexing as a column-major order array.
+     * @public
+     * @type {Array.<number>}
+     */
+    public _m: NumberArray9 = [
+        0, 0, 0,
+        0, 0, 0,
+        0, 0, 0
+    ];
+
     constructor() {
-        /**
-         * A 3x3 matrix, indexable as a column-major order array.
-         * @public
-         * @type {Array.<number>}
-         */
-        this._m = new Array(9);
     }
 
     /**
@@ -23,7 +33,7 @@ export class Mat3 {
      * @param {Array.<number>} m - Matrix array.
      * @returns {Mat3}
      */
-    set(m) {
+    public set(m: NumberArray9): Mat3 {
         this._m[0] = m[0];
         this._m[1] = m[1];
         this._m[2] = m[2];
@@ -41,9 +51,9 @@ export class Mat3 {
      * @public
      * @returns {Mat3}
      */
-    clone() {
-        var res = new Mat3();
-        res.set(this);
+    public clone(): Mat3 {
+        let res = new Mat3();
+        res.set(this._m);
         return res;
     }
 
@@ -53,18 +63,18 @@ export class Mat3 {
      * @param {Mat3} a - Matrix to copy.
      * @returns {Mat3}
      */
-    copy(a) {
+    public copy(a: Mat3): Mat3 {
         return this.set(a._m);
     }
 
     /**
-     * Creates trasposed matrix from the current.
+     * Creates transposed matrix from the current.
      * @public
      * @returns {Mat3}
      */
-    transposeTo() {
-        var res = new Mat3();
-        var m = this._m;
+    public transposeTo(): Mat3 {
+        let res = new Mat3();
+        let m = this._m;
         res._m[0] = m[0];
         res._m[1] = m[3];
         res._m[2] = m[6];
@@ -82,7 +92,7 @@ export class Mat3 {
      * @public
      * @returns {Mat3}
      */
-    setIdentity() {
+    public setIdentity(): Mat3 {
         this._m[0] = 1;
         this._m[1] = 0;
         this._m[2] = 0;
@@ -101,11 +111,14 @@ export class Mat3 {
      * @params {Vec3} p - 3d vector.
      * @returns {Vec3}
      */
-    mulVec(p) {
-        var d = p.x,
+    public mulVec(p: Vec3): Vec3 {
+
+        let d = p.x,
             e = p.y,
             g = p.z;
-        var m = this._m;
+
+        let m = this._m;
+
         return new Vec3(
             m[0] * d + m[3] * e + m[6] * g,
             m[1] * d + m[4] * e + m[7] * g,
@@ -118,10 +131,12 @@ export class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4() {
-        var res = new Mat4();
-        var b = res._m;
-        var a = this._m;
+    public toMatrix4(): Mat4 {
+
+        let res = new Mat4();
+        let b = res._m;
+        let a = this._m;
+
         b[0] = a[0];
         b[1] = a[1];
         b[2] = a[2];
@@ -138,6 +153,7 @@ export class Mat3 {
         b[13] = 0;
         b[14] = 0;
         b[15] = 1;
+
         return res;
     }
 }
@@ -147,6 +163,6 @@ export class Mat3 {
  * @static
  * @return {Mat3}
  */
-export function mat3() {
+export function mat3(): Mat3 {
     return new Mat3();
 }

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

@@ -1,22 +1,34 @@
-"use strict";
-
-import { Mat3 } from "./Mat3.js";
-import { Quat } from "./Quat.js";
-import { Vec3 } from "./Vec3.js";
-import { Vec4 } from "./Vec4.js";
+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
+];
 
 /**
  * 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, indexable as a column-major order array.
-         * @public
-         * @type {Array.<number>}
-         */
-        this._m = new Array(16);
     }
 
     /**
@@ -24,8 +36,8 @@ export class Mat4 {
      * @static
      * @returns {Mat4} -
      */
-    static identity() {
-        var res = new Mat4();
+    static identity(): Mat4 {
+        let res = new Mat4();
         res._m[0] = 1;
         res._m[1] = 0;
         res._m[2] = 0;
@@ -51,7 +63,7 @@ export class Mat4 {
      * @param {Array.<number>} m - Matrix array.
      * @returns {Mat4} -
      */
-    set(m) {
+    public set(m: NumberArray16): Mat4 {
         this._m[0] = m[0];
         this._m[1] = m[1];
         this._m[2] = m[2];
@@ -76,19 +88,20 @@ export class Mat4 {
      * @public
      * @returns {Mat4} -
      */
-    clone() {
-        var res = new Mat4();
-        res.set(this);
+    public clone(): Mat4 {
+        let res = new Mat4();
+        res.set(this._m);
         return res;
     }
 
     /**
      * Copy matrix.
      * @public
-     * @param {Mat3} a - Matrix to copy.
+     * @param {Mat4} a - Matrix to copy.
+     * @return {Mat4}
      */
-    copy(a) {
-        this.set(a._m);
+    public copy(a: Mat4): Mat4 {
+        return this.set(a._m);
     }
 
     /**
@@ -96,9 +109,9 @@ export class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3() {
-        var res = new Mat3();
-        var a = this._m,
+    public toMatrix3(): Mat3 {
+        let res = new Mat3();
+        let a = this._m,
             b = res._m;
         b[0] = a[0];
         b[1] = a[1];
@@ -118,8 +131,8 @@ export class Mat4 {
      * @param {Vec3} p - 3d vector.
      * @returns {Vec3} -
      */
-    mulVec3(p) {
-        var d = p.x,
+    public mulVec3(p: Vec3): Vec3 {
+        let d = p.x,
             e = p.y,
             g = p.z;
         return new Vec3(
@@ -135,8 +148,8 @@ export class Mat4 {
      * @param {Vec4} p - 4d vector.
      * @returns {Vec4} -
      */
-    mulVec4(p) {
-        var d = p.x,
+    public mulVec4(p: Vec4): Vec4 {
+        let d = p.x,
             e = p.y,
             g = p.z,
             f = p.w;
@@ -149,13 +162,13 @@ export class Mat4 {
     }
 
     /**
-     * Creates an inversed 3x3 matrix of the current.
+     * Creates an inverse 3x3 matrix of the current.
      * @public
      * @returns {Mat3} -
      */
-    toInverseMatrix3() {
-        var a = this._m;
-        var c = a[0],
+    public toInverseMatrix3(): Mat3 | undefined {
+        let a = this._m;
+        let c = a[0],
             d = a[1],
             e = a[2],
             g = a[4],
@@ -170,12 +183,12 @@ export class Mat4 {
             n = c * l + d * o + e * m;
 
         if (!n) {
-            return null;
+            return;
         }
 
-        n = 1 / n;
+        n = 1.0 / n;
 
-        var res = new Mat3();
+        let res = new Mat3();
         res._m[0] = l * n;
         res._m[1] = (-k * d + e * j) * n;
         res._m[2] = (h * d - e * f) * n;
@@ -185,16 +198,17 @@ 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 inversed matrix of the current.
+     * Creates an inverse matrix of the current.
      * @public
      * @returns {Mat4} -
      */
-    inverseTo(res) {
-        var c = this._m[0],
+    public inverseTo(res: Mat4 = new Mat4): Mat4 {
+        let c = this._m[0],
             d = this._m[1],
             e = this._m[2],
             g = this._m[3],
@@ -224,8 +238,6 @@ export class Mat4 {
             E = o * s - m * r,
             q = 1 / (A * E - B * D + t * C + u * z - v * y + w * x);
 
-        res = res || new Mat4();
-
         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;
@@ -242,16 +254,17 @@ 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 trasposed matrix of the current.
+     * Creates a transposed matrix of the current.
      * @public
      * @returns {Mat4} -
      */
-    transposeTo() {
-        var res = new Mat4();
+    public transposeTo(): Mat4 {
+        let res = new Mat4();
         res._m[0] = this._m[0];
         res._m[1] = this._m[4];
         res._m[2] = this._m[8];
@@ -276,7 +289,7 @@ export class Mat4 {
      * @public
      * @returns {Mat4} -
      */
-    setIdentity() {
+    public setIdentity(): Mat4 {
         this._m[0] = 1;
         this._m[1] = 0;
         this._m[2] = 0;
@@ -302,7 +315,8 @@ export class Mat4 {
      * @param {Mat4} mx - Matrix to multiply.
      * @returns {Mat4} -
      */
-    mul(mx) {
+    public mul(mx: Mat4): Mat4 {
+
         let d = this._m[0],
             e = this._m[1],
             g = this._m[2],
@@ -337,7 +351,8 @@ export class Mat4 {
             G = mx._m[14],
             b = mx._m[15];
 
-        var res = new Mat4();
+        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;
@@ -354,6 +369,7 @@ 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;
     }
 
@@ -363,15 +379,19 @@ export class Mat4 {
      * @param {Vec3} v - Translate vector.
      * @returns {Mat4} -
      */
-    translate(v) {
-        var d = v.x,
+    public translate(v: Vec3): Mat4 {
+
+        let d = v.x,
             e = v.y,
             b = v.z;
-        var a = this._m;
+
+        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;
     }
 
@@ -381,8 +401,8 @@ export class Mat4 {
      * @param {Vec3} v - Translate to position.
      * @returns {Mat4} -
      */
-    translateToPosition(v) {
-        var a = this._m;
+    public translateToPosition(v: Vec3): Mat4 {
+        let a = this._m;
         a[12] = v.x;
         a[13] = v.y;
         a[14] = v.z;
@@ -390,18 +410,20 @@ export class Mat4 {
     }
 
     /**
-     * Rotate currrent matrix around the aligned axis and angle.
+     * Rotate current matrix around the aligned axis and angle.
      * @public
      * @param {Vec3} u - Aligned axis.
      * @param {number} angle - Aligned axis angle in radians.
      * @returns {Mat4} -
-     * @todo: OPTIMIZE: reveal multiplication
      */
-    rotate(u, angle) {
-        var c = Math.cos(angle),
+    public rotate(u: Vec3, angle: number): Mat4 {
+
+        let c = Math.cos(angle),
             s = Math.sin(angle);
-        var rot = new Mat4();
-        var mx = rot._m;
+
+        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;
@@ -418,6 +440,7 @@ export class Mat4 {
         mx[13] = 0;
         mx[14] = 0;
         mx[15] = 1;
+
         return this.mul(rot);
     }
 
@@ -428,10 +451,13 @@ export class Mat4 {
      * @param {number} angle - Aligned axis angle in radians.
      * @returns {Mat4} -
      */
-    setRotation(u, angle) {
-        var c = Math.cos(angle),
+    public setRotation(u: Vec3, angle: number): Mat4 {
+
+        let c = Math.cos(angle),
             s = Math.sin(angle);
-        var mx = this._m;
+
+        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;
@@ -448,18 +474,19 @@ export class Mat4 {
         mx[13] = 0;
         mx[14] = 0;
         mx[15] = 1;
+
         return this;
     }
 
     /**
      * Gets the rotation matrix from one vector to another.
      * @public
-     * @param {Vec3} a - Firtst vector.
+     * @param {Vec3} a - First vector.
      * @param {Vec3} b - Second vector.
      * @returns {Mat4} -
      */
-    rotateBetweenVectors(a, b) {
-        var q = Quat.getRotationBetweenVectors(a, b);
+    public rotateBetweenVectors(a: Vec3, b: Vec3): Mat4 {
+        let q = Quat.getRotationBetweenVectors(a, b);
         return q.getMat4();
     }
 
@@ -469,8 +496,8 @@ export class Mat4 {
      * @param {Vec3} v - Scale vector.
      * @returns {Mat4} -
      */
-    scale(v) {
-        var mx = this._m;
+    public scale(v: Vec3): Mat4 {
+        let mx = this._m;
         mx[0] = mx[0] * v.x;
         mx[1] = mx[1] * v.x;
         mx[2] = mx[2] * v.x;
@@ -497,10 +524,12 @@ export class Mat4 {
      * @param {number} far -
      * @returns {Mat4} -
      */
-    setPerspective(left, right, bottom, top, near, far) {
-        var h = right - left,
+    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;
+
         this._m[0] = (near * 2) / h;
         this._m[1] = 0;
         this._m[2] = 0;
@@ -517,6 +546,7 @@ export class Mat4 {
         this._m[13] = 0;
         this._m[14] = -(far * near * 2) / j;
         this._m[15] = 0;
+
         return this;
     }
 
@@ -531,8 +561,9 @@ export class Mat4 {
      * @param {number} far -
      * @return {Mat4} -
      */
-    setOrtho(left, right, bottom, top, near, far) {
-        var lr = 1.0 / (left - right),
+    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;
@@ -553,29 +584,31 @@ 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
-     * @param {number} ax - Rotation angle in radians arond X axis.
-     * @param {number} ay - Rotation angle in radians arond Y axis.
-     * @param {number} az - Rotation angle in radians arond Z axis.
+     * @param {number} ax - Rotation angle in radians around X axis.
+     * @param {number} ay - Rotation angle in radians around Y axis.
+     * @param {number} az - Rotation angle in radians around Z axis.
      * @returns {Mat4} -
      */
-    eulerToMatrix(ax, ay, az) {
-        var a = Math.cos(ax),
+    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);
 
-        var ad = a * d,
+        let ad = a * d,
             bd = b * d;
 
-        var mat = this._m;
+        let mat = this._m;
 
         mat[0] = c * e;
         mat[1] = -c * f;
@@ -598,6 +631,6 @@ export class Mat4 {
  * @static
  * @returns {Mat4} -
  */
-export function mat4() {
+export function mat4(): Mat4 {
     return new Mat4();
 }

package/src/{og/math/Plane.js → math/Plane.ts}

@@ -1,8 +1,10 @@
-"use strict";
-
-import { EPS5 } from "../math.js";
-import { Vec3 } from "./Vec3.js";
+import {EPS5} from "../math";
+import {Vec3} from "./Vec3";
+import {Line3} from "./Line3";
 
+const DISJOINT = 0
+const COINCIDE = 1;
+const INTERSECT = 2;
 /**
  * Plane class.
  * @constructor
@@ -10,30 +12,33 @@ import { Vec3 } from "./Vec3.js";
  * @param {Vec3} [n] - Planet normal.
  */
 class Plane {
-    constructor(p, n) {
+    public p: Vec3;
+    public n: Vec3;
+
+    constructor(p: Vec3, n: Vec3) {
         this.p = p ? p.clone() : new Vec3();
         this.n = n ? n.clone() : this.p.normal();
     }
 
-    set(p, n) {
+    public set(p: Vec3, n: Vec3) {
         this.p.copy(p);
         this.n.copy(n);
     }
 
-    getNormal() {
+    public getNormal(): Vec3 {
         return this.n.clone();
     }
 
-    distance(p) {
+    public distance(p: Vec3): number {
         let pp = this.getProjection(p);
         return p.distance(pp);
     }
 
-    getProjection(v, def) {
+    public getProjection(v: Vec3, def?: Vec3): Vec3 {
         return Vec3.proj_b_to_plane(v, this.n, def);
     }
 
-    getProjectionPoint(p, vh) {
+    public getProjectionPoint(p: Vec3, vh?: Vec3): Vec3 {
         let v = p.sub(this.p),
             n = this.n,
             dist = v.dot(n);
@@ -46,29 +51,29 @@ class Plane {
         return p.sub(vh);
     }
 
-    getIntersection(Pn1, Pn2, L) {
-        var u = Pn1.n.cross(Pn2.n);
+    public getIntersection(Pn1: Plane, Pn2: Plane, L: Line3): number {
+        let u = Pn1.n.cross(Pn2.n);
 
-        var ax = u.x >= 0 ? u.x : -u.x;
-        var ay = u.y >= 0 ? u.y : -u.y;
-        var az = u.z >= 0 ? u.z : -u.z;
+        let ax = u.x >= 0 ? u.x : -u.x;
+        let ay = u.y >= 0 ? u.y : -u.y;
+        let az = u.z >= 0 ? u.z : -u.z;
 
         // test if the two planes are parallel
         if (ax + ay + az < EPS5) {
             // Pn1 and Pn2 are near parallel
             // test if disjoint or coincide
-            var v = Pn2.p.sub(Pn1.p);
+            let v = Pn2.p.sub(Pn1.p);
             if (Pn1.n.dot(v) == 0) {
                 // Pn2.V0 lies in Pn1
-                return 1; // Pn1 and Pn2 coincide
+                return COINCIDE; // Pn1 and Pn2 coincide
             } else {
-                return 0; // Pn1 and Pn2 are disjoint
+                return DISJOINT; // Pn1 and Pn2 are disjoint
             }
         }
 
         // Pn1 and Pn2 intersect in a line
         // first determine max abs coordinate of cross product
-        var maxc; // max coordinate
+        let maxc; // max coordinate
         if (ax > ay) {
             if (ax > az) {
                 maxc = 1;
@@ -85,9 +90,9 @@ class Plane {
 
         // next, to get a point on the intersect line
         // zero the max coord, and solve for the other two
-        var iP = new Vec3(); // intersect point
+        let iP = new Vec3(); // intersect point
 
-        var d1, d2; // the constants in the 2 plane equations
+        let d1, d2; // the constants in the 2 plane equations
         d1 = -Pn1.n.dot(Pn1.p); // note: could be pre-stored  with plane
         d2 = -Pn2.n.dot(Pn2.p); // ditto
 
@@ -110,8 +115,8 @@ class Plane {
         }
         L.p0.copy(iP);
         L.p1.copy(iP.add(u));
-        return 2;
+        return INTERSECT;
     }
 }
 
-export { Plane };
+export {Plane};