@openglobus/og 0.11.6 → 0.12.1

package/src/og/entity/LabelWorker.js

@@ -2,6 +2,9 @@
 
 // import { QueueArray } from '../QueueArray.js';
 
+export const LOCK_UPDATE = -2;
+export const LOCK_FREE = -1;
+
 class LabelWorker {
     constructor(numWorkers = 4) {
         this._id = 0;
@@ -18,7 +21,7 @@ class LabelWorker {
 
                 let s = that._source[e.data.id];
 
-                if (s.label._lockId === -2) {
+                if (s.label._lockId === LOCK_UPDATE) {
                     that.make(s.handler, s.label);
                 } else {
                     s.handler.workerCallback(e.data, s.label);
@@ -46,14 +49,15 @@ class LabelWorker {
 
     make(handler, label) {
 
-        let source = { handler: handler, label: label };
+        if (handler._entityCollection) {
+            let source = { handler: handler, label: label };
 
-        if (this._freeWorkerQueue.length) {
-            var w = this._freeWorkerQueue.pop();
+            if (this._freeWorkerQueue.length) {
+                var w = this._freeWorkerQueue.pop();
 
-            this._source[this._id] = source;
+                this._source[this._id] = source;
 
-            let labelData = new Float32Array([
+                let labelData = new Float32Array([
                 /*0*/this._id++,
                 /*1*/handler._maxLetters,
                 /*2*/label.getVisibility() ? 1 : 0,
@@ -68,17 +72,18 @@ class LabelWorker {
                 /*22*/label._outline,
                 /*23, 24, 25, 26*/label._outlineColor.x, label._outlineColor.y, label._outlineColor.z, label._outlineColor.w,
                 /*27, 28, 29*/label._entity._pickingColor.x, label._entity._pickingColor.y, label._entity._pickingColor.z
-            ]);
+                ]);
 
-            label._lockId = this._id;
+                label._lockId = this._id;
 
-            w.postMessage({
-                labelData: labelData
-            }, [
-                labelData.buffer,
-            ]);
-        } else {
-            this._pendingQueue.push(source);
+                w.postMessage({
+                    labelData: labelData
+                }, [
+                    labelData.buffer,
+                ]);
+            } else {
+                this._pendingQueue.push(source);
+            }
         }
     }
 }
@@ -210,4 +215,4 @@ const _programm = `'use strict';
             ]);
     }`;
 
-export { LabelWorker };
+export { LabelWorker };

package/src/og/layer/CanvasTiles.js

@@ -35,7 +35,6 @@ const EVENT_NAMES = [
  * @param {String} [name="noname"] - Layer name.
  * @param {Object} options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
@@ -99,17 +98,14 @@ class CanvasTiles extends Layer {
      * @public
      * @param {boolean} visibility - Layer visibility.
      */
-    setVisibility(visibility) {
+    setVisibility(visibility) {
         if (visibility !== this._visibility) {
-            this._visibility = visibility;
-            if (this._isBaseLayer && visibility) {
-                this._planet.setBaseLayer(this);
-            } else if (!visibility) {
+            super.setVisibility(visibility);
+
+            if (!visibility) {
                 this.abortLoading();
             }
-            this._planet.updateVisibleLayers();
-            this.events.dispatch(this.events.visibilitychange, this);
-        }
+        }
     }
 
     /**
@@ -129,7 +125,7 @@ class CanvasTiles extends Layer {
             material.texture = seg.planet.transparentTexture;
         }
 
-        if (this._planet.layerLock.isFree()) {
+        if (this._planet.layerLock.isFree() || material.segment.tileZoom < 2) {
             material.isReady = false;
             material.isLoading = true;
             if (CanvasTiles.__requestsCounter >= CanvasTiles.MAX_REQUESTS && this._counter) {
@@ -241,12 +237,12 @@ class CanvasTiles extends Layer {
             var mId = this._id;
             var psegm = material;
             while (pn.parentNode) {
+                pn = pn.parentNode;
+                psegm = pn.segment.materials[mId];
                 if (psegm && psegm.isReady) {
                     notEmpty = true;
                     break;
                 }
-                pn = pn.parentNode;
-                psegm = pn.segment.materials[mId];
             }
 
             if (notEmpty) {

package/src/og/layer/GeoImage.js

@@ -141,14 +141,10 @@ class GeoImage extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 
@@ -189,14 +185,10 @@ class GeoImage extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 

package/src/og/layer/GeoTexture2d.js

@@ -67,14 +67,10 @@ class GeoTexture2d extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
         
@@ -117,14 +113,10 @@ class GeoTexture2d extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 

package/src/og/layer/GeoVideo.js

@@ -211,14 +211,10 @@ class GeoVideo extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 
@@ -265,14 +261,10 @@ class GeoVideo extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 

package/src/og/layer/Layer.js

@@ -11,7 +11,6 @@ import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
 import { Material } from "./Material.js";
 import { Vec3 } from "../math/Vec3.js";
-import { createTexture } from "../webgl/Handler.js";
 
 export const FADING_FACTOR = 0.29;
 
@@ -23,18 +22,14 @@ export const FADING_FACTOR = 0.29;
  * @param {String} [name="noname"] - Layer name.
  * @param {Object} [options] - Layer options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
  * @param {boolean} [options.isBaseLayer=false] - This is a base layer.
  * @param {boolean} [options.visibility=true] - Layer visibility.
+ * @param {boolean} [options.isSRGB=false] - Layer image webgl nternal format.
  * @param {Extent} [options.extent=[[-180.0, -90.0], [180.0, 90.0]]] - Visible extent.
- * @param {Vec3} [options.ambient=[0.1, 0.1, 0.21]] - Ambient RGB color.
- * @param {Vec3} [options.diffuse=[1.0, 1.0, 1.0]] - Diffuse RGB color.
- * @param {Vec3} [options.specular=[0.00025, 0.00015, 0.0001]] - Specular RGB color.
  * @param {string} [options.textureFilter="anisotropic"] - Image texture filter. Available values: "nearest", "linear", "mipmap" and "anisotropic".
- * @param {Number} [options.shininess=100] - Shininess.
  *
  * @fires og.Layer#visibilitychange
  * @fires og.Layer#add
@@ -86,13 +81,6 @@ class Layer {
          */
         this._opacity = options.opacity || 1.0;
 
-        /**
-         * Transparent RGB color mask.
-         * @public
-         * @type {Array.<number>} - (exactly 3 entries)
-         */
-        this.transparentColor = options.transparentColor || [-1, -1, -1];
-
         /**
          * Minimal zoom level when layer is visibile.
          * @public
@@ -107,16 +95,6 @@ class Layer {
          */
         this.maxZoom = options.maxZoom || 50;
 
-        /**
-         * Layer light material parameters.
-         * @public
-         * @type {Object}
-         */
-        this.ambient = utils.createColorRGB(options.ambient, new Vec3(0.1, 0.1, 0.21));
-        this.diffuse = utils.createColorRGB(options.diffuse, new Vec3(0.5, 0.5, 0.35));
-        this.specular = utils.createColorRGB(options.specular, new Vec3(0.0003, 0.00012, 0.00001));
-        this.shininess = options.shininess || 20.0;
-
         /**
          * Planet node.
          * @protected
@@ -185,13 +163,13 @@ class Layer {
          */
         this._extent = null;
 
-        if (options.textureFilter) {
-            this.createTexture =
-                createTexture[options.textureFilter.trim().toUpperCase()] ||
-                createTexture.ANISOTROPIC;
-        } else {
-            this.createTexture = createTexture.ANISOTROPIC;
-        }
+        this.createTexture = null;
+
+        this._textureFilter = options.textureFilter ? options.textureFilter.trim().toUpperCase() : "MIPMAP";
+
+        this._isSRGB = options.isSRGB != undefined ? options.isSRGB : false;
+
+        this._internalFormat = null;
 
         /**
          * Visible mercator extent.
@@ -333,7 +311,16 @@ class Layer {
      * @virtual
      * @param {Planet} planet - Planet render node.
      */
-    _assignPlanet(planet) {
+    _assignPlanet(planet) {
+        // TODO: webgl1
+        if (this._isSRGB) {
+            this._internalFormat = planet.renderer.handler.gl.SRGB8_ALPHA8;
+        } else {
+            this._internalFormat = planet.renderer.handler.gl.RGBA8;
+        }
+
+        this.createTexture = planet.renderer.handler.createTexture[this._textureFilter];
+
         planet.layers.push(this);
         this._planet = planet;
         this.events.on("visibilitychange", planet._onLayerVisibilityChanged, planet);
@@ -396,7 +383,11 @@ class Layer {
      * @virtual
      */
     clear() {
-        this._planet && this._planet._clearLayerMaterial(this);
+        if (this._planet) {
+            this._planet._clearLayerMaterial(this);
+            this._internalFormat = null;
+            this.createTexture = null;
+        }
     }
 
     /**

package/src/og/layer/Material.js

@@ -44,7 +44,7 @@ class Material {
     }
 
     _createTexture(img) {
-        return this.layer.createTexture(this.segment.handler, img);
+        return this.layer.createTexture(img, this.layer._internalFormat);
     }
 
     /**

package/src/og/layer/WMS.js

@@ -17,7 +17,6 @@ import { XYZ } from "./XYZ.js";
  * @param {string} name - Layer name.
  * @param {Object} options - Options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
@@ -36,7 +35,6 @@ import { XYZ } from "./XYZ.js";
  *     opacity: 0.5,
  *     zIndex: 50,
  *     attribution: 'USA states - geoserver WMS example',
- *     transparentColor: [1.0, 1.0, 1.0],
  *     version: "1.1.1",
  *     visibility: false }
  * );

package/src/og/layer/XYZ.js

@@ -17,7 +17,6 @@ import { RENDERING } from "../quadTree/quadTree.js";
  * @param {string} name - Layer name.
  * @param {Object} options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {Array.<string>} [options.subdomains=['a','b','c']] - Subdomains of the tile service.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
@@ -51,8 +50,6 @@ class XYZ extends Layer {
 
         this.events.registerNames(EVENT_NAMES);
 
-        this.transparentColor = options.transparentColor || [-1, -1, -1];
-
         /**
          * Tile url source template.
          * @public
@@ -103,8 +100,10 @@ class XYZ extends Layer {
      * Abort loading tiles.
      * @public
      */
-    abortLoading() {
-        this._planet._tileLoader.abort();
+    abortLoading() {
+        if (this._planet) {
+            this._planet._tileLoader.abort();
+        }
     }
 
     /**
@@ -152,8 +151,9 @@ class XYZ extends Layer {
         } else {
             material.texture = seg.planet.transparentTexture;
         }
-
-        if (this._planet.layerLock.isFree()) {
+
+        // Q: Maybe we should change "<2" to material.segment.tileZoom < (material.layer.minZoom + 1)
+        if (this._planet.layerLock.isFree() || material.segment.tileZoom < 2) {
             material.isReady = false;
             material.isLoading = true;
 
@@ -238,9 +238,6 @@ class XYZ extends Layer {
         if (material.isReady) {
             return material.texOffset;
         } else {
-            // if (material.loadingAttempts > 20) {
-            //     debugger;
-            // }
 
             let segment = material.segment,
                 pn = segment.node,
@@ -249,34 +246,35 @@ class XYZ extends Layer {
             let mId = this._id;
             let psegm = material;
             while (pn.parentNode) {
+                pn = pn.parentNode;
+                psegm = pn.segment.materials[mId];
                 if (psegm && psegm.textureExists) {
                     notEmpty = true;
                     break;
                 }
-                pn = pn.parentNode;
-                psegm = pn.segment.materials[mId];
             }
-
-            let maxNativeZoom = material.layer.maxNativeZoom;
-
-            if (pn.segment.tileZoom === maxNativeZoom) {
-                material.textureNotExists();
-            } else if (material.segment.tileZoom <= maxNativeZoom) {
-                !material.isLoading && !material.isReady && this.loadMaterial(material);
-            } else {
-                let pn = segment.node;
-                while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
-                    pn = pn.parentNode;
-                }
-                let pnm = pn.segment.materials[material.layer._id];
-                if (pnm) {
-                    !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
+
+            if (segment.passReady) {
+                let maxNativeZoom = material.layer.maxNativeZoom;
+                if (pn.segment.tileZoom === maxNativeZoom) {
+                    material.textureNotExists();
+                } else if (material.segment.tileZoom <= maxNativeZoom) {
+                    !material.isLoading && !material.isReady && this.loadMaterial(material);
                 } else {
-                    pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
-                        pn.segment
-                    );
-                    this.loadMaterial(pnm, true);
-                }
+                    let pn = segment.node;
+                    while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
+                        pn = pn.parentNode;
+                    }
+                    let pnm = pn.segment.materials[material.layer._id];
+                    if (pnm) {
+                        !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
+                    } else {
+                        pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
+                            pn.segment
+                        );
+                        this.loadMaterial(pnm, true);
+                    }
+                }
             }
 
             if (notEmpty) {
@@ -314,7 +312,7 @@ class XYZ extends Layer {
 
         material.isReady = false;
         material.textureExists = false;
-        material.isLoading = false;
+        material.isLoading = false;        
     }
 
     /**

package/src/og/math/Vec3.js

@@ -699,8 +699,24 @@ export class Vec3 {
      * @param {Vec3} point3 - Distant point.
      * @returns {number} -
      */
-    distance(point3) {
-        return Vec3.sub(this, point3).length();
+    distance(point3) {
+        let dx = this.x - point3.x,
+            dy = this.y - point3.y,
+            dz = this.z - point3.z;
+        return Math.sqrt(dx * dx + dy * dy + dz * dz);
+    }
+
+    /**
+     * Gets square distance to point.
+     * @public
+     * @param {Vec3} point3 - Distant point.
+     * @returns {number} -
+     */
+    distance2(point3) {
+        let dx = this.x - point3.x,
+            dy = this.y - point3.y,
+            dz = this.z - point3.z;
+        return dx * dx + dy * dy + dz * dz;
     }
 
     /**