@openglobus/og 0.16.3 → 0.17.1

package/src/og/entity/LabelWorker.js

@@ -113,7 +113,7 @@ const _programm = `'use strict';
             _outlineColorArr = new Float32Array(maxLetters * 24),
             _pickingColorArr = new Float32Array(maxLetters * 18);
         
-        for (var i = 0; i < maxLetters; i++) {
+        for (let i = 0; i < maxLetters; i++) {
             if (isVisible !== 0) {
                 concatTypedArrays(_vertexArr, i, [0, 0, 0, -1, 1, -1, 1, -1, 1, 0, 0, 0]);
             } else {

package/src/og/entity/PointCloud.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/PointCloud
- */
-
 "use strict";
 
 import { Vec3 } from "../math/Vec3.js";
@@ -212,7 +208,7 @@ class PointCloud {
      */
     setPoints(points) {
         this.clear();
-        for (var i = 0; i < points.length; i++) {
+        for (let 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]);
@@ -475,7 +471,7 @@ class PointCloud {
 
     _setPickingColors() {
         if (this._renderNode) {
-            for (var i = 0; i < this._points.length; i++) {
+            for (let i = 0; i < this._points.length; i++) {
                 var p = this._points[i];
                 p._entity = this._entity;
                 p._entityCollection = this._entity._entityCollection;

package/src/og/entity/PointCloudHandler.js

@@ -1,126 +1,122 @@
-/**
- * @module og/entity/PointCloudHandler
- */
-
-"use strict";
-
-import * as shaders from "../shaders/pointCloud.js";
-
-class PointCloudHandler {
-    constructor(entityCollection) {
-        /**
-         * Picking rendering option.
-         * @public
-         * @type {boolean}
-         */
-        this.pickingEnabled = true;
-
-        /**
-         * Parent collection
-         * @private
-         * @type {EntityCollection}
-         */
-        this._entityCollection = entityCollection;
-
-        /**
-         * Renderer
-         * @private
-         * @type {Renderer}
-         */
-        this._renderer = null;
-
-        /**
-         * Point cloud array
-         * @private
-         * @type {Array.<PointCloud>}
-         */
-        this._pointClouds = [];
-
-        this.__staticId = PointCloudHandler._staticCounter++;
-    }
-
-    static get _staticCounter() {
-        if (!this._counter && this._counter !== 0) {
-            this._counter = 0;
-        }
-        return this._counter;
-    }
-
-    static set _staticCounter(n) {
-        this._counter = n;
-    }
-
-    _initProgram() {
-        if (this._renderer.handler) {
-            if (!this._renderer.handler.programs.pointCloud) {
-                this._renderer.handler.addProgram(shaders.pointCloud());
-            }
-        }
-    }
-
-    setRenderNode(renderNode) {
-        this._renderer = renderNode.renderer;
-        this._initProgram();
-        for (var i = 0; i < this._pointClouds.length; i++) {
-            this._pointClouds[i].setRenderNode(renderNode);
-        }
-    }
-
-    add(pointCloud) {
-        if (pointCloud._handlerIndex === -1) {
-            pointCloud._handler = this;
-            pointCloud._handlerIndex = this._pointClouds.length;
-            this._pointClouds.push(pointCloud);
-            this._entityCollection &&
-                this._entityCollection.renderNode &&
-                pointCloud.setRenderNode(this._entityCollection.renderNode);
-        }
-    }
-
-    remove(pointCloud) {
-        var index = pointCloud._handlerIndex;
-        if (index !== -1) {
-            pointCloud._deleteBuffers();
-            pointCloud._handlerIndex = -1;
-            pointCloud._handler = null;
-            this._pointClouds.splice(index, 1);
-            this.reindexPointCloudArray(index);
-        }
-    }
-
-    reindexPointCloudArray(startIndex) {
-        var pc = this._pointClouds;
-        for (var i = startIndex; i < pc.length; i++) {
-            pc[i]._handlerIndex = i;
-        }
-    }
-
-    draw() {
-        var i = this._pointClouds.length;
-        while (i--) {
-            this._pointClouds[i].draw();
-        }
-    }
-
-    drawPicking() {
-        if (this.pickingEnabled) {
-            var i = this._pointClouds.length;
-            while (i--) {
-                this._pointClouds[i].drawPicking();
-            }
-        }
-    }
-
-    clear() {
-        var i = this._pointClouds.length;
-        while (i--) {
-            this._pointClouds[i]._deleteBuffers();
-            this._pointClouds[i]._handler = null;
-            this._pointClouds[i]._handlerIndex = -1;
-        }
-        this._pointClouds.length = 0;
-        this._pointClouds = [];
-    }
-}
-
-export { PointCloudHandler };
+"use strict";
+
+import * as shaders from "../shaders/pointCloud.js";
+
+class PointCloudHandler {
+    constructor(entityCollection) {
+        /**
+         * Picking rendering option.
+         * @public
+         * @type {boolean}
+         */
+        this.pickingEnabled = true;
+
+        /**
+         * Parent collection
+         * @private
+         * @type {EntityCollection}
+         */
+        this._entityCollection = entityCollection;
+
+        /**
+         * Renderer
+         * @private
+         * @type {Renderer}
+         */
+        this._renderer = null;
+
+        /**
+         * Point cloud array
+         * @private
+         * @type {Array.<PointCloud>}
+         */
+        this._pointClouds = [];
+
+        this.__staticId = PointCloudHandler._staticCounter++;
+    }
+
+    static get _staticCounter() {
+        if (!this._counter && this._counter !== 0) {
+            this._counter = 0;
+        }
+        return this._counter;
+    }
+
+    static set _staticCounter(n) {
+        this._counter = n;
+    }
+
+    _initProgram() {
+        if (this._renderer.handler) {
+            if (!this._renderer.handler.programs.pointCloud) {
+                this._renderer.handler.addProgram(shaders.pointCloud());
+            }
+        }
+    }
+
+    setRenderNode(renderNode) {
+        this._renderer = renderNode.renderer;
+        this._initProgram();
+        for (let i = 0; i < this._pointClouds.length; i++) {
+            this._pointClouds[i].setRenderNode(renderNode);
+        }
+    }
+
+    add(pointCloud) {
+        if (pointCloud._handlerIndex === -1) {
+            pointCloud._handler = this;
+            pointCloud._handlerIndex = this._pointClouds.length;
+            this._pointClouds.push(pointCloud);
+            this._entityCollection &&
+                this._entityCollection.renderNode &&
+                pointCloud.setRenderNode(this._entityCollection.renderNode);
+        }
+    }
+
+    remove(pointCloud) {
+        var index = pointCloud._handlerIndex;
+        if (index !== -1) {
+            pointCloud._deleteBuffers();
+            pointCloud._handlerIndex = -1;
+            pointCloud._handler = null;
+            this._pointClouds.splice(index, 1);
+            this.reindexPointCloudArray(index);
+        }
+    }
+
+    reindexPointCloudArray(startIndex) {
+        var pc = this._pointClouds;
+        for (let i = startIndex; i < pc.length; i++) {
+            pc[i]._handlerIndex = i;
+        }
+    }
+
+    draw() {
+        var i = this._pointClouds.length;
+        while (i--) {
+            this._pointClouds[i].draw();
+        }
+    }
+
+    drawPicking() {
+        if (this.pickingEnabled) {
+            var i = this._pointClouds.length;
+            while (i--) {
+                this._pointClouds[i].drawPicking();
+            }
+        }
+    }
+
+    clear() {
+        var i = this._pointClouds.length;
+        while (i--) {
+            this._pointClouds[i]._deleteBuffers();
+            this._pointClouds[i]._handler = null;
+            this._pointClouds[i]._handlerIndex = -1;
+        }
+        this._pointClouds.length = 0;
+        this._pointClouds = [];
+    }
+}
+
+export { PointCloudHandler };

package/src/og/entity/Polyline.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/Polyline
- */
-
 "use strict";
 
 import { Extent } from "../Extent.js";
@@ -96,7 +92,7 @@ class Polyline {
         this._pathLengths = [];
 
         /**
-         * Polyline geodetic degrees coordiantes.
+         * Polyline geodetic degrees coordinates.
          * @private
          * @type {Array.<LonLat>}
          */
@@ -225,7 +221,7 @@ class Polyline {
             outIndexes.push(0, 0);
         }
 
-        for (var j = 0, len = path3v.length; j < len; j++) {
+        for (let j = 0, len = path3v.length; j < len; j++) {
             var path = path3v[j],
                 pathColors_j = pathColors[j];
 
@@ -747,7 +743,7 @@ class Polyline {
             outIndexes.push(0, 0);
         }
 
-        for (var j = 0, len = pathLonLat.length; j < len; j++) {
+        for (let j = 0, len = pathLonLat.length; j < len; j++) {
             var path = pathLonLat[j],
                 pathColors_j = pathColors[j];
 
@@ -1015,7 +1011,7 @@ class Polyline {
 
         var ellipsoid = this._renderNode.ellipsoid;
 
-        for (var j = 0; j < path3v.length; j++) {
+        for (let j = 0; j < path3v.length; j++) {
             var path = path3v[j];
 
             var last;
@@ -1056,7 +1052,7 @@ class Polyline {
             vh[k] = v_high.z;
             vl[k++] = v_low.z;
 
-            for (var i = 0; i < path.length; i++) {
+            for (let i = 0; i < path.length; i++) {
                 var cur = path[i],
                     pji = this._path3v[j][i];
 
@@ -1177,7 +1173,7 @@ class Polyline {
 
         var ellipsoid = this._renderNode.ellipsoid;
 
-        for (var j = 0; j < pathLonLat.length; j++) {
+        for (let j = 0; j < pathLonLat.length; j++) {
             var path = pathLonLat[j];
 
             var last;
@@ -1216,7 +1212,7 @@ class Polyline {
             vh[k] = v_high.z;
             vl[k++] = v_low.z;
 
-            for (var i = 0; i < path.length; i++) {
+            for (let i = 0; i < path.length; i++) {
                 var cur = path[i];
                 var cartesian = ellipsoid.lonLatToCartesian(cur);
                 c[j][i] = cartesian;
@@ -1316,9 +1312,9 @@ class Polyline {
             var extent = this._extent;
             extent.southWest.set(180.0, 90.0);
             extent.northEast.set(-180.0, -90.0);
-            for (var i = 0; i < l.length; i++) {
+            for (let i = 0; i < l.length; i++) {
                 var pi = l[i];
-                for (var j = 0; j < pi.length; j++) {
+                for (let j = 0; j < pi.length; j++) {
                     var lon = pi[j].lon,
                         lat = pi[j].lat;
                     if (lon > extent.northEast.lon) {
@@ -1363,7 +1359,7 @@ class Polyline {
                 k = 0,
                 kk = 0;
 
-            //for (var i = 0; i < segmentIndex; i++) {
+            //for (let i = 0; i < segmentIndex; i++) {
             //    kk += this._path3v[i].length * 12 + 24;
             //}
             kk = this._pathLengths[segmentIndex] * 12 + 24 * segmentIndex;
@@ -1432,7 +1428,7 @@ class Polyline {
                 extent.northEast.set(-180.0, -90.0);
                 for (let i = 0; i < l.length; i++) {
                     var pi = l[i];
-                    for (var j = 0; j < pi.length; j++) {
+                    for (let j = 0; j < pi.length; j++) {
                         var lon = pi[j].lon,
                             lat = pi[j].lat;
                         if (lon > extent.northEast.lon) {
@@ -1686,7 +1682,7 @@ class Polyline {
             let c = this._colors;
 
             //optimized with this._pathLengths
-            //for (var i = 0; i < segmentIndex; i++) {
+            //for (let i = 0; i < segmentIndex; i++) {
             //    kk += this._path3v[i].length * 16 + 32;
             //}
 
@@ -1763,7 +1759,9 @@ class Polyline {
                 this._createData3v([].concat(this._path3v));
             }
             this._refresh();
-            this._update();
+            if (renderNode.renderer.isInitialized()) {
+                this._update();
+            }
         }
     }
 

package/src/og/entity/PolylineHandler.js

@@ -1,109 +1,105 @@
-/**
- * @module og/entity/PolylineHandler
- */
-
-'use strict';
-
-import * as shaders from '../shaders/polyline.js';
-
-class PolylineHandler {
-    constructor(entityCollection) {
-
-        this._entityCollection = entityCollection;
-
-        this._renderer = null;
-
-        this._polylines = [];
-
-        this.__staticId = PolylineHandler._staticCounter++;
-
-        this.pickingEnabled = true;
-    }
-
-    static get _staticCounter() {
-        if (!this._counter && this._counter !== 0) {
-            this._counter = 0;
-        }
-        return this._counter;
-    }
-
-    static set _staticCounter(n) {
-        this._counter = n;
-    }
-
-    _initProgram() {
-        if (this._renderer.handler) {
-            if (!this._renderer.handler.programs.polyline_screen) {
-                this._renderer.handler.addProgram(shaders.polyline_screen());
-            }
-            if (!this._renderer.handler.programs.polyline_picking) {
-                this._renderer.handler.addProgram(shaders.polyline_picking());
-            }
-        }
-    }
-
-    setRenderNode(renderNode) {
-        this._renderer = renderNode.renderer;
-        this._initProgram();
-        for (var i = 0; i < this._polylines.length; i++) {
-            this._polylines[i].setRenderNode(renderNode);
-        }
-    }
-
-    add(polyline) {
-        if (polyline._handlerIndex === -1) {
-            polyline._handler = this;
-            polyline._handlerIndex = this._polylines.length;
-            this._polylines.push(polyline);
-            this._entityCollection && this._entityCollection.renderNode &&
-                polyline.setRenderNode(this._entityCollection.renderNode);
-        }
-    }
-
-    remove(polyline) {
-        var index = polyline._handlerIndex;
-        if (index !== -1) {
-            polyline._deleteBuffers();
-            polyline._handlerIndex = -1;
-            polyline._handler = null;
-            this._polylines.splice(index, 1);
-            this.reindexPolylineArray(index);
-        }
-    }
-
-    reindexPolylineArray(startIndex) {
-        var ls = this._polylines;
-        for (var i = startIndex; i < ls.length; i++) {
-            ls[i]._handlerIndex = i;
-        }
-    }
-
-    draw() {
-        let i = this._polylines.length;
-        while (i--) {
-            this._polylines[i].draw();
-        }
-    }
-
-    drawPicking() {
-        if (this.pickingEnabled) {
-            let i = this._polylines.length;
-            while (i--) {
-                this._polylines[i].drawPicking();
-            }
-        }
-    }
-
-    clear() {
-        var i = this._polylines.length;
-        while (i--) {
-            this._polylines[i]._deleteBuffers();
-            this._polylines[i]._handler = null;
-            this._polylines[i]._handlerIndex = -1;
-        }
-        this._polylines.length = 0;
-        this._polylines = [];
-    }
-}
-
+'use strict';
+
+import * as shaders from '../shaders/polyline.js';
+
+class PolylineHandler {
+    constructor(entityCollection) {
+
+        this._entityCollection = entityCollection;
+
+        this._renderer = null;
+
+        this._polylines = [];
+
+        this.__staticId = PolylineHandler._staticCounter++;
+
+        this.pickingEnabled = true;
+    }
+
+    static get _staticCounter() {
+        if (!this._counter && this._counter !== 0) {
+            this._counter = 0;
+        }
+        return this._counter;
+    }
+
+    static set _staticCounter(n) {
+        this._counter = n;
+    }
+
+    _initProgram() {
+        if (this._renderer.handler) {
+            if (!this._renderer.handler.programs.polyline_screen) {
+                this._renderer.handler.addProgram(shaders.polyline_screen());
+            }
+            if (!this._renderer.handler.programs.polyline_picking) {
+                this._renderer.handler.addProgram(shaders.polyline_picking());
+            }
+        }
+    }
+
+    setRenderNode(renderNode) {
+        this._renderer = renderNode.renderer;
+        this._initProgram();
+        for (let i = 0; i < this._polylines.length; i++) {
+            this._polylines[i].setRenderNode(renderNode);
+        }
+    }
+
+    add(polyline) {
+        if (polyline._handlerIndex === -1) {
+            polyline._handler = this;
+            polyline._handlerIndex = this._polylines.length;
+            this._polylines.push(polyline);
+            this._entityCollection && this._entityCollection.renderNode &&
+                polyline.setRenderNode(this._entityCollection.renderNode);
+        }
+    }
+
+    remove(polyline) {
+        var index = polyline._handlerIndex;
+        if (index !== -1) {
+            polyline._deleteBuffers();
+            polyline._handlerIndex = -1;
+            polyline._handler = null;
+            this._polylines.splice(index, 1);
+            this.reindexPolylineArray(index);
+        }
+    }
+
+    reindexPolylineArray(startIndex) {
+        var ls = this._polylines;
+        for (let i = startIndex; i < ls.length; i++) {
+            ls[i]._handlerIndex = i;
+        }
+    }
+
+    draw() {
+        let i = this._polylines.length;
+        while (i--) {
+            this._polylines[i].draw();
+        }
+    }
+
+    drawPicking() {
+        if (this.pickingEnabled) {
+            let i = this._polylines.length;
+            while (i--) {
+                this._polylines[i].drawPicking();
+            }
+        }
+    }
+
+    clear() {
+        var i = this._polylines.length;
+        while (i--) {
+            this._polylines[i]._deleteBuffers();
+            this._polylines[i]._handler = null;
+            this._polylines[i]._handlerIndex = -1;
+        }
+        this._polylines.length = 0;
+        this._polylines = [];
+    }
+}
+
 export { PolylineHandler };