@openglobus/og 0.11.1 → 0.11.6

package/src/og/layer/XYZ.js

@@ -2,22 +2,22 @@
  * @module og/layer/XYZ
  */
 
-'use strict';
+"use strict";
 
-import * as mercator from '../mercator.js';
-import { EPSG3857 } from '../proj/EPSG3857.js';
-import { Layer } from './Layer.js';
-import { stringTemplate } from '../utils/shared.js';
-import { RENDERING } from '../quadTree/quadTree.js';
+import * as mercator from "../mercator.js";
+import { EPSG3857 } from "../proj/EPSG3857.js";
+import { Layer } from "./Layer.js";
+import { stringTemplate } from "../utils/shared.js";
+import { RENDERING } from "../quadTree/quadTree.js";
 
 /**
  * Represents an imagery tiles source provider.
  * @class
- * @extends {og.Layer}
+ * @extends {Layer}
  * @param {string} name - Layer name.
  * @param {Object} options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number,number,number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color.
+ * @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.
@@ -28,7 +28,8 @@ import { RENDERING } from '../quadTree/quadTree.js';
  * @param {boolean} [options.visibility=true] - Layer visibility.
  * @param {string} [options.crossOrigin=true] - If true, all tiles will have their crossOrigin attribute set to ''.
  * @param {string} options.url - Tile url source template(see example below).
- * @param {og.layer.XYZ~_urlRewriteCallback} options.urlRewrite - Url rewrite function.
+ * @param {string} options.textureFilter - texture gl filter. NEAREST, LINEAR, MIPMAP, ANISOTROPHIC.
+ * @param {layer.XYZ~_urlRewriteCallback} options.urlRewrite - Url rewrite function.
  * @fires og.layer.XYZ#load
  * @fires og.layer.XYZ#loadend
  *
@@ -41,6 +42,10 @@ import { RENDERING } from '../quadTree/quadTree.js';
  * });
  */
 class XYZ extends Layer {
+    /**
+     * @param {string} name - Layer name.
+     * @param {*} options
+     */
     constructor(name, options) {
         super(name, options);
 
@@ -58,7 +63,7 @@ class XYZ extends Layer {
         /**
          * @protected
          */
-        this._s = options.subdomains || ['a', 'b', 'c'];
+        this._s = options.subdomains || ["a", "b", "c"];
 
         /**
          * Minimal native zoom level when tiles are available.
@@ -77,13 +82,13 @@ class XYZ extends Layer {
         /**
          * @protected
          */
-        this._crossOrigin = options.crossOrigin === undefined ? '' : options.crossOrigin;
+        this._crossOrigin = options.crossOrigin === undefined ? "" : options.crossOrigin;
 
         /**
          * Rewrites imagery tile url query.
          * @private
          * @callback og.layer.XYZ~_urlRewriteCallback
-         * @param {og.planetSegment.Segment} segment - Segment to load.
+         * @param {Segment} segment - Segment to load.
          * @param {string} url - Created url.
          * @returns {string} - Url query string.
          */
@@ -109,7 +114,6 @@ class XYZ extends Layer {
      */
     setVisibility(visibility) {
         if (visibility !== this._visibility) {
-
             super.setVisibility(visibility);
 
             if (!visibility) {
@@ -138,10 +142,9 @@ class XYZ extends Layer {
      * Start to load tile material.
      * @public
      * @virtual
-     * @param {og.planetSegment.Material} material - Loads current material.
+     * @param {Material} material - Loads current material.
      */
     loadMaterial(material, forceLoading) {
-
         let seg = material.segment;
 
         if (this._isBaseLayer) {
@@ -151,37 +154,39 @@ class XYZ extends Layer {
         }
 
         if (this._planet.layerLock.isFree()) {
-
             material.isReady = false;
             material.isLoading = true;
 
             if (this._checkSegment(seg)) {
-
                 material.loadingAttempts++;
 
-                this._planet._tileLoader.load({
-                    src: this._getHTTPRequestString(material.segment),
-                    type: 'imageBitmap',
-                    filter: () => (seg.initialized && seg.node.getState() === RENDERING) || forceLoading,
-                    options: {}
-                }, (response) => {
-                    if (response.status === "ready") {
-                        if (material.isLoading) {
-                            let e = this.events.load;
-                            if (e.handlers.length) {
-                                this.events.dispatch(e, material);
+                this._planet._tileLoader.load(
+                    {
+                        src: this._getHTTPRequestString(material.segment),
+                        type: "imageBitmap",
+                        filter: () =>
+                            (seg.initialized && seg.node.getState() === RENDERING) || forceLoading,
+                        options: {}
+                    },
+                    (response) => {
+                        if (response.status === "ready") {
+                            if (material.isLoading) {
+                                let e = this.events.load;
+                                if (e.handlers.length) {
+                                    this.events.dispatch(e, material);
+                                }
+                                material.applyImage(response.data);
+                                response.data = null;
+                            }
+                        } else if (response.status === "abort") {
+                            material.isLoading = false;
+                        } else if (response.status === "error") {
+                            if (material.isLoading) {
+                                material.textureNotExists();
                             }
-                            material.applyImage(response.data);
-                            response.data = null;
-                        }
-                    } else if (response.status === "abort") {
-                        material.isLoading = false;
-                    } else if (response.status === "error") {
-                        if (material.isLoading) {
-                            material.textureNotExists();
                         }
                     }
-                });
+                );
             } else {
                 material.textureNotExists();
             }
@@ -192,7 +197,7 @@ class XYZ extends Layer {
      * Creates query url.
      * @protected
      * @virtual
-     * @param {og.planetSegment.Segment} segment - Creates specific url for current segment.
+     * @param {Segment} segment - Creates specific url for current segment.
      * @returns {String} - Returns url string.
      */
     _createUrl(segment) {
@@ -211,28 +216,28 @@ class XYZ extends Layer {
     /**
      * Returns actual url query string.
      * @protected
-     * @param {og.planetSegment.Segment} segment - Segment that loads image data.
+     * @param {Segment} segment - Segment that loads image data.
      * @returns {string} - Url string.
      */
     _getHTTPRequestString(segment) {
-        return this._urlRewriteCallback ? this._urlRewriteCallback(segment, this.url) : this._createUrl(segment);
+        return this._urlRewriteCallback
+            ? this._urlRewriteCallback(segment, this.url)
+            : this._createUrl(segment);
     }
 
     /**
      * Sets url rewrite callback, used for custom url rewriting for every tile laoding.
      * @public
-     * @param {og.layer.XYZ~_urlRewriteCallback} ur - The callback that returns tile custom created url.
+     * @param {layer.XYZ~_urlRewriteCallback} ur - The callback that returns tile custom created url.
      */
     setUrlRewriteCallback(ur) {
         this._urlRewriteCallback = ur;
     }
 
     applyMaterial(material) {
-
         if (material.isReady) {
             return material.texOffset;
         } else {
-
             // if (material.loadingAttempts > 20) {
             //     debugger;
             // }
@@ -267,7 +272,9 @@ class XYZ extends Layer {
                 if (pnm) {
                     !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
                 } else {
-                    pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(pn.segment);
+                    pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
+                        pn.segment
+                    );
                     this.loadMaterial(pnm, true);
                 }
             }
@@ -300,7 +307,7 @@ class XYZ extends Layer {
             material.texture = null;
 
             if (material.image) {
-                material.image.src = '';
+                material.image.src = "";
                 material.image = null;
             }
         }
@@ -338,8 +345,8 @@ class XYZ extends Layer {
         if (e.northEast.lat <= mercator.MIN_LAT) {
             e.northEast.lat = mercator.MIN_LAT;
         }
-    };
-};
+    }
+}
 
 const EVENT_NAMES = [
     /**
@@ -355,4 +362,4 @@ const EVENT_NAMES = [
     "loadend"
 ];
 
-export { XYZ };
+export { XYZ };

package/src/og/light/LightSource.js

@@ -2,19 +2,19 @@
  * @module og/light/LightSource
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from '../math/Vec3.js';
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Represents basic light source.
  * @class
  * @param {string} [name] - Light source name.
  * @param {Object} [params] - Light parameters:
- * @param {og.Vec3} [params.position] - Light source position if it is a point light, otherwise it is a light direction vector.
- * @param {og.Vec3} [params.ambient]  - Ambient RGB color.
- * @param {og.Vec3} [params.diffuse]  - Diffuse RGB color.
- * @param {og.Vec3} [params.specular]  - Specular RGB color.
+ * @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 {
@@ -37,19 +37,19 @@ class LightSource {
          * @protected
          * @type {string}
          */
-        this._name = name || ("light_" + LightSource._staticCounter++);
+        this._name = name || "light_" + LightSource._staticCounter++;
 
         /**
          * Render node where light is shines.
          * @protected
-         * @type {og.scene.RenderNode}
+         * @type {RenderNode}
          */
         this._renderNode = null;
 
         /**
          * Light position.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._position = params.position || new Vec3();
 
@@ -63,21 +63,21 @@ class LightSource {
         /**
          * Ambient color.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._ambient = params.ambient || new Vec3();
 
         /**
          * Diffuse color.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._diffuse = params.diffuse || new Vec3(0.8, 0.8, 0.8);
 
         /**
          * Specular color.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._specular = params.specular || new Vec3(0.18, 0.18, 0.18);
 
@@ -105,7 +105,7 @@ class LightSource {
      * Creates clone of the current light object.
      * @todo: TODO
      * @public
-     * @returns {og.LightSource}
+     * @returns {LightSource}
      */
     clone() {
         // TODO
@@ -158,8 +158,8 @@ class LightSource {
     /**
      * Set light source position, or if it is a directional type sets light direction vector.
      * @public
-     * @param {og.Vec3} position - Light position or direction vector.
-     * @returns {og.LightSource}
+     * @param {Vec3} position - Light position or direction vector.
+     * @returns {LightSource}
      */
     setPosition3v(position) {
         this._position.x = position.x;
@@ -171,8 +171,8 @@ class LightSource {
     /**
      * Set light source position, or if it is a directional type sets light direction vector.
      * @public
-     * @param {og.Vec3} position - Light position or direction vector.
-     * @returns {og.LightSource}
+     * @param {Vec3} position - Light position or direction vector.
+     * @returns {LightSource}
      */
     setPosition(x, y, z) {
         this._position.x = x;
@@ -184,7 +184,7 @@ class LightSource {
     /**
      * Returns light source position, or if it is a directional type sets light direction vector.
      * @public
-     * @returns {og.Vec3} - Light source position/direction.
+     * @returns {Vec3} - Light source position/direction.
      */
     getPosition() {
         return this._position.clone();
@@ -193,8 +193,8 @@ class LightSource {
     /**
      * Set ambient color.
      * @public
-     * @param {og.Vec3} rgb - Ambient color.
-     * @returns {og.LightSource}
+     * @param {Vec3} rgb - Ambient color.
+     * @returns {LightSource}
      */
     setAmbient3v(rgb) {
         return this.setAmbient(rgb.x, rgb.y, rgb.z);
@@ -203,8 +203,8 @@ class LightSource {
     /**
      * Set diffuse color.
      * @public
-     * @param {og.Vec3} rgb - Diffuse color.
-     * @returns {og.LightSource}
+     * @param {Vec3} rgb - Diffuse color.
+     * @returns {LightSource}
      */
     setDiffuse3v(rgb) {
         return this.setDiffuse(rgb.x, rgb.y, rgb.z);
@@ -213,19 +213,19 @@ class LightSource {
     /**
      * Set specular color.
      * @public
-     * @param {og.Vec3} rgb - Specular color.
-     * @returns {og.LightSource}
+     * @param {Vec3} rgb - Specular color.
+     * @returns {LightSource}
      */
     setSpecular3v(rgb) {
         return this.setSpecular(rgb.x, rgb.y, rgb.z);
     }
 
     /**
- * Set ambient color.
- * @public
- * @param {og.Vec3} rgb - Ambient color.
- * @returns {og.LightSource}
- */
+     * Set ambient color.
+     * @public
+     * @param {Vec3} rgb - Ambient color.
+     * @returns {LightSource}
+     */
     setAmbient(r, g, b) {
         this._ambient.set(r, g, b);
         var rn = this._renderNode;
@@ -243,7 +243,7 @@ class LightSource {
     /**
      * Set diffuse color.
      * @public
-     * @returns {og.LightSource}
+     * @returns {LightSource}
      */
     setDiffuse(r, g, b) {
         this._diffuse.set(r, g, b);
@@ -262,7 +262,7 @@ class LightSource {
     /**
      * Set specular color.
      * @public
-     * @returns {og.LightSource}
+     * @returns {LightSource}
      */
     setSpecular(r, g, b) {
         this._specular.set(r, g, b);
@@ -281,7 +281,7 @@ class LightSource {
     /**
      * Set material shininess.
      * @public
-     * @returns {og.LightSource}
+     * @returns {LightSource}
      */
     setShininess(shininess) {
         this._shininess = shininess;
@@ -298,7 +298,7 @@ class LightSource {
     /**
      * Sets light to black.
      * @public
-     * @returns {og.LightSource}
+     * @returns {LightSource}
      */
     setBlack() {
         this._ambient.clear();
@@ -309,9 +309,16 @@ class LightSource {
         if (rn) {
             var 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._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;
             }
         }
         return this;
@@ -320,8 +327,8 @@ class LightSource {
     /**
      * Adds current light to the render node scene.
      * @public
-     * @param {og.scene.RenderNode} renderNode - Render node scene.
-     * @returns {og.LightSource}
+     * @param {RenderNode} renderNode - Render node scene.
+     * @returns {LightSource}
      */
     addTo(renderNode) {
         this._renderNode = renderNode;
@@ -351,6 +358,6 @@ class LightSource {
         }
         this._renderNode = null;
     }
-};
+}
 
-export { LightSource };
+export { LightSource };

package/src/og/math/Line2.js

@@ -6,27 +6,27 @@
 
 import { Vec2 } from './Vec2.js';
 
-const Line2 = function (a, b, c) {
-    this.a = a || 0;
-    this.b = b || 0;
-    this.c = c || 0;
-};
-
-Line2.get = function (p0, p1) {
-    return new Line2(p1.y - p0.y, p0.x - p1.x, p1.x * p0.y - p0.x * p1.y);
-};
-
-Line2.getParallel = function (l, p) {
-    return new Line2(l.a, l.b, -l.a * p.x - l.b * p.y);
-};
-
-Line2.getIntersection = function (L0, L1) {
-    var x = (L1.b * L0.c - L0.b * L1.c) / (L0.b * L1.a - L1.b * L0.a);
-    return new Vec2(x, -(L0.c + L0.a * x) / L0.b);
-};
-
-Line2.prototype.intersects = function (l) {
-    return Line2.getIntersection(this, l);
-};
-
-export { Line2 };
+export class Line2 {
+    constructor(a, b, c) {
+        this.a = a || 0;
+        this.b = b || 0;
+        this.c = c || 0;
+    }
+
+    static get(p0, p1) {
+        return new Line2(p1.y - p0.y, p0.x - p1.x, p1.x * p0.y - p0.x * p1.y);
+    }
+
+    static getParallel(l, p) {
+        return new Line2(l.a, l.b, -l.a * p.x - l.b * p.y);
+    }
+
+    static getIntersection(L0, L1) {
+        var x = (L1.b * L0.c - L0.b * L1.c) / (L0.b * L1.a - L1.b * L0.a);
+        return new Vec2(x, -(L0.c + L0.a * x) / L0.b);
+    }
+
+    intersects(l) {
+        return Line2.getIntersection(this, l);
+    }
+}