@openglobus/og 0.22.1 → 0.23.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/Quat.d.ts

@@ -118,13 +118,18 @@ export declare class Quat {
      * @returns {Quat} -
      */
     static getRotationBetweenVectorsUp(source: Vec3, dest: Vec3, up: Vec3): Quat;
-    static setFromEulerAngles(pitch: number, yaw: number, roll: number): Quat;
     /**
      * Returns true if the components are zero.
      * @public
      * @returns {boolean} -
      */
     isZero(): boolean;
+    /**
+     * Returns true if a component is NaN.
+     * @public
+     * @returns {boolean} -
+     */
+    isNaN(): boolean;
     /**
      * Clear Quat. Sets zeroes.
      * @public
@@ -167,6 +172,13 @@ export declare class Quat {
      * @returns {Quat} -
      */
     add(q: Quat): Quat;
+    /**
+     * Computes the componentwise sum of two Quats.
+     * @public
+     * @param {Quat} q - Quat to add.
+     * @returns {Quat} -
+     */
+    addRes(q: Quat, res: Quat): Quat;
     /**
      * Computes the componentwise difference of two Quats.
      * @public
@@ -194,6 +206,15 @@ export declare class Quat {
      * @returns {Array.<number>} - (exactly 4 entries)
      */
     toVec(): [number, number, number, number];
+    get xyz(): Vec3;
+    /**
+     * Sets rotation with the given heading and up vectors.
+     * @static
+     * @param {Vec3} forward - Heading target coordinates.
+     * @param {Vec3} up - Up vector.
+     * @returns {Quat} -
+     */
+    setLookRotation(forward: Vec3, up: Vec3): Quat;
     /**
      * Sets current quaternion by spherical coordinates.
      * @public
@@ -203,20 +224,12 @@ export declare class Quat {
      * @returns {Quat} -
      */
     setFromSphericalCoords(lat: number, lon: number, angle: number): Quat;
-    /**
-     * Sets rotation with the given heading and up vectors.
-     * @static
-     * @param {Vec3} forward - Heading target coordinates.
-     * @param {Vec3} up - Up vector.
-     * @returns {Quat} -
-     */
-    setLookRotation(forward: Vec3, up: Vec3): Quat;
     /**
      * Gets spherical coordinates.
      * @public
      * @returns {Object} Returns object with latitude, longitude and alpha.
      */
-    toSphericalCoords(): any;
+    getSphericalCoords(): any;
     /**
      * Sets current Quat representing a rotation around an axis.
      * @public
@@ -228,9 +241,16 @@ export declare class Quat {
     /**
      * Returns axis and angle of the current Quat.
      * @public
-     * @returns {Object} -
+     * @returns { axis: Vec3, angle: number } -
      */
-    getAxisAngle(): any;
+    getAxisAngle(): {
+        axis: Vec3;
+        angle: number;
+    };
+    getPitch(): number;
+    getYaw(): number;
+    getRoll(): number;
+    setPitchYawRoll(pitchRad: number, yawRad: number, rollRad: number, frame?: Quat): Quat;
     /**
      * Sets current Quat by Euler's angles.
      * @public
@@ -274,6 +294,13 @@ export declare class Quat {
      * @returns {Vec3} -
      */
     mulVec3(v: Vec3): Vec3;
+    /**
+     * Returns quaternion and vector production.
+     * @public
+     * @param {Vec3} v - 3d Vector.
+     * @returns {Vec3} -
+     */
+    mulVec3Res(v: Vec3, res: Vec3): Vec3;
     /**
      * Computes the product of two Quats.
      * @public
@@ -281,6 +308,13 @@ export declare class Quat {
      * @returns {Quat} -
      */
     mul(q: Quat): Quat;
+    /**
+     * Computes the product of two Quats.
+     * @public
+     * @param {Quat} q - Quat to multiply.
+     * @returns {Quat} -
+     */
+    mulRes(q: Quat, res: Quat): Quat;
     /**
      * Computes the product of two Quats.
      * @public
@@ -340,27 +374,6 @@ export declare class Quat {
      * @returns {Quat} -
      */
     slerp(b: Quat, t: number): Quat;
-    /**
-     * Returns a roll angle in radians.
-     * @public
-     * @param {Boolean} [reprojectAxis] -
-     * @returns {Number} -
-     */
-    getRoll(reprojectAxis?: boolean): number;
-    /**
-     * Returns a pitch angle in radians.
-     * @public
-     * @param {Boolean} [reprojectAxis] -
-     * @returns {number} -
-     */
-    getPitch(reprojectAxis?: boolean): number;
-    /**
-     * Returns a yaw angle in radians.
-     * @public
-     * @param {Boolean} [reprojectAxis] -
-     * @returns {number} -
-     */
-    getYaw(reprojectAxis?: boolean): number;
 }
 /**
  * Creates Quat instance.