@openglobus/og 0.11.1 → 0.11.6

package/src/og/entity/PointCloud.js

@@ -2,10 +2,10 @@
  * @module og/entity/PointCloud
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from '../math/Vec3.js';
-import { Vec4 } from '../math/Vec4.js';
+import { Vec3 } from "../math/Vec3.js";
+import { Vec4 } from "../math/Vec4.js";
 
 const COORDINATES_BUFFER = 0;
 const COLOR_BUFFER = 1;
@@ -15,7 +15,7 @@ const PICKING_COLOR_BUFFER = 2;
  * PointCloud object.
  * @class
  * @param {*} [options] - Point cloud options:
- * @param {Array.<Array.<number,number,number,number,number,number,number,*>>} [options.points] - Points cartesian coordinates array, 
+ * @param {Array.<Array.<number>>} [options.points] - Points cartesian coordinates array,
  * where first three is cartesian coordinates, next fourth is a RGBA color, and last is an point properties.
  * @param {number} [options.pointSize] - Point screen size in pixels.
  * @param {number} [options.pickingDistance] - Point border picking size in screen pixels.
@@ -33,7 +33,6 @@ const PICKING_COLOR_BUFFER = 2;
  */
 class PointCloud {
     constructor(options) {
-
         options = options || {};
 
         /**
@@ -49,7 +48,7 @@ class PointCloud {
          * @public
          * @type {boolean}
          */
-        this.visibility = (options.visibility != undefined ? options.visibility : true);
+        this.visibility = options.visibility != undefined ? options.visibility : true;
 
         /**
          * Point screen size in pixels.
@@ -68,14 +67,14 @@ class PointCloud {
         /**
          * Parent collection render node.
          * @private
-         * @type {og.scene.RenderNode}
+         * @type {RenderNode}
          */
         this._renderNode = null;
 
         /**
          * Entity instance that holds this point cloud.
          * @private
-         * @type {og.Entity}
+         * @type {Entity}
          */
         this._entity = null;
 
@@ -114,7 +113,7 @@ class PointCloud {
         /**
          * Handler that stores and renders this object.
          * @private
-         * @type {og.PointCloudHandler}
+         * @type {PointCloudHandler}
          */
         this._handler = null;
         this._handlerIndex = -1;
@@ -145,7 +144,6 @@ class PointCloud {
      * @public
      */
     clear() {
-
         this._points.length = 0;
         this._points = [];
 
@@ -189,7 +187,7 @@ class PointCloud {
     /**
      * Assign rendering scene node.
      * @public
-     * @param {og.scene.RenderNode}  renderNode - Assigned render node.
+     * @param {RenderNode}  renderNode - Assigned render node.
      */
     setRenderNode(renderNode) {
         this._renderNode = renderNode;
@@ -208,7 +206,7 @@ class PointCloud {
     /**
      * Adds points to render.
      * @public
-     * @param {Array.<Array<number,number,number,number,number,number,number,*>>} points - Point cloud array.
+     * @param {Array.<Array<number>>} points - Point cloud array.
      * @example
      * var points = [[0, 0, 0, 255, 255, 255, 255, { 'name': 'White point' }], [100, 100, 0, 255, 0, 0, 255, { 'name': 'Red point' }]];
      */
@@ -217,7 +215,7 @@ class PointCloud {
         for (var i = 0; i < points.length; i++) {
             var pi = points[i];
             var pos = new Vec3(pi[0], pi[1], pi[2]),
-                col = new Vec4(pi[3], pi[4], pi[5], (pi[6] == undefined ? 255.0 : pi[6]));
+                col = new Vec4(pi[3], pi[4], pi[5], pi[6] == undefined ? 255.0 : pi[6]);
             this._coordinatesData.push(pos.x, pos.y, pos.z);
             this._colorData.push(col.x / 255.0, col.y / 255.0, col.z / 255.0, col.w / 255.0);
             var p = {
@@ -233,7 +231,12 @@ class PointCloud {
 
             if (this._renderNode) {
                 this._renderNode.renderer.assignPickingColor(p);
-                this._pickingColorData.push(p._pickingColor.x / 255.0, p._pickingColor.y / 255.0, p._pickingColor.z / 255.0, 1.0);
+                this._pickingColorData.push(
+                    p._pickingColor.x / 255.0,
+                    p._pickingColor.y / 255.0,
+                    p._pickingColor.z / 255.0,
+                    1.0
+                );
             }
         }
 
@@ -243,21 +246,18 @@ class PointCloud {
     }
 
     setPointPosition(index, x, y, z) {
-
         // TODO: ...
 
         this._changedBuffers[COORDINATES_BUFFER] = true;
     }
 
     setPointColor(index, r, g, b, a) {
-
         // TODO: ...
 
         this._changedBuffers[COLOR_BUFFER] = true;
     }
 
     addPoints(points) {
-
         // TODO: ...
 
         this._changedBuffers[COORDINATES_BUFFER] = true;
@@ -266,7 +266,6 @@ class PointCloud {
     }
 
     addPoint(index, point) {
-
         // TODO: ...
 
         this._changedBuffers[COORDINATES_BUFFER] = true;
@@ -285,7 +284,6 @@ class PointCloud {
     }
 
     removePoint(index) {
-
         // TODO: ...
 
         this._changedBuffers[COORDINATES_BUFFER] = true;
@@ -294,7 +292,6 @@ class PointCloud {
     }
 
     insertPoint(index, point) {
-
         // TODO: ...
 
         this._changedBuffers[COORDINATES_BUFFER] = true;
@@ -316,7 +313,6 @@ class PointCloud {
 
     draw() {
         if (this.visibility && this._coordinatesData.length) {
-
             this._update();
 
             var rn = this._renderNode;
@@ -327,18 +323,32 @@ class PointCloud {
                 sha = p.attributes,
                 shu = p.uniforms;
 
-            gl.polygonOffset(this._handler._entityCollection.polygonOffsetFactor, this._handler._entityCollection.polygonOffsetUnits);
+            gl.polygonOffset(
+                this._handler._entityCollection.polygonOffsetFactor,
+                this._handler._entityCollection.polygonOffsetUnits
+            );
 
             sh.activate();
 
-            gl.uniformMatrix4fv(shu.projectionViewMatrix, false, r.activeCamera._projectionViewMatrix._m);
+            gl.uniformMatrix4fv(
+                shu.projectionViewMatrix,
+                false,
+                r.activeCamera._projectionViewMatrix._m
+            );
 
             gl.uniform1f(shu.opacity, this._handler._entityCollection._fadingOpacity);
 
             gl.uniform1f(shu.pointSize, this.pointSize);
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._coordinatesBuffer);
-            gl.vertexAttribPointer(sha.coordinates, this._coordinatesBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.coordinates,
+                this._coordinatesBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._colorBuffer);
             gl.vertexAttribPointer(sha.colors, this._colorBuffer.itemSize, gl.FLOAT, false, 0, 0);
@@ -359,19 +369,40 @@ class PointCloud {
 
             sh.activate();
 
-            gl.polygonOffset(this._handler._entityCollection.polygonOffsetFactor, this._handler._entityCollection.polygonOffsetUnits);
+            gl.polygonOffset(
+                this._handler._entityCollection.polygonOffsetFactor,
+                this._handler._entityCollection.polygonOffsetUnits
+            );
 
-            gl.uniformMatrix4fv(shu.projectionViewMatrix, false, r.activeCamera._projectionViewMatrix._m);
+            gl.uniformMatrix4fv(
+                shu.projectionViewMatrix,
+                false,
+                r.activeCamera._projectionViewMatrix._m
+            );
 
             gl.uniform1f(shu.opacity, this._handler._entityCollection._fadingOpacity);
 
             gl.uniform1f(shu.pointSize, this.pointSize + this.pickingDistance);
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._coordinatesBuffer);
-            gl.vertexAttribPointer(sha.coordinates, this._coordinatesBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.coordinates,
+                this._coordinatesBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
 
             gl.bindBuffer(gl.ARRAY_BUFFER, this._pickingColorBuffer);
-            gl.vertexAttribPointer(sha.colors, this._pickingColorBuffer.itemSize, gl.FLOAT, false, 0, 0);
+            gl.vertexAttribPointer(
+                sha.colors,
+                this._pickingColorBuffer.itemSize,
+                gl.FLOAT,
+                false,
+                0,
+                0
+            );
 
             gl.drawArrays(gl.POINTS, 0, this._coordinatesBuffer.numItems);
         }
@@ -415,19 +446,31 @@ class PointCloud {
     _createCoordinatesBuffer() {
         var h = this._renderNode.renderer.handler;
         h.gl.deleteBuffer(this._coordinatesBuffer);
-        this._coordinatesBuffer = h.createArrayBuffer(new Float32Array(this._coordinatesData), 3, (this._coordinatesData.length) / 3);
+        this._coordinatesBuffer = h.createArrayBuffer(
+            new Float32Array(this._coordinatesData),
+            3,
+            this._coordinatesData.length / 3
+        );
     }
 
     _createColorBuffer() {
         var h = this._renderNode.renderer.handler;
         h.gl.deleteBuffer(this._colorBuffer);
-        this._colorBuffer = h.createArrayBuffer(new Float32Array(this._colorData), 4, (this._colorData.length) / 4);
+        this._colorBuffer = h.createArrayBuffer(
+            new Float32Array(this._colorData),
+            4,
+            this._colorData.length / 4
+        );
     }
 
     _createPickingColorBuffer() {
         var h = this._renderNode.renderer.handler;
         h.gl.deleteBuffer(this._pickingColorBuffer);
-        this._pickingColorBuffer = h.createArrayBuffer(new Float32Array(this._pickingColorData), 4, (this._pickingColorData.length) / 4);
+        this._pickingColorBuffer = h.createArrayBuffer(
+            new Float32Array(this._pickingColorData),
+            4,
+            this._pickingColorData.length / 4
+        );
     }
 
     _setPickingColors() {
@@ -437,11 +480,16 @@ class PointCloud {
                 p._entity = this._entity;
                 p._entityCollection = this._entity._entityCollection;
                 this._renderNode.renderer.assignPickingColor(p);
-                this._pickingColorData.push(p._pickingColor.x / 255.0, p._pickingColor.y / 255.0, p._pickingColor.z / 255.0, 1.0);
+                this._pickingColorData.push(
+                    p._pickingColor.x / 255.0,
+                    p._pickingColor.y / 255.0,
+                    p._pickingColor.z / 255.0,
+                    1.0
+                );
             }
             this._changedBuffers[PICKING_COLOR_BUFFER] = true;
         }
     }
 }
 
-export { PointCloud };
+export { PointCloud };

package/src/og/entity/PointCloudHandler.js

@@ -2,13 +2,12 @@
  * @module og/entity/PointCloudHandler
  */
 
-'use strict';
+"use strict";
 
-import * as shaders from '../shaders/pointCloud.js';
+import * as shaders from "../shaders/pointCloud.js";
 
 class PointCloudHandler {
     constructor(entityCollection) {
-
         /**
          * Picking rendering option.
          * @public
@@ -19,21 +18,21 @@ class PointCloudHandler {
         /**
          * 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.PointCloud>}
+         * @type {Array.<PointCloud>}
          */
         this._pointClouds = [];
 
@@ -72,7 +71,8 @@ class PointCloudHandler {
             pointCloud._handler = this;
             pointCloud._handlerIndex = this._pointClouds.length;
             this._pointClouds.push(pointCloud);
-            this._entityCollection && this._entityCollection.renderNode &&
+            this._entityCollection &&
+                this._entityCollection.renderNode &&
                 pointCloud.setRenderNode(this._entityCollection.renderNode);
         }
     }
@@ -121,6 +121,6 @@ class PointCloudHandler {
         this._pointClouds.length = 0;
         this._pointClouds = [];
     }
-};
+}
 
-export { PointCloudHandler };
+export { PointCloudHandler };

package/src/og/entity/Polyline.js

@@ -32,13 +32,13 @@ const A = 3;
  * @param {Object} [options] - Polyline options:
  * @param {number} [options.thickness] - Thickness in screen pixels 1.5 is default.
  * @param {Number} [options.altitude] - Relative to ground layers altitude value.
- * @param {og.Vec4} [options.color] - RGBA color.
+ * @param {Vec4} [options.color] - RGBA color.
  * @param {Boolean} [options.opacity] - Line opacity.
  * @param {Boolean} [options.visibility] - Polyline visibility. True default.
  * @param {Boolean} [options.isClosed] - Closed geometry type identificator.
- * @param {Array.<Array.<number,number,number>>} [options.pathLonLat] - Polyline geodetic coordinates array.
- * @param {Array.<Array.<number,number,number>>} [options.path3v] - LinesString cartesian coordinates array. [[0,0,0], [1,1,1],...]
- * @param {Array.<Array.<number,number,number, number>>} [options.pathColors] - Coordinates color. [[1,0,0,1], [0,1,0,1],...] for right and green colors.
+ * @param {Array.<Array.<number>>} [options.pathLonLat] - Polyline geodetic coordinates array. [[0,0,0], [1,1,1],...]
+ * @param {Array.<Array.<number>>} [options.path3v] - LinesString cartesian coordinates array. [[0,0,0], [1,1,1],...]
+ * @param {Array.<Array.<number>>} [options.pathColors] - Coordinates color. [[1,0,0,1], [0,1,0,1],...] for right and green colors.
  */
 class Polyline {
     constructor(options) {
@@ -64,7 +64,7 @@ class Polyline {
         /**
          * Polyline RGBA color.
          * @public
-         * @type {Array<Number,Number,Number,Number>}
+         * @type {Array<number>} - (exactly 4 entries)
          */
         this._defaultColor = htmlColorToFloat32Array(
             options.color || DEFAULT_COLOR,
@@ -88,7 +88,7 @@ class Polyline {
         /**
          * Polyline cartesian coordinates.
          * @private
-         * @type {Array.<og.Vec3>}
+         * @type {Array.<Vec3>}
          */
         this._path3v = [];
 
@@ -97,14 +97,14 @@ class Polyline {
         /**
          * Polyline geodetic degrees coordiantes.
          * @private
-         * @type {Array.<og.LonLat>}
+         * @type {Array.<LonLat>}
          */
         this._pathLonLat = [];
 
         /**
          * Polyline geodetic mercator coordinates.
          * @private
-         * @type {Array.<og.LonLat>}
+         * @type {Array.<LonLat>}
          */
         this._pathLonLatMerc = [];
 
@@ -113,7 +113,7 @@ class Polyline {
         /**
          * Polyline geodetic extent.
          * @protected
-         * @type {og.Extent}
+         * @type {Extent}
          */
         this._extent = new Extent();
 
@@ -136,14 +136,14 @@ class Polyline {
         /**
          * Entity instance that holds this Polyline.
          * @private
-         * @type {og.Entity}
+         * @type {Entity}
          */
         this._entity = null;
 
         /**
          * Handler that stores and renders this Polyline object.
          * @private
-         * @type {og.PolylineHandler}
+         * @type {PolylineHandler}
          */
         this._handler = null;
         this._handlerIndex = -1;
@@ -178,16 +178,16 @@ class Polyline {
 
     /**
      * Appends to the line array new cartesian coordinates line data.
-     * @param {Array.<Array.<number, number, number>>} path3v - Line coordinates path array.
+     * @param {Array.<Array.<number>>} path3v - Line coordinates path array. [[0,0,0], [1,1,1],...]
      * @param {Boolean} isClosed - Identificator for the closed line data creation.
      * @param {Number[]} outVertices - Out vertices data array.
      * @param {Number[]} outOrders - Out vertices orders data array.
      * @param {Number[]} outIndexes - Out vertices indexes data array.
-     * @param {og.Ellipsoid} [ellipsoid] - Ellipsoid to coordinates transformation.
-     * @param {Array.<Array.<og.LonLat>>} [outTransformedPathLonLat] - Geodetic coordinates out array.
-     * @param {Array.<Array.<og.LonLat>>} [outPath3v] - Cartesian coordinates out array.
-     * @param {Array.<Array.<og.LonLat>>} [outTransformedPathMerc] - Mercator coordinates out array.
-     * @param {og.Extent} [outExtent] - Geodetic line extent.
+     * @param {Ellipsoid} [ellipsoid] - Ellipsoid to coordinates transformation.
+     * @param {Array.<Array.<LonLat>>} [outTransformedPathLonLat] - Geodetic coordinates out array.
+     * @param {Array.<Array.<LonLat>>} [outPath3v] - Cartesian coordinates out array.
+     * @param {Array.<Array.<LonLat>>} [outTransformedPathMerc] - Mercator coordinates out array.
+     * @param {Extent} [outExtent] - Geodetic line extent.
      * @param {Array} [outColors]
      * @static
      */
@@ -449,16 +449,16 @@ class Polyline {
 
     /**
      * Appends to the line new cartesian coordinates point data.
-     * @param {Array.<Array.<number, number, number>>} path3v - Line coordinates path array.
+     * @param {Array.<Array.<number>>} path3v - Line coordinates path array. [[0,0,0], [1,1,1],...]
      * @param {Boolean} isClosed - Identificator for the closed line data creation.
      * @param {Number[]} outVertices - Out vertices data array.
      * @param {Number[]} outOrders - Out vertices orders data array.
      * @param {Number[]} outIndexes - Out vertices indexes data array.
-     * @param {og.Ellipsoid} [ellipsoid] - Ellipsoid to coordinates transformation.
-     * @param {Array.<Array.<og.LonLat>>} [outTransformedPathLonLat] - Geodetic coordinates out array.
-     * @param {Array.<Array.<og.LonLat>>} [outPath3v] - Cartesian coordinates out array.
-     * @param {Array.<Array.<og.LonLat>>} [outTransformedPathMerc] - Mercator coordinates out array.
-     * @param {og.Extent} [outExtent] - Geodetic line extent.
+     * @param {Ellipsoid} [ellipsoid] - Ellipsoid to coordinates transformation.
+     * @param {Array.<Array.<LonLat>>} [outTransformedPathLonLat] - Geodetic coordinates out array.
+     * @param {Array.<Array.<LonLat>>} [outPath3v] - Cartesian coordinates out array.
+     * @param {Array.<Array.<LonLat>>} [outTransformedPathMerc] - Mercator coordinates out array.
+     * @param {Extent} [outExtent] - Geodetic line extent.
      * @static
      */
     static appendPoint3v(
@@ -701,16 +701,16 @@ class Polyline {
 
     /**
      * Appends to the line array new geodetic coordinates line data.
-     * @param {Array.<Array.<number, number, number>>} pathLonLat - Line geodetic coordinates path array.
+     * @param {Array.<Array.<number>>} pathLonLat - Line geodetic coordinates path array. [[0,0,0], [1,1,1],...]
      * @param {Boolean} isClosed - Identificator for the closed line data creation.
      * @param {Number[]} outVertices - Out vertices data array.
      * @param {Number[]} outOrders - Out vertices orders data array.
      * @param {Number[]} outIndexes - Out indexes data array.
-     * @param {og.Ellipsoid} ellipsoid - Ellipsoid to coordinates transformation.
-     * @param {Array.<Array.<Number, Number, Number>>} outTransformedPathCartesian - Cartesian coordinates out array.
-     * @param {Array.<Array.<og.LonLat>>} outPathLonLat - Geographic coordinates out array.
-     * @param {Array.<Array.<og.LonLat>>} outTransformedPathMerc - Mercator coordinates out array.
-     * @param {og.Extent} outExtent - Geodetic line extent.
+     * @param {Ellipsoid} ellipsoid - Ellipsoid to coordinates transformation.
+     * @param {Array.<Array.<number>>} outTransformedPathCartesian - Cartesian coordinates out array. [[0,0,0], [1,1,1],...]
+     * @param {Array.<Array.<LonLat>>} outPathLonLat - Geographic coordinates out array.
+     * @param {Array.<Array.<LonLat>>} outTransformedPathMerc - Mercator coordinates out array.
+     * @param {Extent} outExtent - Geodetic line extent.
      * @static
      */
     static appendLineDataLonLat(
@@ -1157,7 +1157,7 @@ class Polyline {
     /**
      * Sets polyline with geodetic coordinates.
      * @protected
-     * @param {og.LonLat[]} pathLonLat - Geodetic polyline path coordinates.
+     * @param {LonLat[]} pathLonLat - Geodetic polyline path coordinates.
      */
     _setEqualPathLonLat(pathLonLat) {
         var extent = this._extent;
@@ -1579,7 +1579,7 @@ class Polyline {
     /**
      * Adds a new cartesian point in the end of the path in a last line segment.
      * @public
-     * @param {og.Vec3} point3v - New coordinate.
+     * @param {Vec3} point3v - New coordinate.
      */
     appendPoint3v(point3v, color, skipEllipsoid) {
         if (this._path3v.length === 0) {
@@ -1623,7 +1623,7 @@ class Polyline {
     /**
      * Adds a new cartesian point in the end of the path.
      * @public
-     * @param {og.Vec3} point3v - New coordinate.
+     * @param {Vec3} point3v - New coordinate.
      * @param {number} [multiLineIndex=0] - Path part index, first by default.
      */
     addPoint3v(point3v, multiLineIndex = 0) {
@@ -1640,7 +1640,7 @@ class Polyline {
     /**
      * Adds a new geodetic point in the end of the path.
      * @public
-     * @param {og.LonLat} lonLat - New coordinate.
+     * @param {LonLat} lonLat - New coordinate.
      * @param {number} [multiLineIndex=0] - Path part index, first by default.
      */
     addPointLonLat(lonLat, multiLineIndex = 0) {
@@ -1752,7 +1752,7 @@ class Polyline {
     /**
      * Assign with render node.
      * @public
-     * @param {og.scene.RenderNode} renderNode -
+     * @param {RenderNode} renderNode -
      */
     setRenderNode(renderNode) {
         if (renderNode) {
@@ -1870,7 +1870,7 @@ class Polyline {
     /**
      * Returns polyline geodetic extent.
      * @public
-     * @returns {og.Extent} - Geodetic extent
+     * @returns {Extent} - Geodetic extent
      */
     getExtent() {
         return this._extent.clone();
@@ -1878,7 +1878,7 @@ class Polyline {
 
     /**
      * Returns path cartesian coordinates.
-     * @return {Array.<og.Vec3>} Polyline path.
+     * @return {Array.<Vec3>} Polyline path.
      */
     getPath3v() {
         return this._path3v;
@@ -1886,7 +1886,7 @@ class Polyline {
 
     /**
      * Returns geodetic path coordinates.
-     * @return {Array.<og.LonLat>} Polyline path.
+     * @return {Array.<LonLat>} Polyline path.
      */
     getPathLonLat() {
         return this._pathLonLat;
@@ -1932,7 +1932,7 @@ class Polyline {
     /**
      * Sets geodetic coordinates.
      * @public
-     * @param {Array.<Array.<number,number,number>>} pathLonLat - Polyline path cartesian coordinates.
+     * @param {Array.<Array.<number>>} pathLonLat - Polyline path cartesian coordinates. (exactly 3 entries)
      * @param {Boolean} [forceEqual=false] - Makes assigning faster for size equal coordinates array.
      */
     setPathLonLat(pathLonLat, forceEqual) {
@@ -1955,7 +1955,7 @@ class Polyline {
     /**
      * Sets Polyline cartesian coordinates.
      * @public
-     * @param {Array.<Array.<number,number,number>>} path3v - Polyline path cartesian coordinates.
+     * @param {Array.<Array.<number>>} path3v - Polyline path cartesian coordinates. (exactly 3 entries)
      * @param {Boolean} [forceEqual=false] - Makes assigning faster for size equal coordinates array.
      */
     setPath3v(path3v, pathColors, forceEqual) {