@openglobus/og 0.11.4 → 0.11.8

package/src/og/shapes/BaseShape.js

@@ -2,11 +2,11 @@
  * @module og/shape/BaseShape
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from '../math/Vec3.js';
-import { Quat } from '../math/Quat.js';
-import { Mat4 } from '../math/Mat4.js';
+import { Vec3 } from "../math/Vec3.js";
+import { Quat } from "../math/Quat.js";
+import { Mat4 } from "../math/Mat4.js";
 
 /**
  * Base geometry shape class.
@@ -20,9 +20,7 @@ import { Mat4 } from '../math/Mat4.js';
  * @param {boolean} [options.visibility] - Shape visibility.
  */
 class BaseShape {
-
     constructor(options) {
-
         options = options || {};
 
         /**
@@ -59,14 +57,16 @@ class BaseShape {
          * @public
          * @type {Array.<number>} - (exactly 4 entries)
          */
-        this.color = options.color ? new Float32Array(options.color) : new Float32Array([1.0, 1.0, 1.0, 1.0]);
+        this.color = options.color
+            ? new Float32Array(options.color)
+            : new Float32Array([1.0, 1.0, 1.0, 1.0]);
 
         /**
          * Shape visibility.
          * @public
          * @type {boolean}
          */
-        this.visibility = (options.visibility != undefined ? options.visibility : true);
+        this.visibility = options.visibility != undefined ? options.visibility : true;
 
         /**
          * Image url source.
@@ -206,7 +206,6 @@ class BaseShape {
      * @public
      */
     clear() {
-
         this.position.set(0.0, 0.0, 0.0);
         this.orientation.set(0.0, 0.0, 0.0, 1.0);
         this.scale.set(1.0, 1.0, 1.0);
@@ -305,7 +304,7 @@ class BaseShape {
             var img = new Image();
             var that = this;
             img.onload = function () {
-                that.texture = renderNode.renderer.handler.createTexture(this);
+                that.texture = renderNode.renderer.handler.createTextureDefault(this);
             };
             img.src = this._src;
         }
@@ -377,10 +376,26 @@ class BaseShape {
     _createBuffers() {
         this._deleteBuffers();
         var r = this._renderNode.renderer;
-        this._positionBuffer = r.handler.createArrayBuffer(new Float32Array(this._positionData), 3, this._positionData.length / 3);
-        this._normalBuffer = r.handler.createArrayBuffer(new Float32Array(this._normalData), 3, this._normalData.length / 3);
-        this._indexBuffer = r.handler.createElementArrayBuffer(new Uint16Array(this._indexData), 1, this._indexData.length);
-        this._textureCoordBuffer = r.handler.createArrayBuffer(new Float32Array(this._textureCoordData), 2, this._textureCoordData.length / 2);
+        this._positionBuffer = r.handler.createArrayBuffer(
+            new Float32Array(this._positionData),
+            3,
+            this._positionData.length / 3
+        );
+        this._normalBuffer = r.handler.createArrayBuffer(
+            new Float32Array(this._normalData),
+            3,
+            this._normalData.length / 3
+        );
+        this._indexBuffer = r.handler.createElementArrayBuffer(
+            new Uint16Array(this._indexData),
+            1,
+            this._indexData.length
+        );
+        this._textureCoordBuffer = r.handler.createArrayBuffer(
+            new Float32Array(this._textureCoordData),
+            2,
+            this._textureCoordData.length / 2
+        );
     }
 
     /**
@@ -400,9 +415,11 @@ class BaseShape {
             let rn = this._renderNode;
             let r = rn.renderer;
 
-            let sh, p,
+            let sh,
+                p,
                 gl = r.handler.gl,
-                sha, shu;
+                sha,
+                shu;
 
             if (rn.lightEnabled) {
                 sh = r.handler.programs.shape_wl;
@@ -415,12 +432,23 @@ class BaseShape {
                 gl.uniform4fv(shu.lightsPositions, rn._lightsTransformedPositions);
                 gl.uniform3fv(shu.lightsParamsv, rn._lightsParamsv);
                 gl.uniform1fv(shu.lightsParamsf, rn._lightsParamsf);
-                gl.uniformMatrix4fv(shu.projectionMatrix, false, r.activeCamera.getProjectionMatrix());
+                gl.uniformMatrix4fv(
+                    shu.projectionMatrix,
+                    false,
+                    r.activeCamera.getProjectionMatrix()
+                );
                 gl.uniformMatrix4fv(shu.viewMatrix, false, r.activeCamera.getViewMatrix());
                 gl.uniformMatrix3fv(shu.normalMatrix, false, r.activeCamera.getNormalMatrix());
 
                 gl.bindBuffer(gl.ARRAY_BUFFER, this._normalBuffer);
-                gl.vertexAttribPointer(sha.aVertexNormal, this._normalBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                gl.vertexAttribPointer(
+                    sha.aVertexNormal,
+                    this._normalBuffer.itemSize,
+                    gl.FLOAT,
+                    false,
+                    0,
+                    0
+                );
             } else {
                 sh = r.handler.programs.shape_nl;
                 p = sh._program;
@@ -429,13 +457,24 @@ class BaseShape {
 
                 sh.activate();
 
-                gl.uniformMatrix4fv(shu.projectionViewMatrix, false, r.activeCamera.getProjectionViewMatrix());
+                gl.uniformMatrix4fv(
+                    shu.projectionViewMatrix,
+                    false,
+                    r.activeCamera.getProjectionViewMatrix()
+                );
             }
 
             gl.uniform4fv(shu.uColor, this.color);
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._positionBuffer);
-            gl.vertexAttribPointer(sha.aVertexPosition, this._positionBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aVertexPosition,
+                this._positionBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
             gl.uniformMatrix4fv(shu.modelMatrix, false, this._mxModel._m);
 
             gl.activeTexture(gl.TEXTURE0);
@@ -443,41 +482,74 @@ class BaseShape {
             gl.uniform1i(shu.uSampler, 0);
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._textureCoordBuffer);
-            gl.vertexAttribPointer(sha.aTextureCoord, this._textureCoordBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aTextureCoord,
+                this._textureCoordBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
 
             gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
-            gl.drawElements(r.handler.gl.TRIANGLES, this._indexBuffer.numItems, gl.UNSIGNED_SHORT, 0);
+            gl.drawElements(
+                r.handler.gl.TRIANGLES,
+                this._indexBuffer.numItems,
+                gl.UNSIGNED_SHORT,
+                0
+            );
         }
     }
 
-drawPicking() {
+    drawPicking() {
         if (this.visibility) {
             let rn = this._renderNode;
             let r = rn.renderer;
 
-            let sh, p,
+            let sh,
+                p,
                 gl = r.handler.gl,
-                sha, shu;
+                sha,
+                shu;
 
+            sh = r.handler.programs.shape_picking;
+            p = sh._program;
+            shu = p.uniforms;
+            sha = p.attributes;
 
+            sh.activate();
 
-                sh = r.handler.programs.shape_picking;
-                p = sh._program;
-                shu = p.uniforms;
-                sha = p.attributes;
-
-                sh.activate();
-
-            gl.uniformMatrix4fv(shu.projectionViewMatrix, false, r.activeCamera.getProjectionViewMatrix());
+            gl.uniformMatrix4fv(
+                shu.projectionViewMatrix,
+                false,
+                r.activeCamera.getProjectionViewMatrix()
+            );
 
-            gl.uniform4fv(shu.uColor, [this._pickingColor[0], this._pickingColor[1], this._pickingColor[2], 1.0]);
+            gl.uniform4fv(shu.uColor, [
+                this._pickingColor[0],
+                this._pickingColor[1],
+                this._pickingColor[2],
+                1.0
+            ]);
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._positionBuffer);
-            gl.vertexAttribPointer(sha.aVertexPosition, this._positionBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aVertexPosition,
+                this._positionBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
             gl.uniformMatrix4fv(shu.modelMatrix, false, this._mxModel._m);
 
             gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
-            gl.drawElements(r.handler.gl.TRIANGLES, this._indexBuffer.numItems, gl.UNSIGNED_SHORT, 0);
+            gl.drawElements(
+                r.handler.gl.TRIANGLES,
+                this._indexBuffer.numItems,
+                gl.UNSIGNED_SHORT,
+                0
+            );
         }
     }
 }

package/src/og/shapes/Icosphere.js

@@ -2,9 +2,9 @@
  * @module og/shape/BaseShape
  */
 
-'use strict';
+"use strict";
 
-import { BaseShape } from './BaseShape.js';
+import { BaseShape } from "./BaseShape.js";
 
 /**
  * @class
@@ -45,7 +45,11 @@ class Icosphere extends BaseShape {
     // add vertex to mesh, fix position to be on unit sphere, return index
     _addVertex(p) {
         var length = Math.sqrt(p[0] * p[0] + p[1] * p[1] + p[2] * p[2]);
-        this._positionData.push(this._size * p[0] / length, this._size * p[1] / length, this._size * p[2] / length);
+        this._positionData.push(
+            (this._size * p[0]) / length,
+            (this._size * p[1]) / length,
+            (this._size * p[2]) / length
+        );
         return this._index++;
     }
 
@@ -63,9 +67,21 @@ class Icosphere extends BaseShape {
             return ret;
         }
 
-        var point1 = [this._positionData[p1 * 3], this._positionData[p1 * 3 + 1], this._positionData[p1 * 3 + 2]];
-        var point2 = [this._positionData[p2 * 3], this._positionData[p2 * 3 + 1], this._positionData[p2 * 3 + 2]];
-        var middle = [(point1[0] + point2[0]) / 2.0, (point1[1] + point2[1]) / 2.0, (point1[2] + point2[2]) / 2.0];
+        var point1 = [
+            this._positionData[p1 * 3],
+            this._positionData[p1 * 3 + 1],
+            this._positionData[p1 * 3 + 2]
+        ];
+        var point2 = [
+            this._positionData[p2 * 3],
+            this._positionData[p2 * 3 + 1],
+            this._positionData[p2 * 3 + 2]
+        ];
+        var middle = [
+            (point1[0] + point2[0]) / 2.0,
+            (point1[1] + point2[1]) / 2.0,
+            (point1[2] + point2[2]) / 2.0
+        ];
 
         // add vertex makes sure point is on unit sphere
         var i = this._addVertex(middle);
@@ -79,7 +95,6 @@ class Icosphere extends BaseShape {
      * @virtual
      */
     _createData() {
-
         this._positionData = [];
         this._indexData = [];
         this._index = 0;
@@ -113,7 +128,7 @@ class Icosphere extends BaseShape {
         faces.push([0, 7, 10]);
         faces.push([0, 10, 11]);
 
-        // 5 adjacent faces 
+        // 5 adjacent faces
         faces.push([1, 5, 9]);
         faces.push([5, 11, 4]);
         faces.push([11, 10, 2]);
@@ -127,7 +142,7 @@ class Icosphere extends BaseShape {
         faces.push([3, 6, 8]);
         faces.push([3, 8, 9]);
 
-        // 5 adjacent faces 
+        // 5 adjacent faces
         faces.push([4, 9, 5]);
         faces.push([2, 4, 11]);
         faces.push([6, 2, 10]);
@@ -161,4 +176,4 @@ class Icosphere extends BaseShape {
     }
 }
 
-export { Icosphere };
+export { Icosphere };

package/src/og/shapes/Sphere.js

@@ -2,9 +2,9 @@
  * @module og/shape/BaseShape
  */
 
-'use strict';
+"use strict";
 
-import { BaseShape } from './BaseShape.js';
+import { BaseShape } from "./BaseShape.js";
 
 /**
  * @class
@@ -21,11 +21,9 @@ import { BaseShape } from './BaseShape.js';
  * @param {number} [options.lonBands=16] - Number of longitude bands.
  */
 class Sphere extends BaseShape {
-
     constructor(options) {
-
         super(options);
-        
+
         /**
          * Sphere radius.
          * @protected
@@ -57,20 +55,19 @@ class Sphere extends BaseShape {
      * @virtual
      */
     _createData() {
-
         for (let latNumber = 0; latNumber <= this._latBands; latNumber++) {
-            var theta = latNumber * Math.PI / this._latBands;
+            var theta = (latNumber * Math.PI) / this._latBands;
             var sinTheta = Math.sin(theta);
             var cosTheta = Math.cos(theta);
 
             for (let longNumber = 0; longNumber <= this._lonBands; longNumber++) {
-                var phi = longNumber * 2 * Math.PI / this._lonBands;
+                var phi = (longNumber * 2 * Math.PI) / this._lonBands;
                 var sinPhi = Math.sin(phi);
                 var cosPhi = Math.cos(phi);
                 var x = cosPhi * sinTheta;
                 var y = cosTheta;
                 var z = sinPhi * sinTheta;
-                var u = 1 - (longNumber / this._lonBands);
+                var u = 1 - longNumber / this._lonBands;
                 var v = latNumber / this._latBands;
                 this._normalData.push(x);
                 this._normalData.push(y);
@@ -85,7 +82,7 @@ class Sphere extends BaseShape {
 
         for (let latNumber = 0; latNumber < this._latBands; latNumber++) {
             for (let longNumber = 0; longNumber < this._lonBands; longNumber++) {
-                var first = (latNumber * (this._lonBands + 1)) + longNumber;
+                var first = latNumber * (this._lonBands + 1) + longNumber;
                 var second = first + this._lonBands + 1;
 
                 this._indexData.push(first);
@@ -100,4 +97,4 @@ class Sphere extends BaseShape {
     }
 }
 
-export { Sphere };
+export { Sphere };

package/src/og/utils/FontAtlas.js

@@ -138,10 +138,14 @@ class FontAtlas {
 
         let img = new Image();
         img.onload = () => {
-            atlas.createTexture(img);
+            this._createTexture(atlas, img);
             def.resolve(index);
         };
         img.src = ARIAL_FONT_B64;
+    }
+
+    _createTexture(atlas, img) {
+        atlas.createTexture(img);
     }
 
     loadFont(faceName, srcDir, atlasUrl) {
@@ -183,7 +187,7 @@ class FontAtlas {
 
                 let img = new Image();
                 img.onload = () => {
-                    atlas.createTexture(img);
+                    this._createTexture(atlas, img);
                     def.resolve(index);
                 };
 

package/src/og/utils/GeoImageCreator.js

@@ -151,7 +151,11 @@ export class GeoImageCreator {
                 `precision highp float;
                         uniform sampler2D sourceTexture;
                         varying vec2 v_texCoords;
-                        void main () { 
+                        void main () {
+                            if(v_texCoords.x <= 0.001 || v_texCoords.x >= 0.999 ||
+                                v_texCoords.y <= 0.001 || v_texCoords.y >= 0.999) {
+                                discard;
+                            }
                             gl_FragColor = texture2D(sourceTexture, v_texCoords);
                         }`
         }));

package/src/og/utils/TextureAtlas.js

@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-import { ImageCanvas } from '../ImageCanvas.js';
-import { Rectangle } from '../Rectangle.js';
-import { ImagesCacheManager } from './ImagesCacheManager.js';
+import { ImageCanvas } from "../ImageCanvas.js";
+import { Rectangle } from "../Rectangle.js";
+import { ImagesCacheManager } from "./ImagesCacheManager.js";
 
 /**
- * Texture atlas stores images in one texture. Each image has its own 
+ * Texture atlas stores images in one texture. Each image has its own
  * atlas texture coordinates.
  * @class
  * @param {number} [width] - Texture atlas width, if it hasn't 1024 default.
@@ -13,7 +13,6 @@ import { ImagesCacheManager } from './ImagesCacheManager.js';
  */
 class TextureAtlas {
     constructor(width, height) {
-
         /**
          * Atlas nodes where input images store. It can be access by image.__nodeIndex.
          * @public
@@ -93,12 +92,11 @@ class TextureAtlas {
      * Adds image to the atlas and returns creted node with texture coordinates of the stored image.
      * @public
      * @param {Object} image - Input javascript image object.
-     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again 
+     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again
      * and store image in the curent atlas sheme.
      * @returns {utils.TextureAtlasNode} -
      */
     addImage(image, fastInsert) {
-
         if (!(image.width && image.height)) {
             return;
         }
@@ -145,11 +143,10 @@ class TextureAtlas {
     /**
      * Main atlas making function.
      * @private
-     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again 
+     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again
      * and store image in the curent atlas sheme.
      */
     _makeAtlas(fastInsert) {
-
         if (fastInsert && this._btree) {
             let im = this._images[this._images.length - 1];
             this._completeNode(this.nodes, this._btree.insert(im));
@@ -157,10 +154,15 @@ class TextureAtlas {
             let im = this._images.slice(0);
 
             im.sort(function (b, a) {
-                return ((a.atlasWidth || a.width) - (b.atlasWidth || b.width)) || ((a.atlasHeight || a.height) - (b.atlasHeight || b.height));
+                return (
+                    (a.atlasWidth || a.width) - (b.atlasWidth || b.width) ||
+                    (a.atlasHeight || a.height) - (b.atlasHeight || b.height)
+                );
             });
 
-            this._btree = new TextureAtlasNode(new Rectangle(0, 0, this.canvas.getWidth(), this.canvas.getHeight()));
+            this._btree = new TextureAtlasNode(
+                new Rectangle(0, 0, this.canvas.getWidth(), this.canvas.getHeight())
+            );
             this._btree.atlas = this;
 
             this.clearCanvas();
@@ -178,19 +180,19 @@ class TextureAtlas {
      * Creates atlas gl texture.
      * @public
      */
-    createTexture(img) {
+    createTexture(img, internalFormat) {
         if (this._handler) {
             this._handler.gl.deleteTexture(this.texture);
             if (img) {
                 this.canvas.resize(img.width, img.height);
                 this.canvas.drawImage(img, 0, 0, img.width, img.height);
             }
-            this.texture = this._handler.createTexture_l(this.canvas._canvas);
+            this.texture = this._handler.createTexture_l(this.canvas._canvas, internalFormat);
         }
     }
 
     /**
-     * Image handler callback. 
+     * Image handler callback.
      * @callback Object~successCallback
      * @param {Image} img - Loaded image.
      */
@@ -227,9 +229,7 @@ class TextureAtlasNode {
     }
 
     insert(img) {
-
         if (this.childNodes) {
-
             var newNode = this.childNodes[0].insert(img);
 
             if (newNode != null) {
@@ -237,9 +237,7 @@ class TextureAtlasNode {
             }
 
             return this.childNodes[1].insert(img);
-
         } else {
-
             if (this.image != null) {
                 return null;
             }
@@ -279,4 +277,4 @@ class TextureAtlasNode {
     }
 }
 
-export { TextureAtlas, TextureAtlasNode };
+export { TextureAtlas, TextureAtlasNode };

package/src/og/utils/VectorTileCreator.js

@@ -217,8 +217,6 @@ export class VectorTileCreator {
 
             // var prevLayerId = -1;
 
-            var extentParams = new Float32Array(4);
-
             var extentParamsHigh = new Float32Array(4);
             var extentParamsLow = new Float32Array(4);
 
@@ -245,7 +243,7 @@ export class VectorTileCreator {
 
                     f.bindOutputTexture(texture);
 
-                    gl.clearColor(1.0, 1.0, 1.0, 0.0);
+                    gl.clearColor(0.0, 0.0, 0.0, 0.0);
                     gl.clear(gl.COLOR_BUFFER_BIT);
 
                     var extent = material.segment.getExtentMerc();

package/src/og/utils/shared.js

@@ -752,7 +752,7 @@ export function concatTypedArrays(a, b) {
  * @param {TypedArray | Array} a
  * @param {TypedArray | Array} b
  */
-export function concatArrays(a, b) {
+export function concatArrays(a = [], b) {
     if (ArrayBuffer.isView(a)) {
         return concatTypedArrays(a, b);
     } else {
@@ -940,4 +940,4 @@ export function cloneArray(items) {
  */
 export function isUndef(obj) {
     return obj === void 0;
-}
+}