@openglobus/og 0.11.2 → 0.11.7

package/src/og/entity/Strip.js

@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
-import * as utils from '../utils/shared.js';
-import { Vec3 } from '../math/Vec3.js';
-import { Line3 } from '../math/Line3.js';
+import * as utils from "../utils/shared.js";
+import { Vec3 } from "../math/Vec3.js";
+import { Line3 } from "../math/Line3.js";
 
 let _tempHigh = new Vec3(),
     _tempLow = new Vec3();
@@ -25,7 +25,6 @@ let _tempHigh = new Vec3(),
  */
 class Strip {
     constructor(options) {
-
         options = options || {};
 
         /**
@@ -41,7 +40,7 @@ class Strip {
          * @public
          * @type {boolean}
          */
-        this.visibility = (options.visibility != undefined ? options.visibility : true);
+        this.visibility = options.visibility != undefined ? options.visibility : true;
 
         this.color = new Float32Array([1.0, 1.0, 1.0, 0.5]);
 
@@ -57,14 +56,14 @@ class Strip {
         /**
          * Parent collection render node.
          * @private
-         * @type {og.scene.RenderNode}
+         * @type {RenderNode}
          */
         this._renderNode = null;
 
         /**
          * Entity instance that holds this strip.
          * @private
-         * @type {og.Entity}
+         * @type {Entity}
          */
         this._entity = null;
 
@@ -87,7 +86,7 @@ class Strip {
         /**
          * Handler that stores and renders this object.
          * @private
-         * @type {og.StripHandler}
+         * @type {StripHandler}
          */
         this._handler = null;
         this._handlerIndex = -1;
@@ -111,7 +110,7 @@ class Strip {
     /**
      * Assign picking color.
      * @protected
-     * @param {og.Vec3} color - Picking RGB color.
+     * @param {Vec3} color - Picking RGB color.
      */
     setPickingColor3v(color) {
         this._pickingColor[0] = color.x / 255.0;
@@ -125,7 +124,6 @@ class Strip {
      * @public
      */
     clear() {
-
         this._path.length = 0;
         this._path = [];
 
@@ -177,7 +175,7 @@ class Strip {
     /**
      * Assign rendering scene node.
      * @public
-     * @param {og.scene.RenderNode}  renderNode - Assigned render node.
+     * @param {RenderNode}  renderNode - Assigned render node.
      */
     setRenderNode(renderNode) {
         this._renderNode = renderNode;
@@ -219,11 +217,30 @@ class Strip {
             gl.uniform4fv(shu.uColor, this.color);
             gl.uniform1f(shu.uOpacity, this._entity._entityCollection._fadingOpacity);
             gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesHighBuffer);
-            gl.vertexAttribPointer(sha.aVertexPositionHigh, this._verticesHighBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aVertexPositionHigh,
+                this._verticesHighBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
             gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesLowBuffer);
-            gl.vertexAttribPointer(sha.aVertexPositionLow, this._verticesLowBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aVertexPositionLow,
+                this._verticesLowBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
             gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
-            gl.drawElements(r.handler.gl.TRIANGLE_STRIP, this._indexBuffer.numItems, gl.UNSIGNED_INT, 0);
+            gl.drawElements(
+                r.handler.gl.TRIANGLE_STRIP,
+                this._indexBuffer.numItems,
+                gl.UNSIGNED_INT,
+                0
+            );
             gl.enable(gl.CULL_FACE);
         }
     }
@@ -254,11 +271,30 @@ class Strip {
 
             gl.uniform4fv(shu.uColor, this._pickingColor);
             gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesHighBuffer);
-            gl.vertexAttribPointer(sha.aVertexPositionHigh, this._verticesHighBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aVertexPositionHigh,
+                this._verticesHighBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
             gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesLowBuffer);
-            gl.vertexAttribPointer(sha.aVertexPositionLow, this._verticesLowBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.aVertexPositionLow,
+                this._verticesLowBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
             gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexBuffer);
-            gl.drawElements(r.handler.gl.TRIANGLE_STRIP, this._indexBuffer.numItems, gl.UNSIGNED_INT, 0);
+            gl.drawElements(
+                r.handler.gl.TRIANGLE_STRIP,
+                this._indexBuffer.numItems,
+                gl.UNSIGNED_INT,
+                0
+            );
             gl.enable(gl.CULL_FACE);
         }
     }
@@ -289,9 +325,21 @@ class Strip {
             gl.deleteBuffer(this._verticesHighBuffer);
             gl.deleteBuffer(this._verticesLowBuffer);
 
-            this._verticesHighBuffer = this._renderNode.renderer.handler.createArrayBuffer(new Float32Array(this._verticesHigh), 3, this._verticesHigh.length / 3);
-            this._verticesLowBuffer = this._renderNode.renderer.handler.createArrayBuffer(new Float32Array(this._verticesLow), 3, this._verticesLow.length / 3);
-            this._indexBuffer = this._renderNode.renderer.handler.createElementArrayBuffer(new Uint32Array(this._indexes), 1, this._indexes.length);
+            this._verticesHighBuffer = this._renderNode.renderer.handler.createArrayBuffer(
+                new Float32Array(this._verticesHigh),
+                3,
+                this._verticesHigh.length / 3
+            );
+            this._verticesLowBuffer = this._renderNode.renderer.handler.createArrayBuffer(
+                new Float32Array(this._verticesLow),
+                3,
+                this._verticesLow.length / 3
+            );
+            this._indexBuffer = this._renderNode.renderer.handler.createElementArrayBuffer(
+                new Uint32Array(this._indexes),
+                1,
+                this._indexes.length
+            );
         }
     }
 
@@ -299,11 +347,8 @@ class Strip {
         let length = this._path.length;
 
         if (length === 0) {
-
             this._path.push([p2.clone(), p3.clone()]);
-
         } else {
-
             let p0 = this._path[length - 1][0],
                 p1 = this._path[length - 1][1];
 
@@ -323,19 +368,17 @@ class Strip {
             let d = Math.abs(p0.sub(p1).normal().dot(p2.sub(p0).normal()));
 
             for (let i = 0; i < gs1; i++) {
-
                 let di = i / gs;
                 let p02 = p0.lerp(p2, di),
                     p13 = p1.lerp(p3, di);
 
                 for (let j = 0; j < gs1; j++) {
-
                     let dj = j / gs;
                     let p01 = p0.lerp(p1, dj),
                         p23 = p2.lerp(p3, dj);
 
                     if (d !== 1.0) {
-                        (new Line3(p02, p13)).intersects(new Line3(p01, p23), p);
+                        new Line3(p02, p13).intersects(new Line3(p01, p23), p);
                     } else {
                         p = p23;
                     }
@@ -369,17 +412,15 @@ class Strip {
     }
 
     setEdge3v(p2, p3, index) {
-
         if (index === this._path.length) {
             this.addEdge3v(p2, p3);
             return;
-        } if (this._path[index]) {
-
+        }
+        if (this._path[index]) {
             this._path[index][0] = p2;
             this._path[index][1] = p3;
 
             if (this._path.length > 1) {
-
                 let gs = this._gridSize,
                     gs1 = gs + 1;
 
@@ -391,7 +432,6 @@ class Strip {
                     vLow = this._verticesLow;
 
                 if (index === this._path.length - 1) {
-
                     let p0 = this._path[index - 1][0],
                         p1 = this._path[index - 1][1];
 
@@ -401,19 +441,17 @@ class Strip {
                     let d = Math.abs(p0.sub(p1).normal().dot(p2.sub(p0).normal()));
 
                     for (let i = 0; i < gs1; i++) {
-
                         let di = i / gs;
                         let p02 = p0.lerp(p2, di),
                             p13 = p1.lerp(p3, di);
 
                         for (let j = 0; j < gs1; j++) {
-
                             let dj = j / gs;
                             let p01 = p0.lerp(p1, dj),
                                 p23 = p2.lerp(p3, dj);
 
                             if (d !== 1.0) {
-                                (new Line3(p02, p13)).intersects(new Line3(p01, p23), p);
+                                new Line3(p02, p13).intersects(new Line3(p01, p23), p);
                             } else {
                                 p = p23;
                             }
@@ -433,9 +471,7 @@ class Strip {
                             vLow[ind3 + 2] = _tempLow.z;
                         }
                     }
-
                 } else if (index === 0) {
-
                     let ind = 0;
 
                     let p0 = p2,
@@ -445,18 +481,16 @@ class Strip {
                     p3 = this._path[1][1];
 
                     for (let i = 0; i < gs1; i++) {
-
                         let di = i / gs;
                         let p02 = p0.lerp(p2, di),
                             p13 = p1.lerp(p3, di);
 
                         for (let j = 0; j < gs1; j++) {
-
                             let dj = j / gs;
                             let p01 = p0.lerp(p1, dj),
                                 p23 = p2.lerp(p3, dj);
 
-                            (new Line3(p02, p13)).intersects(new Line3(p01, p23), p);
+                            new Line3(p02, p13).intersects(new Line3(p01, p23), p);
 
                             ind = i * gs1 + j;
 
@@ -474,7 +508,6 @@ class Strip {
                         }
                     }
                 } else if (index > 0 && index < this._path.length) {
-
                     let p0 = this._path[index - 1][0],
                         p1 = this._path[index - 1][1];
 
@@ -486,7 +519,6 @@ class Strip {
                         ind = prev;
 
                     for (let i = 0; i < gs1; i++) {
-
                         let di = i / gs;
                         let p02 = p0.lerp(p2, di),
                             p35 = p3.lerp(p5, di),
@@ -494,13 +526,12 @@ class Strip {
                             p13 = p1.lerp(p3, di);
 
                         for (let j = 0; j < gs1; j++) {
-
                             let dj = j / gs;
                             let p01 = p0.lerp(p1, dj),
                                 p23 = p2.lerp(p3, dj);
 
                             // prev
-                            (new Line3(p02, p13)).intersects(new Line3(p01, p23), p);
+                            new Line3(p02, p13).intersects(new Line3(p01, p23), p);
 
                             let ij = i * gs1 + j;
 
@@ -523,7 +554,7 @@ class Strip {
 
                             p23 = p2.lerp(p3, dj);
 
-                            (new Line3(p24, p35)).intersects(new Line3(p23, p45), p);
+                            new Line3(p24, p35).intersects(new Line3(p23, p45), p);
 
                             ind = next + ij;
 
@@ -564,14 +595,12 @@ class Strip {
     }
 
     setPath(path) {
-
         this._verticesHigh = [];
         this._verticesLow = [];
         this._indexes = [];
         this._path = [];
 
         for (let i = 0; i < path.length; i++) {
-
             let p0 = path[i][0],
                 p1 = path[i][1];
 
@@ -598,4 +627,4 @@ class Strip {
     }
 }
 
-export { Strip };
+export { Strip };

package/src/og/entity/StripHandler.js

@@ -1,10 +1,9 @@
-'use strict';
+"use strict";
 
-import { Program } from '../webgl/Program.js';
+import { Program } from "../webgl/Program.js";
 
 class StripHandler {
     constructor(entityCollection) {
-
         /**
          * Picking rendering option.
          * @public
@@ -15,21 +14,21 @@ class StripHandler {
         /**
          * Parent collection
          * @private
-         * @type {og.EntityCollection}
+         * @type {EntityCollection}
          */
         this._entityCollection = entityCollection;
 
         /**
          * Renderer
          * @private
-         * @type {og.Renderer}
+         * @type {Renderer}
          */
         this._renderer = null;
 
         /**
          * Point cloud array
          * @private
-         * @type {Array.<og.Strip>}
+         * @type {Array.<Strip>}
          */
         this._strips = [];
 
@@ -50,21 +49,21 @@ class StripHandler {
     _initProgram() {
         if (this._renderer.handler) {
             !this._renderer.handler.programs.strip &&
-                this._renderer.handler.addProgram(new Program("strip", {
-                    uniforms: {
-                        projectionMatrix: { type: 'mat4' },
-                        viewMatrix: { type: 'mat4' },
-                        eyePositionHigh: "vec3",
-                        eyePositionLow: "vec3",
-                        uColor: { type: 'vec4' },
-                        uOpacity: { type: 'float' }
-                    },
-                    attributes: {
-                        aVertexPositionHigh: { type: 'vec3' },
-                        aVertexPositionLow: { type: 'vec3' }
-                    },
-                    vertexShader:
-                        `attribute vec3 aVertexPositionHigh;
+                this._renderer.handler.addProgram(
+                    new Program("strip", {
+                        uniforms: {
+                            projectionMatrix: { type: "mat4" },
+                            viewMatrix: { type: "mat4" },
+                            eyePositionHigh: "vec3",
+                            eyePositionLow: "vec3",
+                            uColor: { type: "vec4" },
+                            uOpacity: { type: "float" }
+                        },
+                        attributes: {
+                            aVertexPositionHigh: { type: "vec3" },
+                            aVertexPositionLow: { type: "vec3" }
+                        },
+                        vertexShader: `attribute vec3 aVertexPositionHigh;
                         attribute vec3 aVertexPositionLow;
                         uniform mat4 projectionMatrix;
                         uniform mat4 viewMatrix;
@@ -80,14 +79,14 @@ class StripHandler {
 
                             gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
                         }`,
-                    fragmentShader:
-                        `precision highp float;
+                        fragmentShader: `precision highp float;
                         uniform vec4 uColor;
                         uniform float uOpacity;
                         void main(void) {
                             gl_FragColor = vec4(uColor.rgb, uColor.a * uOpacity);
                         }`
-                }));
+                    })
+                );
         }
     }
 
@@ -104,7 +103,8 @@ class StripHandler {
             strip._handler = this;
             strip._handlerIndex = this._strips.length;
             this._strips.push(strip);
-            this._entityCollection && this._entityCollection.renderNode &&
+            this._entityCollection &&
+                this._entityCollection.renderNode &&
                 strip.setRenderNode(this._entityCollection.renderNode);
         }
     }
@@ -155,4 +155,4 @@ class StripHandler {
     }
 }
 
-export { StripHandler };
+export { StripHandler };

package/src/og/entity/index.js

@@ -1,17 +1,9 @@
-import { Entity } from './Entity';
-import { EntityCollection } from './EntityCollection';
-import { Billboard } from './Billboard';
-import { Geometry } from './Geometry';
-import { Label } from './Label';
-import { PointCloud } from './PointCloud';
-import { Polyline } from './Polyline';
+import { Entity } from "./Entity.js";
+import { EntityCollection } from "./EntityCollection.js";
+import { Billboard } from "./Billboard.js";
+import { Geometry } from "./Geometry.js";
+import { Label } from "./Label.js";
+import { PointCloud } from "./PointCloud.js";
+import { Polyline } from "./Polyline.js";
 
-export {
-    Entity,
-    EntityCollection,
-    Billboard,
-    Geometry,
-    Label,
-    PointCloud,
-    Polyline
-};
+export { Entity, EntityCollection, Billboard, Geometry, Label, PointCloud, Polyline };

package/src/og/layer/BaseGeoImage.js

@@ -2,17 +2,17 @@
  * @module og/layer/BaseGeoImage
  */
 
-'use strict';
+"use strict";
 
-import * as mercator from '../mercator.js';
-import { Extent } from '../Extent.js';
-import { Layer } from './Layer.js';
-import { LonLat } from '../LonLat.js';
+import * as mercator from "../mercator.js";
+import { Extent } from "../Extent.js";
+import { Layer } from "./Layer.js";
+import { LonLat } from "../LonLat.js";
 
 /**
  * BaseGeoImage layer represents square imagery layer that could be an static image, or animated video or webgl buffer object displayed on the globe.
  * @class
- * @extends {og.Layer}
+ * @extends {Layer}
  */
 class BaseGeoImage extends Layer {
     constructor(name, options) {
@@ -58,8 +58,12 @@ class BaseGeoImage extends Layer {
      */
     getCornersLonLat() {
         var c = this._cornersWgs84;
-        return [new LonLat(c[0].lon, c[0].lat), new LonLat(c[1].lon, c[1].lat),
-        new LonLat(c[2].lon, c[2].lat), new LonLat(c[3].lon, c[3].lat)];
+        return [
+            new LonLat(c[0].lon, c[0].lat),
+            new LonLat(c[1].lon, c[1].lat),
+            new LonLat(c[2].lon, c[2].lat),
+            new LonLat(c[3].lon, c[3].lat)
+        ];
     }
 
     /**
@@ -69,7 +73,12 @@ class BaseGeoImage extends Layer {
      */
     getCorners() {
         var c = this._cornersWgs84;
-        return [[c[0].lon, c[0].lat], [c[1].lon, c[1].lat], [c[2].lon, c[2].lat], [c[3].lon, c[3].lat]];
+        return [
+            [c[0].lon, c[0].lat],
+            [c[1].lon, c[1].lat],
+            [c[2].lon, c[2].lat],
+            [c[3].lon, c[3].lat]
+        ];
     }
 
     /**
@@ -92,7 +101,12 @@ class BaseGeoImage extends Layer {
      */
     setCornersLonLat(corners) {
         this._refreshFrame = true;
-        this._cornersWgs84 = [corners[0].clone(), corners[1].clone(), corners[2].clone(), corners[3].clone()] || [0, 0, 0, 0];
+        this._cornersWgs84 = [
+            corners[0].clone(),
+            corners[1].clone(),
+            corners[2].clone(),
+            corners[3].clone()
+        ] || [0, 0, 0, 0];
 
         for (var i = 0; i < this._cornersWgs84.length; i++) {
             if (this._cornersWgs84[i].lat >= 89.9) {
@@ -105,8 +119,7 @@ class BaseGeoImage extends Layer {
         this._extent.setByCoordinates(this._cornersWgs84);
 
         var me = this._extent;
-        if (me.southWest.lat > mercator.MAX_LAT ||
-            me.northEast.lat < mercator.MIN_LAT) {
+        if (me.southWest.lat > mercator.MAX_LAT || me.northEast.lat < mercator.MIN_LAT) {
             this._projType = 0;
             this.rendering = this._renderingProjType0;
         } else {
@@ -126,15 +139,32 @@ class BaseGeoImage extends Layer {
     _createFrame() {
         this._extentWgs84 = this._extent.clone();
 
-        this._cornersMerc = [this._cornersWgs84[0].forwardMercatorEPS01(), this._cornersWgs84[1].forwardMercatorEPS01(),
-        this._cornersWgs84[2].forwardMercatorEPS01(), this._cornersWgs84[3].forwardMercatorEPS01()];
+        this._cornersMerc = [
+            this._cornersWgs84[0].forwardMercatorEPS01(),
+            this._cornersWgs84[1].forwardMercatorEPS01(),
+            this._cornersWgs84[2].forwardMercatorEPS01(),
+            this._cornersWgs84[3].forwardMercatorEPS01()
+        ];
 
-        this._extentMerc = new Extent(this._extentWgs84.southWest.forwardMercatorEPS01(), this._extentWgs84.northEast.forwardMercatorEPS01());
+        this._extentMerc = new Extent(
+            this._extentWgs84.southWest.forwardMercatorEPS01(),
+            this._extentWgs84.northEast.forwardMercatorEPS01()
+        );
 
         if (this._projType === 0) {
-            this._extentWgs84Params = [this._extentWgs84.southWest.lon, this._extentWgs84.southWest.lat, 2.0 / this._extentWgs84.getWidth(), 2.0 / this._extentWgs84.getHeight()];
+            this._extentWgs84Params = [
+                this._extentWgs84.southWest.lon,
+                this._extentWgs84.southWest.lat,
+                2.0 / this._extentWgs84.getWidth(),
+                2.0 / this._extentWgs84.getHeight()
+            ];
         } else {
-            this._extentMercParams = [this._extentMerc.southWest.lon, this._extentMerc.southWest.lat, 2.0 / this._extentMerc.getWidth(), 2.0 / this._extentMerc.getHeight()];
+            this._extentMercParams = [
+                this._extentMerc.southWest.lon,
+                this._extentMerc.southWest.lat,
+                2.0 / this._extentMerc.getWidth(),
+                2.0 / this._extentMerc.getHeight()
+            ];
         }
 
         // creates material frame textures
@@ -146,7 +176,10 @@ class BaseGeoImage extends Layer {
             gl.deleteTexture(this._materialTexture);
             this._materialTexture = h.createEmptyTexture_l(this._frameWidth, this._frameHeight);
 
-            this._gridBuffer = this._planet._geoImageCreator.createGridBuffer(this._cornersWgs84, this._projType);
+            this._gridBuffer = this._planet._geoImageCreator.createGridBuffer(
+                this._cornersWgs84,
+                this._projType
+            );
 
             this._refreshFrame = false;
         }
@@ -154,7 +187,7 @@ class BaseGeoImage extends Layer {
 
     /**
      * @virtual
-     * @param {og.planetSegment.Material} material - GeoImage material.
+     * @param {Material} material - GeoImage material.
      */
     abortMaterialLoading(material) {
         this._creationProceeding = false;
@@ -200,7 +233,6 @@ class BaseGeoImage extends Layer {
      */
     setVisibility(visibility) {
         if (visibility !== this._visibility) {
-
             super.setVisibility(visibility);
 
             // remove from creator
@@ -215,7 +247,7 @@ class BaseGeoImage extends Layer {
     /**
      * @virtual
      * @protected
-     * @param {og.planetSegment.Material} material - GeoImage material.
+     * @param {Material} material - GeoImage material.
      */
     clearMaterial(material) {
         material.image = null;
@@ -227,11 +259,10 @@ class BaseGeoImage extends Layer {
     /**
      * @virtual
      * @protected
-     * @param {og.planetSegment.Material} material - GeoImage material.
+     * @param {Material} material - GeoImage material.
      * @returns {Array<number> } -
      */
     applyMaterial(material) {
-
         var segment = material.segment;
 
         if (this._ready) {