@openglobus/og 0.11.5 → 0.11.6

package/src/og/webgl/Program.js

@@ -2,20 +2,13 @@
  * @module og/webgl/Program
  */
 
-'use strict';
+"use strict";
 
-import { callbacks } from './callbacks.js';
-import { cons } from '../cons.js';
-import { typeStr } from './types.js';
+import { callbacks } from "./callbacks.js";
+import { cons } from "../cons.js";
+import { typeStr, types } from "./types.js";
 
-const itemTypes = [
-    "BYTE",
-    "SHORT",
-    "UNSIGNED_BYTE",
-    "UNSIGNED_SHORT",
-    "FLOAT",
-    "HALF_FLOAT"
-];
+const itemTypes = ["BYTE", "SHORT", "UNSIGNED_BYTE", "UNSIGNED_SHORT", "FLOAT", "HALF_FLOAT"];
 
 /**
  * Represents more comfortable using WebGL shader program.
@@ -46,9 +39,11 @@ class Program {
          */
         this._attributes = {};
         for (let t in material.attributes) {
-            if (typeof (material.attributes[t]) === "string" ||
-                typeof (material.attributes[t]) === "number") {
-                this._attributes[t] = { 'type': material.attributes[t] };
+            if (
+                typeof material.attributes[t] === "string" ||
+                typeof material.attributes[t] === "number"
+            ) {
+                this._attributes[t] = { type: material.attributes[t] };
             } else {
                 this._attributes[t] = material.attributes[t];
             }
@@ -61,9 +56,11 @@ class Program {
          */
         this._uniforms = {};
         for (let t in material.uniforms) {
-            if (typeof (material.uniforms[t]) === "string" ||
-                typeof (material.uniforms[t]) === "number") {
-                this._uniforms[t] = { 'type': material.uniforms[t] };
+            if (
+                typeof material.uniforms[t] === "string" ||
+                typeof material.uniforms[t] === "number"
+            ) {
+                this._uniforms[t] = { type: material.uniforms[t] };
             } else {
                 this._uniforms[t] = material.uniforms[t];
             }
@@ -117,6 +114,13 @@ class Program {
          * @type {Array.<Object>}
          */
         this._attribArrays = [];
+
+        /**
+         * Program attributes divisor.
+         * @private
+         * @type {Array.<Object>}
+         */
+        this._attribDivisor = [];
     }
 
     /**
@@ -128,7 +132,14 @@ class Program {
     static bindBuffer(program, variable) {
         var gl = program.gl;
         gl.bindBuffer(gl.ARRAY_BUFFER, variable.value);
-        gl.vertexAttribPointer(variable._pName, variable.value.itemSize, variable.itemType, variable.normalized, 0, 0);
+        gl.vertexAttribPointer(
+            variable._pName,
+            variable.value.itemSize,
+            variable.itemType,
+            variable.normalized,
+            0,
+            0
+        );
     }
 
     /**
@@ -196,7 +207,9 @@ class Program {
         this.gl.shaderSource(shader, src);
         this.gl.compileShader(shader);
         if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) {
-            cons.logErr("og/Program/Program:" + this.name + " - " + this.gl.getShaderInfoLog(shader) + ".");
+            cons.logErr(
+                "og/Program/Program:" + this.name + " - " + this.gl.getShaderInfoLog(shader) + "."
+            );
             return false;
         }
         return true;
@@ -237,9 +250,9 @@ class Program {
     disableAttribArrays() {
         var gl = this.gl;
         var a = this._attribArrays;
-        var i = a.length;
-        while (i--) {
+        for (let i = 0, len = a.length; i < len; i++) {
             gl.disableVertexAttribArray(a[i]);
+            gl.vertexAttribDivisor(a[i], 0);
         }
     }
 
@@ -250,9 +263,10 @@ class Program {
     enableAttribArrays() {
         var gl = this.gl;
         var a = this._attribArrays;
-        var i = a.length;
-        while (i--) {
+        var d = this._attribDivisor;
+        for (let i = 0, len = a.length; i < len; i++) {
             gl.enableVertexAttribArray(a[i]);
+            gl.vertexAttribDivisor(a[i], d[i]);
         }
     }
 
@@ -280,7 +294,13 @@ class Program {
         gl.linkProgram(this._p);
 
         if (!gl.getProgramParameter(this._p, gl.LINK_STATUS)) {
-            cons.logErr("og/Program/Program:" + this.name + " - couldn't initialise shaders. " + gl.getProgramInfoLog(this._p) + ".");
+            cons.logErr(
+                "og/Program/Program:" +
+                    this.name +
+                    " - couldn't initialise shaders. " +
+                    gl.getProgramInfoLog(this._p) +
+                    "."
+            );
             gl.deleteProgram(this._p);
             return;
         }
@@ -293,25 +313,47 @@ class Program {
 
             this._attributes[a]._callback = Program.bindBuffer;
 
-            let itemTypeStr = this._attributes[a].itemType ? this._attributes[a].itemType.trim().toUpperCase() : "FLOAT";
+            let itemTypeStr = this._attributes[a].itemType
+                ? this._attributes[a].itemType.trim().toUpperCase()
+                : "FLOAT";
+
             if (itemTypes.indexOf(itemTypeStr) == -1) {
-                cons.logErr(`og/Program/Program: ${this.name}- attribute '${a}', item type ${this._attributes[a].itemType} not exists.`);
+                cons.logErr(
+                    `og/Program/Program: ${this.name}- attribute '${a}', item type ${this._attributes[a].itemType} not exists.`
+                );
                 this._attributes[a].itemType = gl.FLOAT;
             } else {
                 this._attributes[a].itemType = gl[itemTypeStr];
             }
 
             this._attributes[a].normalized = this._attributes[a].normalized || false;
+            this._attributes[a].divisor = this._attributes[a].divisor || 0;
 
             this._p[a] = gl.getAttribLocation(this._p, a);
 
             if (this._p[a] == undefined) {
-                cons.logErr("og/Program/Program:" + this.name + " - attribute '" + a + "' is not exists.");
+                cons.logErr(
+                    "og/Program/Program:" + this.name + " - attribute '" + a + "' is not exists."
+                );
                 gl.deleteProgram(this._p);
                 return;
             }
 
-            this._attribArrays.push(this._p[a]);
+            let type = this._attributes[a].type;
+            if (typeof type === "string") {
+                type = typeStr[type.trim().toLowerCase()];
+            }
+
+            let d = this._attributes[a].divisor;
+            if (type === types.MAT4) {
+                let loc = this._p[a];
+                this._attribArrays.push(loc, loc + 1, loc + 2, loc + 3);
+                this._attribDivisor.push(d, d, d, d);
+            } else {
+                this._attribArrays.push(this._p[a]);
+                this._attribDivisor.push(d);
+            }
+
             gl.enableVertexAttribArray(this._p[a]);
 
             this._attributes[a]._pName = this._p[a];
@@ -321,8 +363,9 @@ class Program {
         for (var u in this._uniforms) {
             //this.uniforms[u]._name = u;
 
-            if (typeof (this._uniforms[u].type) === "string") {
-                this._uniforms[u]._callback = callbacks.u[typeStr[this._uniforms[u].type.trim().toLowerCase()]];
+            if (typeof this._uniforms[u].type === "string") {
+                this._uniforms[u]._callback =
+                    callbacks.u[typeStr[this._uniforms[u].type.trim().toLowerCase()]];
             } else {
                 this._uniforms[u]._callback = callbacks.u[this._uniforms[u].type];
             }
@@ -331,7 +374,9 @@ class Program {
             this._p[u] = gl.getUniformLocation(this._p, u);
 
             if (this._p[u] == undefined) {
-                cons.logErr("og/Program/Program:" + this.name + " - uniform '" + u + "' is not exists.");
+                cons.logErr(
+                    "og/Program/Program:" + this.name + " - uniform '" + u + "' is not exists."
+                );
                 gl.deleteProgram(this._p);
                 return;
             }
@@ -348,4 +393,4 @@ class Program {
     }
 }
 
-export { Program };
+export { Program };

package/src/og/webgl/callbacks.js

@@ -93,6 +93,6 @@ callbacks.a[types.VEC3] = function (program, variable) {
     program.gl.vertexAttrib3fv(variable._pName, variable.value);
 };
 
-callbacks.a[types.VEC4] = function (program, variable) {
-    program.gl.vertexAttrib4fv(variable._pName, variable.value);
-};
+//callbacks.a[types.VEC4] = function (program, variable) {
+//    program.gl.vertexAttrib4fv(variable._pName, variable.value);
+//};

package/types/Deferred.d.ts

@@ -2,5 +2,5 @@ export function Deferred(): void;
 export class Deferred {
     resolve: any;
     reject: any;
-    promise: Promise<any>;
+    promise: any;
 }

package/types/Events.d.ts

@@ -49,14 +49,14 @@ export class Events {
      * @param {eventCallback} callback - Event callback function.
      * @param {Object} sender - Event callback function owner.
      */
-    public on(name: string, callback: any, sender: any, priority?: number): void;
+    public on(name: string, callback: eventCallback, sender: any, priority?: number): void;
     /**
      * Stop listening event name with specified callback function.
      * @public
      * @param {string} name - Event name.
      * @param {eventCallback} callback - Attached  event callback.
      */
-    public off(name: string, callback: any): void;
+    public off(name: string, callback: eventCallback): void;
     /**
      * Dispatch event.
      * @public

package/types/Extent.d.ts

@@ -160,7 +160,7 @@ export class Extent {
      * @param {Ellipsoid} ellipsoid - Ellipsoid.
      * @return {Array.<number>} Cartesian 3d coordinate array. (exactly 6 entries)
      */
-    public getCartesianBounds(ellipsoid: any): Array<number>;
+    public getCartesianBounds(ellipsoid: Ellipsoid): Array<number>;
     toString(): string;
 }
 import { LonLat } from "./LonLat.js";

package/types/Rectangle.d.ts

@@ -5,7 +5,7 @@
  * @param {number} [top] - Top coordinate. 0 - default.
  * @param {number} [right] - Right coordinate. 0 - default.
  * @param {number} [bottom] - Bottom coordinate. 0 - default.
-*/
+ */
 export class Rectangle {
     /**
      * @param {number} [left] - Left coordinate. 0 - default.

package/types/ajax.d.ts

@@ -20,5 +20,5 @@ export namespace ajax {
         data?: any;
         sender?: any;
         responseType?: string;
-    }): any;
+    }): ajax.Xhr;
 }

package/types/bv/Box.d.ts

@@ -25,6 +25,6 @@ export class Box {
      * @param {Ellipsoid} ellipsoid - Ellipsoid.
      * @param {Extent} extent - Geodetic extent.
      */
-    setFromExtent(ellipsoid: any, extent: any): void;
+    setFromExtent(ellipsoid: Ellipsoid, extent: Extent): void;
 }
 import { Vec3 } from "../math/Vec3.js";

package/types/bv/Sphere.d.ts

@@ -33,6 +33,6 @@ export class Sphere {
      * @param {Ellipsoid} ellipsoid - Ellipsoid.
      * @param {Extent} extent - Geodetic extent.
      */
-    setFromExtent(ellipsoid: any, extent: any): void;
+    setFromExtent(ellipsoid: Ellipsoid, extent: Extent): void;
 }
 import { Vec3 } from "../math/Vec3.js";

package/types/camera/Camera.d.ts

@@ -18,13 +18,13 @@ export class Camera {
      * @param {Renderer} [renderer] - Renderer uses the camera instance.
      * @param {Object} [options] - Camera options:
      */
-    constructor(renderer?: any, options?: any);
+    constructor(renderer?: Renderer, options?: any);
     /**
      * Assigned renderer
      * @public
      * @type {Renderer}
      */
-    public renderer: any;
+    public renderer: Renderer;
     /**
      * Camera events handler
      * @public
@@ -159,7 +159,7 @@ export class Camera {
      * @param {nnumber} angle - Camera's view angle
      * @param {number} aspect - Screen aspect ration
      */
-    public _setProj(angle: any, aspect: number): void;
+    public _setProj(angle: nnumber, aspect: number): void;
     _projSizeConst: number;
     /**
      * Sets camera view angle in degrees
@@ -239,7 +239,7 @@ export class Camera {
      * @param {Vec3} center - Point that the camera rotates around
      * @param {Vecto3} [up] - Camera up vector
      */
-    public rotateAround(angle: number, isArc: boolean, center: Vec3, up?: any): void;
+    public rotateAround(angle: number, isArc: boolean, center: Vec3, up?: Vecto3): void;
     /**
      * Rotates camera around center point by horizontal.
      * @public
@@ -249,7 +249,7 @@ export class Camera {
      * @param {Vec3} center - Point that the camera rotates around.
      * @param {Vec3} [up] - Camera up vector.
      */
-    public rotateHorizontal(angle: number, isArc: any, center: Vec3, up?: Vec3): void;
+    public rotateHorizontal(angle: number, isArc: boolaen, center: Vec3, up?: Vec3): void;
     /**
      * Rotates camera around center point by vecrtical.
      * @param {number} angle - Rotation angle in radians.

package/types/camera/Frustum.d.ts

@@ -85,7 +85,7 @@ export class Frustum {
      * @param {number} near - Near camera distance.
      * @param {number} far - Far camera distance.
      */
-    public setProjectionMatrix(angle: any, aspect: number, near: number, far: number): void;
+    public setProjectionMatrix(angle: nnumber, aspect: number, near: number, far: number): void;
     /**
      * Camera's projection matrix values.
      * @public
@@ -98,14 +98,14 @@ export class Frustum {
      * @param {Vec3} point - Cartesian point.
      * @returns {boolean} -
      */
-    public containsPoint(point: any): boolean;
+    public containsPoint(point: Vec3): boolean;
     /**
      * Returns true if the frustum contains a bonding sphere, but bottom plane exclude.
      * @public
      * @param {Sphere} sphere - Bounding sphere.
      * @returns {boolean} -
      */
-    public containsSphereBottomExc(sphere: any): boolean;
+    public containsSphereBottomExc(sphere: Sphere): boolean;
     containsSphereButtom(sphere: any): boolean;
     /**
      * Returns true if the frustum contains a bonding sphere.
@@ -113,7 +113,7 @@ export class Frustum {
      * @param {Sphere} sphere - Bounding sphere.
      * @returns {boolean} -
      */
-    public containsSphere(sphere: any): boolean;
+    public containsSphere(sphere: Sphere): boolean;
     /**
      * Returns true if the frustum contains a bonding sphere.
      * @public
@@ -121,13 +121,13 @@ export class Frustum {
      * @param {number} radius - Sphere radius.
      * @returns {boolean} -
      */
-    public containsSphere2(center: any, radius: number): boolean;
+    public containsSphere2(center: Vec3, radius: number): boolean;
     /**
      * Returns true if the frustum contains a bounding box.
      * @public
      * @param {Box} box - Bounding box.
      * @returns {boolean} -
      */
-    public containsBox(box: any): boolean;
+    public containsBox(box: Box): boolean;
 }
 import { Mat4 } from "../math/Mat4.js";

package/types/camera/PlanetCamera.d.ts

@@ -19,13 +19,13 @@ export class PlanetCamera extends Camera {
      * @param {RenderNode} planet - Planet render node.
      * @param {Object} [options] - Planet camera options:
      */
-    constructor(planet: any, options?: any);
+    constructor(planet: RenderNode, options?: any);
     /**
      * Assigned camera's planet.
      * @public
      * @type {Planet}
      */
-    public planet: any;
+    public planet: Planet;
     /**
      * Minimal alltitude that camera can reach over the terrain.
      * @public
@@ -67,7 +67,7 @@ export class PlanetCamera extends Camera {
      * @protected
      * @type {quadTree.Node}
      */
-    protected _insideSegment: any;
+    protected _insideSegment: quadTree.Node;
     /**
      * Coordinates that depends on what segment class we are fling over.
      * It can be WGS84 or Mercator coordinates. Gets in og.quadTree.Node
@@ -122,13 +122,13 @@ export class PlanetCamera extends Camera {
      * @param {Number} height - Camera height
      * @returns {Vec3}
      */
-    public getExtentPosition(extent: any, height: number): Vec3;
+    public getExtentPosition(extent: Extent, height: number): Vec3;
     /**
      * View current extent.
      * @public
      * @param {Extent} extent - Current extent.
      */
-    public viewExtent(extent: any, height: any): void;
+    public viewExtent(extent: Extent, height: any): void;
     /**
      * Flies to the current extent.
      * @public
@@ -139,7 +139,7 @@ export class PlanetCamera extends Camera {
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
      * @param [frameCallback]
      */
-    public flyExtent(extent: any, height: any, up?: Vec3, ampl?: number, completeCallback?: any, startCallback?: any, frameCallback?: any): void;
+    public flyExtent(extent: Extent, height: any, up?: Vec3, ampl?: number, completeCallback?: cameraCallback, startCallback?: cameraCallback, frameCallback?: any): void;
     viewDistance(cartesian: any, distance?: number): void;
     flyDistance(cartesian: any, distance: number, ampl: number, completeCallback: any, startCallback: any, frameCallback: any): void;
     /**
@@ -153,7 +153,7 @@ export class PlanetCamera extends Camera {
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
      * @param [frameCallback]
      */
-    public flyCartesian(cartesian: Vec3, look?: Vec3, up?: Vec3, ampl?: number, completeCallback?: any, startCallback?: any, frameCallback?: any): void;
+    public flyCartesian(cartesian: Vec3, look?: Vec3, up?: Vec3, ampl?: number, completeCallback?: cameraCallback, startCallback?: cameraCallback, frameCallback?: any): void;
     _frameCallback: any;
     /**
      * Flies to the geo coordiantes.
@@ -165,7 +165,7 @@ export class PlanetCamera extends Camera {
      * @param {cameraCallback} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
      */
-    public flyLonLat(lonlat: LonLat, look?: Vec3, up?: Vec3, ampl?: number, completeCallback?: any, startCallback?: any): void;
+    public flyLonLat(lonlat: LonLat, look?: Vec3, up?: Vec3, ampl?: number, completeCallback?: cameraCallback, startCallback?: cameraCallback): void;
     /**
      * Breaks the flight.
      * @public

package/types/control/Control.d.ts

@@ -25,7 +25,7 @@ export class Control {
      * @public
      * @type {Renderer}
      */
-    public renderer: any;
+    public renderer: Renderer;
     /**
      * Auto activation flag.
      * @public

package/types/control/EarthCoordinates.d.ts

@@ -33,7 +33,7 @@ export class EarthCoordinates extends Control {
      * @public
      * @type {Vec3}
      */
-    public position: any;
+    public position: Vec3;
     /**
      * Sets coordinates capturing type.
      * @public

package/types/control/Sun.d.ts

@@ -11,7 +11,7 @@ export class Sun extends Control {
      * @public
      * @type {Planet}
      */
-    public planet: any;
+    public planet: Planet;
     /**
      * Sunlight position placed in the camera eye.
      * @private

package/types/entity/BaseBillboard.d.ts

@@ -39,7 +39,7 @@ export class BaseBillboard {
      * @protected
      * @type {Vec4}
      */
-    protected _color: any;
+    protected _color: Vec4;
     /**
      * Cartesian aligned axis vector.
      * @protected
@@ -51,7 +51,7 @@ export class BaseBillboard {
      * @protected
      * @type {math.Vecto3}
      */
-    protected _offset: any;
+    protected _offset: math.Vecto3;
     /**
      * Billboard visibility.
      * @protected
@@ -63,19 +63,26 @@ export class BaseBillboard {
      * @protected
      * @type {Entity}
      */
-    protected _entity: any;
+    protected _entity: Entity;
     /**
      * Handler that stores and renders this billboard object.
      * @protected
      * @type {BillboardHandler}
      */
-    protected _handler: any;
+    protected _handler: BillboardHandler;
     /**
      * Billboard handler array index.
      * @protected
      * @type {number}
      */
     protected _handlerIndex: number;
+    /**
+     * An indication that the object is ready to draw
+     * @protected
+     * @type {number}
+     */
+    protected _isReady: number;
+    _lockId: number;
     /**
      * Sets billboard position.
      * @public
@@ -109,7 +116,7 @@ export class BaseBillboard {
      * @public
      * @param {Vec2} offset - Offset size.
      */
-    public setOffset3v(offset: any): void;
+    public setOffset3v(offset: Vec2): void;
     /**
      * Returns billboard screen space offset size.
      * @public
@@ -148,7 +155,7 @@ export class BaseBillboard {
      * @public
      * @param {Vec4} color - RGBA vector.
      */
-    public setColor4v(color: any): void;
+    public setColor4v(color: Vec4): void;
     /**
      * Sets billboard color.
      * @public
@@ -160,7 +167,7 @@ export class BaseBillboard {
      * @public
      * @returns {Vec4}
      */
-    public getColor(): any;
+    public getColor(): Vec4;
     /**
      * Sets billboard visibility.
      * @public
@@ -186,7 +193,7 @@ export class BaseBillboard {
      * @public
      * @param {math.Vecto3} alignedAxis - Vector to align.
      */
-    public setAlignedAxis3v(alignedAxis: any): void;
+    public setAlignedAxis3v(alignedAxis: math.Vecto3): void;
     /**
      * Returns aligned vector.
      * @public