@openglobus/og 0.11.2 → 0.11.7

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>>} [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;
@@ -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);
         }
     }
@@ -123,4 +123,4 @@ class PointCloudHandler {
     }
 }
 
-export { PointCloudHandler };
+export { PointCloudHandler };

package/src/og/entity/Polyline.js

@@ -32,7 +32,7 @@ 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.
@@ -88,7 +88,7 @@ class Polyline {
         /**
          * Polyline cartesian coordinates.
          * @private
-         * @type {Array.<og.Vec3>}
+         * @type {Array.<Vec3>}
          */
         this._path3v = [];
 
@@ -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;
@@ -183,11 +183,11 @@ class Polyline {
      * @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 {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 {og.Extent} [outExtent] - Geodetic line extent.
+     * @param {Extent} [outExtent] - Geodetic line extent.
      * @param {Array} [outColors]
      * @static
      */
@@ -454,11 +454,11 @@ class Polyline {
      * @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 {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 {og.Extent} [outExtent] - Geodetic line extent.
+     * @param {Extent} [outExtent] - Geodetic line extent.
      * @static
      */
     static appendPoint3v(
@@ -706,11 +706,11 @@ class Polyline {
      * @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 {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 {og.Extent} outExtent - Geodetic line extent.
+     * @param {Extent} outExtent - Geodetic line extent.
      * @static
      */
     static appendLineDataLonLat(
@@ -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) {
@@ -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;

package/src/og/entity/Ray.js

@@ -2,21 +2,21 @@
  * @module og/entity/BaseBillboard
  */
 
-'use strict';
+"use strict";
 
-import * as utils from '../utils/shared.js';
-import { Vec3 } from '../math/Vec3.js';
-import { Entity } from './Entity.js';
-import { doubleToTwoFloats2 } from '../math/coder.js';
+import * as utils from "../utils/shared.js";
+import { Vec3 } from "../math/Vec3.js";
+import { Entity } from "./Entity.js";
+import { doubleToTwoFloats2 } from "../math/coder.js";
 
 /**
  * Ray class.
  * @class
  * @param {Object} [options] - Options:
- * @param {og.Vec3|Array.<number>} [options.startPosition] - Ray start point position.
- * @param {og.Vec3|Array.<number>} [options.endPosition] - Ray end point position.
- * @param {og.Vec3|Array.<number>} [options.startColor] - Ray start point color.
- * @param {og.Vec3|Array.<number>} [options.endColor] - Ray end point color.
+ * @param {Vec3|Array.<number>} [options.startPosition] - Ray start point position.
+ * @param {Vec3|Array.<number>} [options.endPosition] - Ray end point position.
+ * @param {Vec3|Array.<number>} [options.startColor] - Ray start point color.
+ * @param {Vec3|Array.<number>} [options.endColor] - Ray end point color.
  * @param {boolean} [options.visibility] - Visibility.
  */
 class Ray {
@@ -43,7 +43,11 @@ class Ray {
         this._startPosition = utils.createVector3(options.startPosition);
         this._startPositionHigh = new Vec3();
         this._startPositionLow = new Vec3();
-        Vec3.doubleToTwoFloats(this._startPosition, this._startPositionHigh, this._startPositionLow);
+        Vec3.doubleToTwoFloats(
+            this._startPosition,
+            this._startPositionHigh,
+            this._startPositionLow
+        );
 
         // RTE end position
         this._endPosition = utils.createVector3(options.endPosition);
@@ -65,14 +69,14 @@ class Ray {
         /**
          * Entity instance that holds this billboard.
          * @protected
-         * @type {og.Entity}
+         * @type {Entity}
          */
         this._entity = null;
 
         /**
          * Handler that stores and renders this billboard object.
          * @protected
-         * @type {og.BillboardHandler}
+         * @type {BillboardHandler}
          */
         this._handler = null;
 
@@ -95,21 +99,39 @@ class Ray {
         this._startPosition.x = x;
         this._startPosition.y = y;
         this._startPosition.z = z;
-        Vec3.doubleToTwoFloats(this._startPosition, this._startPositionHigh, this._startPositionLow);
-        this._handler && this._handler.setStartPositionArr(this._handlerIndex, this._startPositionHigh, this._startPositionLow);
+        Vec3.doubleToTwoFloats(
+            this._startPosition,
+            this._startPositionHigh,
+            this._startPositionLow
+        );
+        this._handler &&
+            this._handler.setStartPositionArr(
+                this._handlerIndex,
+                this._startPositionHigh,
+                this._startPositionLow
+            );
     }
 
     /**
      * Sets ray start position.
      * @public
-     * @param {og.Vec3} position - Cartesian coordinates.
+     * @param {Vec3} position - Cartesian coordinates.
      */
     setStartPosition3v(position) {
         this._startPosition.x = position.x;
         this._startPosition.y = position.y;
         this._startPosition.z = position.z;
-        Vec3.doubleToTwoFloats(this._startPosition, this._startPositionHigh, this._startPositionLow);
-        this._handler && this._handler.setStartPositionArr(this._handlerIndex, this._startPositionHigh, this._startPositionLow);
+        Vec3.doubleToTwoFloats(
+            this._startPosition,
+            this._startPositionHigh,
+            this._startPositionLow
+        );
+        this._handler &&
+            this._handler.setStartPositionArr(
+                this._handlerIndex,
+                this._startPositionHigh,
+                this._startPositionLow
+            );
     }
 
     /**
@@ -124,20 +146,30 @@ class Ray {
         this._endPosition.y = y;
         this._endPosition.z = z;
         Vec3.doubleToTwoFloats(this._endPosition, this._endPositionHigh, this._endPositionLow);
-        this._handler && this._handler.setEndPositionArr(this._handlerIndex, this._endPositionHigh, this._endPositionLow);
+        this._handler &&
+            this._handler.setEndPositionArr(
+                this._handlerIndex,
+                this._endPositionHigh,
+                this._endPositionLow
+            );
     }
 
     /**
      * Sets ray end position.
      * @public
-     * @param {og.Vec3} position - Cartesian coordinates.
+     * @param {Vec3} position - Cartesian coordinates.
      */
     setEndPosition3v(position) {
         this._endPosition.x = position.x;
         this._endPosition.y = position.y;
         this._endPosition.z = position.z;
         Vec3.doubleToTwoFloats(this._endPosition, this._endPositionHigh, this._endPositionLow);
-        this._handler && this._handler.setEndPositionArr(this._handlerIndex, this._endPositionHigh, this._endPositionLow);
+        this._handler &&
+            this._handler.setEndPositionArr(
+                this._handlerIndex,
+                this._endPositionHigh,
+                this._endPositionLow
+            );
     }
 
     setLength(length) {
@@ -165,11 +197,11 @@ class Ray {
             this._endColor.w = endColor.w;
         }
 
-        this._handler && this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
+        this._handler &&
+            this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
     }
 
     setColorsHTML(startColor, endColor) {
-
         if (startColor) {
             this._startColor = utils.htmlColorToRgba(startColor);
         }
@@ -178,13 +210,14 @@ class Ray {
             this._endColor = utils.htmlColorToRgba(endColor);
         }
 
-        this._handler && this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
+        this._handler &&
+            this._handler.setRgbaArr(this._handlerIndex, this._startColor, this._endColor);
     }
 
     /**
      * Returns ray start position.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     getStartPosition() {
         return this._startPosition;
@@ -193,7 +226,7 @@ class Ray {
     /**
      * Returns ray end position.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     getEndPosition() {
         return this._endPosition;
@@ -230,11 +263,11 @@ class Ray {
     /**
      * Sets billboard picking color.
      * @public
-     * @param {og.Vec3} color - Picking color.
+     * @param {Vec3} color - Picking color.
      */
     setPickingColor3v(color) {
         this._handler && this._handler.setPickingColorArr(this._handlerIndex, color);
     }
 }
 
-export { Ray };
+export { Ray };