@openglobus/og 0.22.2 → 0.24.0

package/lib/js/light/LightSource.d.ts

@@ -2,173 +2,35 @@ import { Vec3 } from "../math/Vec3";
 import { RenderNode } from "../scene/RenderNode";
 export interface ILightSourceParams {
     position?: Vec3;
-    directional?: boolean;
     ambient?: Vec3;
     diffuse?: Vec3;
     specular?: Vec3;
     shininess?: number;
 }
-/**
- * Represents basic light source.
- * @class
- * @param {string} [name] - Light source name.
- * @param {ILightSourceParams} [params] - Light parameters:
- * @param {Vec3} [params.position] - Light source position if it is a point light, otherwise it is a light direction vector.
- * @param {Vec3} [params.ambient]  - Ambient RGB color.
- * @param {Vec3} [params.diffuse]  - Diffuse RGB color.
- * @param {Vec3} [params.specular]  - Specular RGB color.
- * @param {number} [params.shininess]  - Specular shininess.
- */
 declare class LightSource {
-    static __counter__: number;
-    /**
-     * Light name.
-     * @protected
-     * @type {string}
-     */
-    protected _name: string;
-    /**
-     * Render node where light is shines.
-     * @protected
-     * @type {RenderNode}
-     */
     protected _renderNode: RenderNode | null;
-    /**
-     * Light position.
-     * @public
-     * @type {Vec3}
-     */
     _position: Vec3;
-    /**
-     * True if the light is directional.
-     * @public
-     * @type {boolean}
-     */
-    directional: boolean;
-    /**
-     * Ambient color.
-     * @protected
-     * @type {Vec3}
-     */
     protected _ambient: Vec3;
-    /**
-     * Diffuse color.
-     * @protected
-     * @type {Vec3}
-     */
     protected _diffuse: Vec3;
-    /**
-     * Specular color.
-     * @protected
-     * @type {Vec3}
-     */
     protected _specular: Vec3;
-    /**
-     * Shininess.
-     * @protected
-     * @type {number}
-     */
     protected _shininess: number;
-    /**
-     * Light activity.
-     * @protected
-     * @type {boolean}
-     */
     protected _active: boolean;
     protected _tempAmbient: Vec3;
     protected _tempDiffuse: Vec3;
     protected _tempSpecular: Vec3;
     protected _tempShininess: number;
-    constructor(name: string, params: ILightSourceParams);
-    /**
-     * Creates clone of the current light object.
-     * @todo: TODO
-     * @public
-     * @returns {LightSource}
-     */
-    clone(): void;
-    /**
-     * Set light activity. If activity is false the light doesn't shine.
-     * @public
-     * @param {boolean} active - Light activity.
-     */
-    setActive(active: boolean): void;
-    /**
-     * Gets light activity.
-     * @public
-     * @returns {boolean}
-     */
+    constructor(params: ILightSourceParams);
     isActive(): boolean;
-    /**
-     * Set light source position, or if it is a directional type sets light direction vector.
-     * @public
-     * @param {Vec3} position - Light position or direction vector.
-     */
     setPosition3v(position: Vec3): void;
-    /**
-     * Set light source position, or if it is a directional type sets light direction vector.
-     * @public
-     */
     setPosition(x: number, y: number, z: number): void;
-    /**
-     * Returns light source position, or if it is a directional type sets light direction vector.
-     * @public
-     * @returns {Vec3} - Light source position/direction.
-     */
     getPosition(): Vec3;
-    /**
-     * Set ambient color.
-     * @public
-     * @param {Vec3} rgb - Ambient color.
-     */
     setAmbient3v(rgb: Vec3): void;
-    /**
-     * Set diffuse color.
-     * @public
-     * @param {Vec3} rgb - Diffuse color.
-     */
     setDiffuse3v(rgb: Vec3): void;
-    /**
-     * Set specular color.
-     * @public
-     * @param {Vec3} rgb - Specular color.
-     */
     setSpecular3v(rgb: Vec3): void;
-    /**
-     * Set ambient color.
-     * @public
-     */
     setAmbient(r: number, g: number, b: number): void;
-    /**
-     * Set diffuse color.
-     * @public
-     */
     setDiffuse(r: number, g: number, b: number): void;
-    /**
-     * Set specular color.
-     * @public
-     */
     setSpecular(r: number, g: number, b: number): void;
-    /**
-     * Set material shininess.
-     * @public
-     */
     setShininess(shininess: number): void;
-    /**
-     * Sets light to black.
-     * @public
-     */
-    setBlack(): void;
-    /**
-     * Adds current light to the render node scene.
-     * @public
-     * @param {RenderNode} renderNode - Render node scene.
-     */
     addTo(renderNode: RenderNode): void;
-    /**
-     * Removes from render node scene.
-     * @public
-     */
-    remove(): void;
 }
 export { LightSource };

