@openglobus/og 0.11.5 → 0.12.0

package/src/og/webgl/Multisample.js

@@ -2,7 +2,7 @@
  * @module og/webgl/Multisample
  */
 
-'use strict';
+"use strict";
 
 /**
  * Class represents multisample framebuffer.
@@ -16,9 +16,7 @@
  * @param {Boolean} [options.useDepth] - Using depth buffer during the rendering.
  */
 export class Multisample {
-
     constructor(handler, options) {
-
         options = options || {};
 
         /**
@@ -28,7 +26,9 @@ export class Multisample {
          */
         this.handler = handler;
 
-        this._internalFormat = options.internalFormat ? options.internalFormat.toUpperCase() : "RGBA8";
+        this._internalFormat = options.internalFormat
+            ? options.internalFormat.toUpperCase()
+            : "RGBA8";
 
         /**
          * Framebuffer object.
@@ -62,10 +62,11 @@ export class Multisample {
 
         this._useDepth = options.useDepth != undefined ? options.useDepth : true;
 
-        this._depthComponent = options.depthComponent != undefined ? options.depthComponent : "DEPTH_COMPONENT16";
+        this._depthComponent =
+            options.depthComponent != undefined ? options.depthComponent : "DEPTH_COMPONENT16";
 
         /**
-         * Framebuffer activity. 
+         * Framebuffer activity.
          * @private
          * @type {boolean}
          */
@@ -102,7 +103,6 @@ export class Multisample {
      * @private
      */
     init() {
-
         var gl = this.handler.gl;
 
         this._glFilter = gl[this._filter];
@@ -115,8 +115,19 @@ export class Multisample {
         for (var i = 0; i < this.renderbuffers.length; i++) {
             let rb = gl.createRenderbuffer();
             gl.bindRenderbuffer(gl.RENDERBUFFER, rb);
-            gl.renderbufferStorageMultisample(gl.RENDERBUFFER, this._msaa, gl[this._internalFormat], this._width, this._height);
-            gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0 + i, gl.RENDERBUFFER, rb);
+            gl.renderbufferStorageMultisample(
+                gl.RENDERBUFFER,
+                this._msaa,
+                gl[this._internalFormat],
+                this._width,
+                this._height
+            );
+            gl.framebufferRenderbuffer(
+                gl.FRAMEBUFFER,
+                gl.COLOR_ATTACHMENT0 + i,
+                gl.RENDERBUFFER,
+                rb
+            );
             colorAttachments.push(gl.COLOR_ATTACHMENT0 + i);
             this.renderbuffers[i] = rb;
             gl.bindRenderbuffer(gl.RENDERBUFFER, null);
@@ -126,8 +137,19 @@ export class Multisample {
         if (this._useDepth) {
             this._depthRenderbuffer = gl.createRenderbuffer();
             gl.bindRenderbuffer(gl.RENDERBUFFER, this._depthRenderbuffer);
-            gl.renderbufferStorageMultisample(gl.RENDERBUFFER, this._msaa, gl[this._depthComponent], this._width, this._height);
-            gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, this._depthRenderbuffer);
+            gl.renderbufferStorageMultisample(
+                gl.RENDERBUFFER,
+                this._msaa,
+                gl[this._depthComponent],
+                this._width,
+                this._height
+            );
+            gl.framebufferRenderbuffer(
+                gl.FRAMEBUFFER,
+                gl.DEPTH_ATTACHMENT,
+                gl.RENDERBUFFER,
+                this._depthRenderbuffer
+            );
             gl.bindRenderbuffer(gl.RENDERBUFFER, null);
         }
 
@@ -137,7 +159,6 @@ export class Multisample {
     }
 
     blitTo(framebuffer, attachmentIndex = 0) {
-
         let gl = this.handler.gl;
 
         gl.bindFramebuffer(gl.READ_FRAMEBUFFER, this._fbo);
@@ -147,9 +168,16 @@ export class Multisample {
         gl.clearBufferfv(gl.COLOR, 0, [0.0, 0.0, 0.0, 1.0]);
 
         gl.blitFramebuffer(
-            0, 0, this._width, this._height,
-            0, 0, framebuffer._width, framebuffer._height,
-            gl.COLOR_BUFFER_BIT, this._glFilter
+            0,
+            0,
+            this._width,
+            this._height,
+            0,
+            0,
+            framebuffer._width,
+            framebuffer._height,
+            gl.COLOR_BUFFER_BIT,
+            this._glFilter
         );
 
         gl.bindFramebuffer(gl.FRAMEBUFFER, null);
@@ -229,4 +257,4 @@ export class Multisample {
             gl.viewport(0, 0, h.canvas.width, h.canvas.height);
         }
     }
-}
+}

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/Clock.d.ts

@@ -1,94 +0,0 @@
-/**
- * Class represents application timer that stores custom current julian datetime, and time speed multiplier.
- * @class
- * @param {Object} [params] - Clock parameters:
- * @param {number} [params.startDate=0.0] - Julian start date.
- * @param {number} [params.endDate=0.0] - Julian end date.
- * @param {number} [params.currentDate] - Julian current date. Default: current date.
- * @param {number} [params.multiplier=1.0] - Time speed multiolier.
- */
-export class Clock {
-    static set _staticCounter(arg: any);
-    static get _staticCounter(): any;
-    /**
-     *
-     * @param {Object} [params] - Clock parameters:
-     */
-    constructor(params?: any);
-    _id: number;
-    /**
-     * Clock name.
-     * @public
-     * @type {string}
-     */
-    public name: string;
-    /**
-     * Clock events.
-     * @public
-     * @type {Events}
-     */
-    public events: Events;
-    /**
-     * Start julian date clock loop.
-     * @public
-     * @type {number}
-     */
-    public startDate: number;
-    /**
-     * End julian date clock loop.
-     * @public
-     * @type {number}
-     */
-    public endDate: number;
-    /**
-     * Current julian datetime.
-     * @public
-     * @type {number}
-     */
-    public currentDate: number;
-    /**
-     * Timer speed multiplier.
-     * @public
-     * @type {number}
-     */
-    public multiplier: number;
-    /**
-     * Animation frame delta time.
-     * @public
-     * @readonly
-     * @type {number}
-     */
-    public readonly deltaTicks: number;
-    /**
-     * Timer activity.
-     * @public
-     * @type {boolean}
-     */
-    public active: boolean;
-    _intervalDelay: number;
-    _intervalStart: number;
-    _intervalCallback: any;
-    clearInterval(): void;
-    setInterval(delay: any, callback: any): void;
-    /**
-     * Sets current clock datetime.
-     * @public
-     * @param {Object} date - JavaScript Date object.
-     */
-    public setDate(date: any): void;
-    /**
-     * Returns current application date.
-     * @public
-     * @returns {Date} - Current date.
-     */
-    public getDate(): Date;
-    reset(): void;
-    _tick(dt: any): void;
-    /**
-     * @public
-     * @param {Clock} clock - Clock instance to compare.
-     * @returns {boolean} - Returns true if a clock is the same instance.
-     */
-    public equal(clock: Clock): boolean;
-}
-import { Events } from "./Events.js";

package/types/Deferred.d.ts

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

package/types/Events.d.ts

@@ -1,77 +0,0 @@
-/**
- * Base events class to handle custom events.
- * @class
- */
-export class Events {
-    static set _staticCounter(arg: any);
-    static get _staticCounter(): any;
-    /**
-     *
-     * @param {Array.<string>} [eventNames] - Event names that could be dispatched.
-     * @param {*} [sender]
-     */
-    constructor(eventNames?: Array<string>, sender?: any);
-    /**
-     * Registered event names.
-     * @protected
-     * @type {Array.<string>}
-     */
-    protected _eventNames: Array<string>;
-    _sender: any;
-    /**
-     * Stop propagation flag
-     * @protected
-     * @type {boolean}
-     */
-    protected _stopPropagation: boolean;
-    _stampCache: {};
-    __id: number;
-    bindSender(sender: any): void;
-    /**
-     * Function that creates event object properties that would be dispatched.
-     * @public
-     * @param {Array.<string>} eventNames - Specified event names list.
-     */
-    public registerNames(eventNames: Array<string>): void;
-    _getStamp(name: any, id: any, ogid: any): string;
-    /**
-     * Returns true if event callback has stamped.
-     * @protected
-     * @param {Object} name - Event identifier.
-     * @param {Object} obj - Event callback.
-     * @return {boolean} -
-     */
-    protected _stamp(name: any, obj: any): boolean;
-    /**
-     * Attach listener.
-     * @public
-     * @param {string} name - Event name to listen.
-     * @param {eventCallback} callback - Event callback function.
-     * @param {Object} sender - Event callback function owner.
-     */
-    public on(name: string, callback: any, 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;
-    /**
-     * Dispatch event.
-     * @public
-     * @param {Object} event - Event instance property that created by event name.
-     * @param {Object} [obj] - Event object.
-     */
-    public dispatch(event: any, ...args: any[]): boolean;
-    /**
-     * Brakes events propagation.
-     * @public
-     */
-    public stopPropagation(): void;
-    /**
-     * Removes all events.
-     * @public
-     */
-    public clear(): void;
-}

package/types/Extent.d.ts

@@ -1,166 +0,0 @@
-/**
- * Represents geographical coordinates extent.
- * @class
- * @param {LonLat} [sw] - South West extent corner coordiantes.
- * @param {LonLat} [ne] - North East extent corner coordiantes.
- */
-export class Extent {
-    /**
-     * Whole mercator extent.
-     * @const
-     */
-    static get FULL_MERC(): Extent;
-    /**
-     * Degrees extent from north mercator limit to north pole.
-     * @const
-     */
-    static get NORTH_POLE_DEG(): Extent;
-    /**
-     * Degrees extent from south pole to south mercator limit.
-     * @const
-     */
-    static get SOUTH_POLE_DEG(): Extent;
-    /**
-     * Creates extent instance from values in array.
-     * @static
-     * @param {Array.<number>} arr - South west and north east longitude and latidudes packed in array. (exactly 4 entries)
-     * @return {Extent} Extent object.
-     */
-    static createFromArray(arr: Array<number>): Extent;
-    /**
-     * Creates bound extent instance by coordinate array.
-     * @static
-     * @param {Array.<LonLat>} arr - Coordinate array.
-     * @return {Extent} Extent object.
-     */
-    static createByCoordinates(arr: Array<LonLat>): Extent;
-    /**
-     * Creates bound extent instance by coordinate array.
-     * @static
-     * @param {Array.<Array<number>>} arr - Coordinate array. (exactly 2 entries)
-     * @return {Extent} Extent object.
-     */
-    static createByCoordinatesArr(arr: Array<Array<number>>): Extent;
-    /**
-     * Creates extent by meractor grid tile coordinates.
-     * @static
-     * @param {number} x -
-     * @param {number} y -
-     * @param {number} z -
-     * @param {number} width -
-     * @param {number} height -
-     * @returns {Extent} -
-     */
-    static fromTile(x: number, y: number, z: number, width: number, height: number): Extent;
-    /**
-     * @param {LonLat} [sw] - South West extent corner coordiantes.
-     * @param {LonLat} [ne] - North East extent corner coordiantes.
-     */
-    constructor(sw?: LonLat, ne?: LonLat);
-    /**
-     * @public
-     */
-    public southWest: LonLat;
-    /**
-     * @public
-     */
-    public northEast: LonLat;
-    /**
-     * Sets current bounding extent object by coordinate array.
-     * @public
-     * @param {Array.<LonLat>} arr - Coordinate array.
-     * @return {Extent} Current extent.
-     */
-    public setByCoordinates(arr: Array<LonLat>): Extent;
-    /**
-     * Determines if point inside extent.
-     * @public
-     * @param {LonLat} lonlat - Coordinate point.
-     * @return {boolean} Returns true if point inside extent.
-     */
-    public isInside(lonlat: LonLat): boolean;
-    /**
-     * Returns true if two extent overlap each other.
-     * @public
-     * @param {Extent} e - Another extent.
-     * @return {boolean} -
-     */
-    public overlaps(e: Extent): boolean;
-    /**
-     * Gets extent width.
-     * @public
-     * @return {number} Extent width.
-     */
-    public getWidth(): number;
-    /**
-     * Gets extent height.
-     * @public
-     * @return {number} Extent height.
-     */
-    public getHeight(): number;
-    /**
-     * Creates clone instance of the current extent.
-     * @public
-     * @return {Extent} Extent clone.
-     */
-    public clone(): Extent;
-    /**
-     * Gets the center coordinate of the extent.
-     * @public
-     * @return {number} Center coordinate.
-     */
-    public getCenter(): number;
-    /**
-     * @public
-     */
-    public getNorthWest(): LonLat;
-    /**
-     * @public
-     */
-    public getNorthEast(): LonLat;
-    getSouthWest(): LonLat;
-    /**
-     * @public
-     */
-    public getSouthEast(): LonLat;
-    /**
-     * @public
-     */
-    public getNorth(): number;
-    getEast(): number;
-    /**
-     * @public
-     */
-    public getWest(): number;
-    /**
-     * @public
-     */
-    public getSouth(): number;
-    /**
-     * Returns extents are equals.
-     * @param {Extent} extent - Extent.
-     * @returns {boolean} -
-     */
-    equals(extent: Extent): boolean;
-    /**
-     * Converts extent coordinates to mercator projection coordinates.
-     * @public
-     * @return {Extent} New instance of the current extent.
-     */
-    public forwardMercator(): Extent;
-    /**
-     * Converts extent coordinates from mercator projection to degrees.
-     * @public
-     * @return {Extent} New instance of the current extent.
-     */
-    public inverseMercator(): Extent;
-    /**
-     * Gets cartesian bounding bounds of the current ellipsoid.
-     * @public
-     * @param {Ellipsoid} ellipsoid - Ellipsoid.
-     * @return {Array.<number>} Cartesian 3d coordinate array. (exactly 6 entries)
-     */
-    public getCartesianBounds(ellipsoid: any): Array<number>;
-    toString(): string;
-}
-import { LonLat } from "./LonLat.js";