package/lib/js/light/LightSource.js

@@ -1,292 +1,86 @@
 import { Vec3 } from "../math/Vec3";
-/**
- * Represents basic light source.
- * @class
- * @param {string} [name] - Light source name.
- * @param {ILightSourceParams} [params] - Light parameters:
- * @param {Vec3} [params.position] - Light source position if it is a point light, otherwise it is a light direction vector.
- * @param {Vec3} [params.ambient]  - Ambient RGB color.
- * @param {Vec3} [params.diffuse]  - Diffuse RGB color.
- * @param {Vec3} [params.specular]  - Specular RGB color.
- * @param {number} [params.shininess]  - Specular shininess.
- */
 class LightSource {
-    constructor(name, params) {
-        /**
-         * Light name.
-         * @protected
-         * @type {string}
-         */
-        this._name = name || "light_" + LightSource.__counter__++;
-        /**
-         * Render node where light is shines.
-         * @protected
-         * @type {RenderNode}
-         */
+    constructor(params) {
         this._renderNode = null;
-        /**
-         * Light position.
-         * @public
-         * @type {Vec3}
-         */
         this._position = params.position || new Vec3();
-        /**
-         * True if the light is directional.
-         * @public
-         * @type {boolean}
-         */
-        this.directional = params.directional != undefined ? params.directional : true;
-        /**
-         * Ambient color.
-         * @protected
-         * @type {Vec3}
-         */
         this._ambient = params.ambient || new Vec3();
-        /**
-         * Diffuse color.
-         * @protected
-         * @type {Vec3}
-         */
         this._diffuse = params.diffuse || new Vec3(0.8, 0.8, 0.8);
-        /**
-         * Specular color.
-         * @protected
-         * @type {Vec3}
-         */
         this._specular = params.specular || new Vec3(0.18, 0.18, 0.18);
-        /**
-         * Shininess.
-         * @protected
-         * @type {number}
-         */
         this._shininess = params.shininess != undefined ? params.shininess : 3.3;
-        /**
-         * Light activity.
-         * @protected
-         * @type {boolean}
-         */
         this._active = true;
         this._tempAmbient = this._ambient.clone();
         this._tempDiffuse = this._diffuse.clone();
         this._tempSpecular = this._specular.clone();
         this._tempShininess = this._shininess;
     }
-    /**
-     * Creates clone of the current light object.
-     * @todo: TODO
-     * @public
-     * @returns {LightSource}
-     */
-    clone() {
-        // TODO
-    }
-    /**
-     * Set light activity. If activity is false the light doesn't shine.
-     * @public
-     * @param {boolean} active - Light activity.
-     */
-    setActive(active) {
-        if (active && !this._active) {
-            const rn = this._renderNode;
-            if (rn) {
-                let index = rn._lightsNames.indexOf(this._name);
-                this._shininess = rn._lightsParamsf[index] = this._tempShininess;
-                if (index != -1) {
-                    index *= 9;
-                    this._ambient.x = rn._lightsParamsv[index] = this._tempAmbient.x;
-                    this._ambient.y = rn._lightsParamsv[index + 1] = this._tempAmbient.y;
-                    this._ambient.z = rn._lightsParamsv[index + 2] = this._tempAmbient.z;
-                    this._diffuse.x = rn._lightsParamsv[index + 3] = this._tempDiffuse.x;
-                    this._diffuse.y = rn._lightsParamsv[index + 4] = this._tempDiffuse.y;
-                    this._diffuse.z = rn._lightsParamsv[index + 5] = this._tempDiffuse.z;
-                    this._specular.x = rn._lightsParamsv[index + 6] = this._tempSpecular.x;
-                    this._specular.y = rn._lightsParamsv[index + 7] = this._tempSpecular.y;
-                    this._specular.z = rn._lightsParamsv[index + 8] = this._tempSpecular.z;
-                }
-            }
-            this._active = true;
-        }
-        else if (!active && this._active) {
-            this._tempAmbient = this._ambient.clone();
-            this._tempDiffuse = this._diffuse.clone();
-            this._tempSpecular = this._specular.clone();
-            this._tempShininess = this._shininess;
-            this.setBlack();
-            this._active = false;
-        }
-    }
-    /**
-     * Gets light activity.
-     * @public
-     * @returns {boolean}
-     */
     isActive() {
         return this._active;
     }
-    /**
-     * Set light source position, or if it is a directional type sets light direction vector.
-     * @public
-     * @param {Vec3} position - Light position or direction vector.
-     */
     setPosition3v(position) {
-        this._position.x = position.x;
-        this._position.y = position.y;
-        this._position.z = position.z;
+        this.setPosition(position.x, position.y, position.z);
     }
-    /**
-     * Set light source position, or if it is a directional type sets light direction vector.
-     * @public
-     */
     setPosition(x, y, z) {
         this._position.x = x;
         this._position.y = y;
         this._position.z = z;
+        if (this._renderNode) {
+            this._renderNode._lightPosition[0] = x;
+            this._renderNode._lightPosition[1] = y;
+            this._renderNode._lightPosition[2] = z;
+        }
     }
-    /**
-     * Returns light source position, or if it is a directional type sets light direction vector.
-     * @public
-     * @returns {Vec3} - Light source position/direction.
-     */
     getPosition() {
         return this._position.clone();
     }
-    /**
-     * Set ambient color.
-     * @public
-     * @param {Vec3} rgb - Ambient color.
-     */
     setAmbient3v(rgb) {
         this.setAmbient(rgb.x, rgb.y, rgb.z);
     }
-    /**
-     * Set diffuse color.
-     * @public
-     * @param {Vec3} rgb - Diffuse color.
-     */
     setDiffuse3v(rgb) {
         this.setDiffuse(rgb.x, rgb.y, rgb.z);
     }
-    /**
-     * Set specular color.
-     * @public
-     * @param {Vec3} rgb - Specular color.
-     */
     setSpecular3v(rgb) {
         this.setSpecular(rgb.x, rgb.y, rgb.z);
     }
-    /**
-     * Set ambient color.
-     * @public
-     */
     setAmbient(r, g, b) {
         this._ambient.set(r, g, b);
         const rn = this._renderNode;
         if (rn) {
-            let index = 9 * rn._lightsNames.indexOf(this._name);
-            if (index != -1) {
-                rn._lightsParamsv[index] = r;
-                rn._lightsParamsv[index + 1] = g;
-                rn._lightsParamsv[index + 2] = b;
-            }
+            rn._lightParams[0] = r;
+            rn._lightParams[1] = g;
+            rn._lightParams[2] = b;
         }
     }
-    /**
-     * Set diffuse color.
-     * @public
-     */
     setDiffuse(r, g, b) {
         this._diffuse.set(r, g, b);
         const rn = this._renderNode;
         if (rn) {
-            let index = 9 * rn._lightsNames.indexOf(this._name);
-            if (index != -1) {
-                rn._lightsParamsv[index + 3] = r;
-                rn._lightsParamsv[index + 4] = g;
-                rn._lightsParamsv[index + 5] = b;
-            }
+            rn._lightParams[3] = r;
+            rn._lightParams[4] = g;
+            rn._lightParams[5] = b;
         }
     }
-    /**
-     * Set specular color.
-     * @public
-     */
     setSpecular(r, g, b) {
         this._specular.set(r, g, b);
         const rn = this._renderNode;
         if (rn) {
-            let index = 9 * rn._lightsNames.indexOf(this._name);
-            if (index != -1) {
-                rn._lightsParamsv[index + 6] = r;
-                rn._lightsParamsv[index + 7] = g;
-                rn._lightsParamsv[index + 8] = b;
-            }
+            rn._lightParams[6] = r;
+            rn._lightParams[7] = g;
+            rn._lightParams[8] = b;
         }
     }
-    /**
-     * Set material shininess.
-     * @public
-     */
     setShininess(shininess) {
         this._shininess = shininess;
         const rn = this._renderNode;
         if (rn) {
-            let index = rn._lightsNames.indexOf(this._name);
-            if (index != -1) {
-                rn._lightsParamsf[index] = shininess;
-            }
-        }
-    }
-    /**
-     * Sets light to black.
-     * @public
-     */
-    setBlack() {
-        this._ambient.clear();
-        this._diffuse.clear();
-        this._specular.clear();
-        this._shininess = 0;
-        const rn = this._renderNode;
-        if (rn) {
-            let index = 9 * rn._lightsNames.indexOf(this._name);
-            if (index !== -1) {
-                rn._lightsParamsv[index] = rn._lightsParamsv[index + 1] = rn._lightsParamsv[index + 2] =
-                    rn._lightsParamsv[index + 3] = rn._lightsParamsv[index + 4] = rn._lightsParamsv[index + 5] =
-                        rn._lightsParamsv[index + 6] = rn._lightsParamsv[index + 7] = rn._lightsParamsv[index + 8] = 0;
-            }
+            rn._lightShininess = shininess;
         }
     }
-    /**
-     * Adds current light to the render node scene.
-     * @public
-     * @param {RenderNode} renderNode - Render node scene.
-     */
     addTo(renderNode) {
         this._renderNode = renderNode;
-        renderNode._lights.push(this);
-        renderNode._lightsNames.push(this._name);
-        renderNode._lightsParamsf.push(this._shininess);
-        renderNode._lightsParamsv.push.apply(renderNode._lightsParamsv, this._ambient.toArray());
-        renderNode._lightsParamsv.push.apply(renderNode._lightsParamsv, this._diffuse.toArray());
-        renderNode._lightsParamsv.push.apply(renderNode._lightsParamsv, this._specular.toArray());
-        renderNode.transformLights();
-    }
-    /**
-     * Removes from render node scene.
-     * @public
-     */
-    remove() {
-        const rn = this._renderNode;
-        if (rn) {
-            // let li = rn.getLightById(this._name);
-            // if (li != -1) {
-            //     rn._lights.splice(li, 1);
-            //     rn._lightsNames.splice(li, 1);
-            //     rn._lightsParamsf.splice(li, 1);
-            //     rn._lightsParamsv.splice(li, 9);
-            // }
-        }
-        this._renderNode = null;
+        this.setShininess(this._shininess);
+        this.setAmbient3v(this._ambient);
+        this.setDiffuse3v(this._diffuse);
+        this.setSpecular3v(this._specular);
     }
 }
-LightSource.__counter__ = 0;
 export { LightSource };

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

@@ -67,7 +67,7 @@ export declare class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4(): Mat4;
+    getMat4(): Mat4;
 }
 /**
  * Mat3 factory.

package/lib/js/math/Mat3.js

@@ -106,7 +106,7 @@ export class Mat3 {
      * @public
      * @returns {Mat4}
      */
-    toMatrix4() {
+    getMat4() {
         let res = new Mat4();
         let b = res._m;
         let a = this._m;

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

@@ -37,6 +37,15 @@ export declare class Mat4 {
      * @returns {Mat4} -
      */
     static identity(): Mat4;
+    /**
+     * Get rotation matrix around the point
+     * @public
+     * @param {number} angle - Rotation angle in radians
+     * @param {Vec3} [center] - Point that the camera rotates around
+     * @param {Vec3} [up] - Camera up vector
+     */
+    static getRotationAroundPoint(angle: number, center?: Vec3, up?: Vec3): Mat4;
+    static getRotation(angle: number, up?: Vec3): Mat4;
     /**
      * Sets column-major order array matrix.
      * @public
@@ -62,7 +71,7 @@ export declare class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3(): Mat3;
+    getMat3(): Mat3;
     /**
      * Multiply to 3d vector.
      * @public

package/lib/js/math/Mat4.js

@@ -45,6 +45,22 @@ export class Mat4 {
         res._m[15] = 1;
         return res;
     }
+    /**
+     * Get rotation matrix around the point
+     * @public
+     * @param {number} angle - Rotation angle in radians
+     * @param {Vec3} [center] - Point that the camera rotates around
+     * @param {Vec3} [up] - Camera up vector
+     */
+    static getRotationAroundPoint(angle, center = Vec3.ZERO, up = Vec3.UP) {
+        let rot = Mat4.getRotation(angle, up);
+        let tr = new Mat4().setIdentity().translate(center);
+        let ntr = new Mat4().setIdentity().translate(center.negateTo());
+        return tr.mul(rot).mul(ntr);
+    }
+    static getRotation(angle, up = Vec3.UP) {
+        return new Mat4().setRotation(up, angle);
+    }
     /**
      * Sets column-major order array matrix.
      * @public
@@ -94,7 +110,7 @@ export class Mat4 {
      * @public
      * @returns {Mat3} -
      */
-    toMatrix3() {
+    getMat3() {
         let res = new Mat3();
         let a = this._m, b = res._m;
         b[0] = a[0];

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

@@ -9,7 +9,9 @@ import { Line3 } from "./Line3";
 declare class Plane {
     p: Vec3;
     n: Vec3;
-    constructor(p: Vec3, n: Vec3);
+    constructor(p?: Vec3, n?: Vec3);
+    setByPoints(v0: Vec3, v1: Vec3, v2: Vec3): Plane;
+    static fromPoints(v0: Vec3, v1: Vec3, v2: Vec3): Plane;
     set(p: Vec3, n: Vec3): void;
     getNormal(): Vec3;
     distance(p: Vec3): number;

package/lib/js/math/Plane.js

@@ -12,7 +12,17 @@ const INTERSECT = 2;
 class Plane {
     constructor(p, n) {
         this.p = p ? p.clone() : new Vec3();
-        this.n = n ? n.clone() : this.p.normal();
+        this.n = n ? n.clone() : (this.p.isZero() ? Vec3.UP : this.p.getNormal());
+    }
+    setByPoints(v0, v1, v2) {
+        let u = Vec3.sub(v1, v0);
+        let v = Vec3.sub(v2, v0);
+        this.n = u.cross(v);
+        this.p.copy(v0);
+        return this;
+    }
+    static fromPoints(v0, v1, v2) {
+        return new Plane().setByPoints(v0, v1, v2);
     }
     set(p, n) {
         this.p.copy(p);