@openglobus/og 0.17.0 → 0.17.1

package/src/og/quadTree/Node.js

@@ -76,16 +76,17 @@ class Node {
     createChildrenNodes() {
         this.ready = true;
 
-        var p = this.planet;
-        var ps = this.segment;
-        var ext = ps._extent;
-        var size_x = ext.getWidth() * 0.5;
-        var size_y = ext.getHeight() * 0.5;
-        var ne = ext.northEast, sw = ext.southWest;
-        var z = ps.tileZoom + 1;
-        var id = this.nodeId * 4 + 1;
-        var c = new LonLat(sw.lon + size_x, sw.lat + size_y);
-        var nd = this.nodes;
+        const p = this.planet;
+        const ps = this.segment;
+        const ext = ps._extent;
+        const z = ps.tileZoom + 1;
+        const size_x = ext.getWidth() * 0.5;
+        const size_y = ext.getHeight() * 0.5;
+        const ne = ext.northEast;
+        const sw = ext.southWest;
+        const id = this.nodeId * 4 + 1;
+        const c = new LonLat(sw.lon + size_x, sw.lat + size_y);
+        const nd = this.nodes;
 
         nd[NW] = new Node(this.SegmentPrototype, p, NW, this, id, z, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)));
         nd[NE] = new Node(this.SegmentPrototype, p, NE, this, id, z, new Extent(c, new LonLat(ne.lon, ne.lat)));
@@ -333,7 +334,7 @@ class Node {
 
         var nodes = this.planet._renderedNodes;
 
-        for (var i = nodes.length - 1; i >= 0; --i) {
+        for (let i = nodes.length - 1; i >= 0; --i) {
             var ni = nodes[i];
 
             var cs = this.getCommonSide(ni);
@@ -597,7 +598,7 @@ class Node {
                 tempVerticesHigh = new Float32Array(3 * _vertOrder.length);
                 tempVerticesLow = new Float32Array(3 * _vertOrder.length);
 
-                for (var i = 0; i < _vertOrder.length; i++) {
+                for (let i = 0; i < _vertOrder.length; i++) {
                     let vi_y = _vertOrder[i].y + t_i0, vi_x = _vertOrder[i].x + t_j0;
 
                     let vi_x_is = vi_x * gridSize, vi_y_is = vi_y * gridSize;
@@ -725,7 +726,7 @@ class Node {
         if (state === NOTRENDERING || state === RENDERING) {
             this.destroyBranches();
         } else {
-            for (var i = 0; i < this.nodes.length; i++) {
+            for (let i = 0; i < this.nodes.length; i++) {
                 this.nodes[i] && this.nodes[i].clearTree();
             }
         }
@@ -763,7 +764,7 @@ class Node {
     traverseTree(callback) {
         callback(this);
         if (this.ready) {
-            for (var i = 0; i < this.nodes.length; i++) {
+            for (let i = 0; i < this.nodes.length; i++) {
                 this.nodes[i].traverseTree(callback);
             }
         }

package/src/og/renderer/Renderer.js

@@ -265,7 +265,7 @@ class Renderer {
     }
 
     removeDepthCallback(id) {
-        for (var i = 0; i < this._depthCallbacks.length; i++) {
+        for (let i = 0; i < this._depthCallbacks.length; i++) {
             if (id === this._depthCallbacks[i].id) {
                 this._depthCallbacks.splice(i, 1);
                 break;
@@ -282,7 +282,7 @@ class Renderer {
     }
 
     removeDistanceCallback(id) {
-        for (var i = 0; i < this._distanceCallbacks.length; i++) {
+        for (let i = 0; i < this._distanceCallbacks.length; i++) {
             if (id === this._distanceCallbacks[i].id) {
                 this._distanceCallbacks.splice(i, 1);
                 break;
@@ -310,7 +310,7 @@ class Renderer {
      * @param {Number} id - Handler id to remove.
      */
     removePickingCallback(id) {
-        for (var i = 0; i < this._pickingCallbacks.length; i++) {
+        for (let i = 0; i < this._pickingCallbacks.length; i++) {
             if (id === this._pickingCallbacks[i].id) {
                 this._pickingCallbacks.splice(i, 1);
                 break;
@@ -414,7 +414,7 @@ class Renderer {
      * @param {Array.<control.Control>} cArr - Control array.
      */
     addControls(cArr) {
-        for (var i = 0; i < cArr.length; i++) {
+        for (let i = 0; i < cArr.length; i++) {
             cArr[i].addTo(this);
         }
     }
@@ -676,7 +676,7 @@ class Renderer {
      * @param {Array.<scene.RenderNode>} nodesArr - Render nodes array.
      */
     addNodes(nodesArr) {
-        for (var i = 0; i < nodesArr.length; i++) {
+        for (let i = 0; i < nodesArr.length; i++) {
             this.addNode(nodesArr[i]);
         }
     }

package/src/og/scene/BaseNode.js

@@ -74,7 +74,7 @@ class BaseNode {
      * @public
      */
     destroy() {
-        for (var i = 0; i < this.childNodes.length; i++) {
+        for (let i = 0; i < this.childNodes.length; i++) {
             this.childNodes[i].destroy();
         }
         this._clear();

package/src/og/scene/Planet.js

@@ -206,9 +206,9 @@ export class Planet extends RenderNode {
          */
         this.camera = new PlanetCamera(this, {
             frustums: this._cameraFrustums,
-            eye: new Vec3(0, 0, 28000000),
-            look: new Vec3(0, 0, 0),
-            up: new Vec3(0, 1, 0),
+            eye: new Vec3(25000000, 0, 0),
+            look: Vec3.ZERO,
+            up: Vec3.NORTH,
             minAltitude: this._minAltitude,
             maxAltitude: this._maxAltitude
         });
@@ -438,13 +438,8 @@ export class Planet extends RenderNode {
         this._atmosphereMaxMinOpacity = new Float32Array([1.0, 0.41]);
     }
 
-    static getBearingNorthRotationQuat(cartesian) {
-        //
-        // TODO: fix normal for ellipsoid
-        //
-        let n = cartesian.normal();
-        let t = Vec3.proj_b_to_plane(Vec3.UNIT_Y, n);
-        return Quat.getLookRotation(t, n);
+    getNorthFrameRotation(cartesian) {
+        return this.ellipsoid.getNorthFrameRotation(cartesian);
     }
 
     set atmosphereMaxOpacity(opacity) {
@@ -532,7 +527,7 @@ export class Planet extends RenderNode {
      * @param {Array.<control.Control>} cArr - Control array.
      */
     addControls(cArr) {
-        for (var i = 0; i < cArr.length; i++) {
+        for (let i = 0; i < cArr.length; i++) {
             this.addControl(cArr[i]);
         }
     }
@@ -773,15 +768,15 @@ export class Planet extends RenderNode {
 
         let kk = 0;
         // Initialization indexes buffers cache. It takes about 120mb RAM!
-        for (var i = 0; i <= TABLESIZE; i++) {
+        for (let i = 0; i <= TABLESIZE; i++) {
             !this._indexesCache[i] && (this._indexesCache[i] = new Array(TABLESIZE));
-            for (var j = 0; j <= TABLESIZE; j++) {
+            for (let j = 0; j <= TABLESIZE; j++) {
                 !this._indexesCache[i][j] && (this._indexesCache[i][j] = new Array(TABLESIZE));
-                for (var k = 0; k <= TABLESIZE; k++) {
+                for (let k = 0; k <= TABLESIZE; k++) {
                     !this._indexesCache[i][j][k] && (this._indexesCache[i][j][k] = new Array(TABLESIZE));
-                    for (var m = 0; m <= TABLESIZE; m++) {
+                    for (let m = 0; m <= TABLESIZE; m++) {
                         !this._indexesCache[i][j][k][m] && (this._indexesCache[i][j][k][m] = new Array(TABLESIZE));
-                        for (var q = 0; q <= TABLESIZE; q++) {
+                        for (let q = 0; q <= TABLESIZE; q++) {
                             let ptr = {
                                 buffer: null
                             };
@@ -1103,7 +1098,7 @@ export class Planet extends RenderNode {
             this._clearRenderNodesInFrustum();
             this._renderedNodes = [];
 
-            for (var i = 0, len = temp.length; i < len; i++) {
+            for (let i = 0, len = temp.length; i < len; i++) {
                 var ri = temp[i];
                 let ht = ri.segment.centerNormal.dot(cam._b);
                 if (ri.segment.tileZoom === this.maxCurrZoom || ht < HORIZON_TANGENT) {
@@ -1301,7 +1296,7 @@ export class Planet extends RenderNode {
 
         if (sl.length) {
             let sli = sl[0];
-            for (var i = sli.length - 1; i >= 0; --i) {
+            for (let i = sli.length - 1; i >= 0; --i) {
                 let li = sli[i];
                 if (li._fading && firstPass && li._refreshFadingOpacity()) {
                     sli.splice(i, 1);
@@ -1310,7 +1305,7 @@ export class Planet extends RenderNode {
         }
 
         let isEq = this.terrain.equalizeVertices;
-        i = rn.length;
+        var i = rn.length;
         while (i--) {
             let s = rn[i].segment;
             isEq && s.equalize();
@@ -1423,7 +1418,7 @@ export class Planet extends RenderNode {
 
         if (sl.length) {
             let sli = sl[0];
-            for (var i = sli.length - 1; i >= 0; --i) {
+            for (let i = sli.length - 1; i >= 0; --i) {
                 let li = sli[i];
                 if (li._fading && firstPass && li._refreshFadingOpacity()) {
                     sli.splice(i, 1);
@@ -1432,7 +1427,7 @@ export class Planet extends RenderNode {
         }
 
         let isEq = this.terrain.equalizeVertices;
-        i = rn.length;
+        var i = rn.length;
         while (i--) {
             let s = rn[i].segment;
             isEq && s.equalize();

package/src/og/scene/RenderNode.js

@@ -112,7 +112,7 @@ class RenderNode extends BaseNode {
                 delete r.renderNodes[n];
             }
 
-            for (var i = 0; i < r._renderNodesArr.length; i++) {
+            for (let i = 0; i < r._renderNodesArr.length; i++) {
                 if (r._renderNodesArr[i].isEqual(this)) {
                     r._renderNodesArr.splice(i, 1);
                     break;
@@ -224,7 +224,7 @@ class RenderNode extends BaseNode {
             }
         }
 
-        for (var i = 0; i < this.childNodes.length; i++) {
+        for (let i = 0; i < this.childNodes.length; i++) {
             this.childNodes[i].setActive(isActive);
         }
     }
@@ -236,7 +236,7 @@ class RenderNode extends BaseNode {
      */
     setDrawMode(mode) {
         this.drawMode = mode;
-        for (var i = 0; i < this.childNodes.length; i++) {
+        for (let i = 0; i < this.childNodes.length; i++) {
             this.childNodes[i].setDrawMode(mode);
         }
     }
@@ -247,7 +247,7 @@ class RenderNode extends BaseNode {
      */
     transformLights() {
         var r = this.renderer;
-        for (var i = 0; i < this._lights.length; i++) {
+        for (let i = 0; i < this._lights.length; i++) {
             var ii = i * 3;
             var tp;
             tp = this._lights[i]._position;
@@ -256,7 +256,7 @@ class RenderNode extends BaseNode {
             this._lightsPositions[ii + 2] = tp.z;
         }
 
-        // for (var i = 0; i < this._lights.length; i++) {
+        // for (let i = 0; i < this._lights.length; i++) {
         //     var ii = i * 4;
         //     var tp;
         //     if (this._lights[i].directional) {
@@ -273,13 +273,13 @@ class RenderNode extends BaseNode {
     }
 
     updateBillboardsTexCoords() {
-        for (var i = 0; i < this.entityCollections.length; i++) {
+        for (let i = 0; i < this.entityCollections.length; i++) {
             this.entityCollections[i].billboardHandler.refreshTexCoordsArr();
         }
     }
 
     updateGeoObjectsTexCoords() {
-        for (var i = 0; i < this.entityCollections.length; i++) {
+        for (let i = 0; i < this.entityCollections.length; i++) {
             this.entityCollections[i].geoObjectHandler.refreshTexCoordsArr();
         }
     }
@@ -296,7 +296,7 @@ class RenderNode extends BaseNode {
      * @private
      */
     _preDrawNodes() {
-        for (var i = 0; i < this.childNodes.length; i++) {
+        for (let i = 0; i < this.childNodes.length; i++) {
             if (this.childNodes[i]._isActive) {
                 this.childNodes[i]._preDrawNodes();
             }
@@ -313,7 +313,7 @@ class RenderNode extends BaseNode {
      * @private
      */
     _drawNodes() {
-        for (var i = 0; i < this.childNodes.length; i++) {
+        for (let i = 0; i < this.childNodes.length; i++) {
             if (this.childNodes[i]._isActive) {
                 this.childNodes[i]._drawNodes();
             }

package/src/og/segment/Segment.js

@@ -817,7 +817,7 @@ class Segment {
      */
     deleteMaterials() {
         var m = this.materials;
-        for (var i = 0; i < m.length; i++) {
+        for (let i = 0; i < m.length; i++) {
             var mi = m[i];
             if (mi) {
                 mi.clear();
@@ -1321,7 +1321,7 @@ class Segment {
             nmVertsLow = this.normalMapVerticesLow,
             nmNorms = this.normalMapNormals;
 
-        for (var k = 0; k < gsgs; k++) {
+        for (let k = 0; k < gsgs; k++) {
             var j = k % gs,
                 i = ~~(k / gs);
 

package/src/og/segment/SegmentLonLat.js

@@ -158,7 +158,7 @@ class SegmentLonLat extends Segment {
             nmVertsLow = this.normalMapVerticesLow,
             nmNorms = this.normalMapNormals;
 
-        for (var k = 0; k < gsgs; k++) {
+        for (let k = 0; k < gsgs; k++) {
             var j = k % gs,
                 i = ~~(k / gs);
 

package/src/og/segment/segmentHelper.js

@@ -21,8 +21,8 @@ function createCenterBodyIndexes(size) {
         j1 = 1;
 
     var ind1, ind2, nr;
-    for (var i = i0; i < size - 1 - i1; i++) {
-        for (var j = j0; j < size - j1; j++) {
+    for (let i = i0; i < size - 1 - i1; i++) {
+        for (let j = j0; j < size - j1; j++) {
             ind1 = i * size + j;
             nr = (i + 1) * size;
             ind2 = nr + j;
@@ -40,7 +40,7 @@ function createWestNeighborSkirt(size, deltaGr) {
     var grCount = (size - 1) / deltaGr;
     var b = size * size - size;
     var k = 0;
-    for (var i = 0; i < size - 2; i++) {
+    for (let i = 0; i < size - 2; i++) {
         if (i % grCount === 0) {
             k = i;
         }
@@ -61,7 +61,7 @@ function createNorthNeighborSkirt(size, deltaGr) {
     let indexes = [];
     var grCount = (size - 1) / deltaGr;
     var k = 0;
-    for (var i = 0; i < size - 2; i++) {
+    for (let i = 0; i < size - 2; i++) {
         if (i % grCount === 0) {
             k = i;
         }
@@ -82,7 +82,7 @@ function createEastNeighborSkirt(size, deltaGr) {
     let indexes = [];
     var grCount = (size - 1) / deltaGr;
     var k = 0;
-    for (var i = 0; i < size - 2; i++) {
+    for (let i = 0; i < size - 2; i++) {
         if (i % grCount === 0) {
             k = i;
         }
@@ -105,7 +105,7 @@ function createSouthNeighborSkirt(size, deltaGr) {
     var k = 0;
     var rb = size * (size - 1) - 2;
     var lb = size * size - 1;
-    for (var i = 0; i < size - 2; i++) {
+    for (let i = 0; i < size - 2; i++) {
         if (i % grCount === 0) {
             k = i;
         }
@@ -130,7 +130,7 @@ function initIndexesBodySkirts(pow) {
     table[S] = [];
     table[E] = [];
 
-    for (var i = 0; i <= pow; i++) {
+    for (let i = 0; i <= pow; i++) {
         var d = Math.pow(2, i),
             d1 = d + 1;
 
@@ -139,7 +139,7 @@ function initIndexesBodySkirts(pow) {
         table[S][i] = [];
         table[E][i] = [];
 
-        for (var j = 0; j <= pow; j++) {
+        for (let j = 0; j <= pow; j++) {
             var dd = Math.pow(2, j);
             table[W][i][j] = createWestNeighborSkirt(d1, dd);
             table[N][i][j] = createNorthNeighborSkirt(d1, dd);
@@ -153,7 +153,7 @@ function initIndexesBodySkirts(pow) {
 
 function initIndexBodiesTable(pow) {
     var table = [];
-    for (var i = 0; i <= pow; i++) {
+    for (let i = 0; i <= pow; i++) {
         var d = Math.pow(2, i);
         table[i] = createCenterBodyIndexes(d + 1);
     }
@@ -163,8 +163,8 @@ function initIndexBodiesTable(pow) {
 function createTextureCoords(size) {
     var texCoords = new Uint16Array((size + 1) * (size + 1) * 2);
     let k = 0;
-    for (var i = 0; i <= size; i++) {
-        for (var j = 0; j <= size; j++) {
+    for (let i = 0; i <= size; i++) {
+        for (let j = 0; j <= size; j++) {
             texCoords[k++] = j / size * 0xFFFF;
             texCoords[k++] = i / size * 0xFFFF;
         }
@@ -215,7 +215,7 @@ class SegmentHelper {
 
     initTextureCoordsTable(pow) {
         var table = [];
-        for (var i = 0; i <= pow; i++) {
+        for (let i = 0; i <= pow; i++) {
             var d = Math.pow(2, i);
             table[i] = createTextureCoords(d);
         }

package/src/og/shaders/atmos.js

@@ -23,7 +23,7 @@ export const COMMON =
     const float TOP_RADIUS = 6356752.3142451793 + ATMOS_HEIGHT;
         
     // Ellipsoid
-    const vec3 bottomRadii = vec3(6378137.0, 6356752.3142451793, 6378137.0);           
+    const vec3 bottomRadii = vec3(6378137.0, 6378137.0, 6356752.3142451793);           
     const vec3 topRadii = bottomRadii + ATMOS_HEIGHT;
     
     const vec3 SPHERE_TO_ELLIPSOID_SCALE = vec3(BOTTOM_RADIUS) / bottomRadii;           

package/src/og/utils/GeoImageCreator.js

@@ -131,7 +131,7 @@ export class GeoImageCreator {
             } else {
                 arr = this._queue;
             }
-            for (var i = 0; i < arr.length; i++) {
+            for (let i = 0; i < arr.length; i++) {
                 if (arr[i].isEqual(geoImage)) {
                     arr.splice(i, 1);
                     return;

package/src/og/utils/NormalMapCreator.js

@@ -122,13 +122,13 @@ export class NormalMapCreator {
         this._normalMapVerticesTexture = this._handler.createEmptyTexture_l(this._width, this._height);
 
         //create vertices hasharray for different grid size segments from 2^4(16) to 2^7(128)
-        for (var p = this._minTabelSize; p <= this._maxTableSize; p++) {
+        for (let p = this._minTabelSize; p <= this._maxTableSize; p++) {
             var gs = Math.pow(2, p);
             var gs2 = gs / 2;
             var vertices = new Float32Array((gs + 1) * (gs + 1) * 2);
 
-            for (var i = 0; i <= gs; i++) {
-                for (var j = 0; j <= gs; j++) {
+            for (let i = 0; i <= gs; i++) {
+                for (let j = 0; j <= gs; j++) {
                     let ind = (i * (gs + 1) + j) * 2;
                     vertices[ind] = -1 + j / gs2;
                     vertices[ind + 1] = -1 + i / gs2;

package/src/og/utils/PlainSegmentWorker.js

@@ -193,7 +193,7 @@ const _programm = `
         this.z = z;
     };
 
-    var lonLatToCartesian = function (lon, lat, heightFactor, res) {
+    var geodeticToCartesian = function (lon, lat, heightFactor, res) {
 
         let h = getHeightMSL(lon, lat) * heightFactor;
 
@@ -204,14 +204,14 @@ const _programm = `
 
         let N = A / Math.sqrt(1.0 - E2 * slt * slt);
         let nc = (N + h) * Math.cos(latrad);       
-        
-        res.x = nc * Math.sin(lonrad);
-        res.y = (N * (1.0 - E2) + h) * slt;
-        res.z = nc * Math.cos(lonrad);
+           
+        res.x = nc * Math.cos(lonrad);
+        res.y = nc * Math.sin(lonrad);
+        res.z = (N * (1 - E2) + h) * slt;
     };
 
-    var lonLatToCartesianInverse = function (lon, lat, heightFactor, res){
-        lonLatToCartesian(
+    var geodeticToCartesianInverse = function (lon, lat, heightFactor, res){
+        geodeticToCartesian(
             lon * INV_POLE_BY_180,
             INV_PI_BY_360 * Math.atan(Math.exp(lat * PI_BY_POLE)) - INV_PI_BY_180_HALF_PI,
             heightFactor,
@@ -279,9 +279,9 @@ const _programm = `
             let heightFactor =  msg.data.params[13];
         
             if(msg.data.params[1] === 0.0){
-                _projFunc = lonLatToCartesianInverse;
+                _projFunc = geodeticToCartesianInverse;
             }else{
-                _projFunc = lonLatToCartesian;
+                _projFunc = geodeticToCartesian;
             }
 
             let maxFgs = Math.max(fgs, gridSize);

package/src/og/utils/TerrainWorker.js

@@ -232,7 +232,7 @@ const _programm =
             normalMapVerticesHigh = new Float32Array(fileGridSize_one_x2 * 3);
             normalMapVerticesLow = new Float32Array(fileGridSize_one_x2 * 3);
 
-            for (var k = 0; k < fileGridSize_one_x2; k++) {
+            for (let k = 0; k < fileGridSize_one_x2; k++) {
 
                 var j = k % fileGridSize_one,
                     i = ~~(k / fileGridSize_one);
@@ -502,7 +502,7 @@ const _programm =
             normalMapVerticesHigh.set(terrainVerticesHigh);
             normalMapVerticesLow.set(terrainVerticesLow);
 
-            for(var k=0;k < gsgs; k++) {
+            for (let k = 0; k < gsgs; k++) {
 
                 var j = k % gs,
                     i = ~~(k / gs);

package/src/og/utils/TextureAtlas.js

@@ -168,7 +168,7 @@ class TextureAtlas {
             this.clearCanvas();
 
             var newNodes = new Map();
-            for (var i = 0; i < im.length; i++) {
+            for (let i = 0; i < im.length; i++) {
                 this._completeNode(newNodes, this._btree.insert(im[i]));
             }
             this.nodes = null;

package/src/og/utils/earcut.js

@@ -45,7 +45,7 @@ function earcut(data, holeIndices, dim) {
         minX = maxX = data[0];
         minY = maxY = data[1];
 
-        for (var i = dim; i < outerLen; i += dim) {
+        for (let i = dim; i < outerLen; i += dim) {
             x = data[i];
             y = data[i + 1];
             if (x < minX) minX = x;
@@ -610,7 +610,7 @@ function deviation(data, holeIndices, dim, triangles) {
 
     var polygonArea = Math.abs(signedArea(data, 0, outerLen, dim));
     if (hasHoles) {
-        for (var i = 0, len = holeIndices.length; i < len; i++) {
+        for (let i = 0, len = holeIndices.length; i < len; i++) {
             var start = holeIndices[i] * dim;
             var end = i < len - 1 ? holeIndices[i + 1] * dim : data.length;
             polygonArea -= Math.abs(signedArea(data, start, end, dim));
@@ -618,7 +618,7 @@ function deviation(data, holeIndices, dim, triangles) {
     }
 
     var trianglesArea = 0;
-    for (i = 0; i < triangles.length; i += 3) {
+    for (let i = 0; i < triangles.length; i += 3) {
         var a = triangles[i] * dim;
         var b = triangles[i + 1] * dim;
         var c = triangles[i + 2] * dim;
@@ -633,7 +633,7 @@ function deviation(data, holeIndices, dim, triangles) {
 
 function signedArea(data, start, end, dim) {
     var sum = 0;
-    for (var i = start, j = end - dim; i < end; i += dim) {
+    for (let i = start, j = end - dim; i < end; i += dim) {
         sum += (data[j] - data[i]) * (data[i + 1] + data[j + 1]);
         j = i;
     }
@@ -646,9 +646,9 @@ function flatten(data) {
         result = { vertices: [], holes: [], dimensions: dim },
         holeIndex = 0;
 
-    for (var i = 0; i < data.length; i++) {
-        for (var j = 0; j < data[i].length; j++) {
-            for (var d = 0; d < dim; d++) result.vertices.push(data[i][j][d]);
+    for (let i = 0; i < data.length; i++) {
+        for (let j = 0; j < data[i].length; j++) {
+            for (let d = 0; d < dim; d++) result.vertices.push(data[i][j][d]);
         }
         if (i > 0) {
             holeIndex += data[i - 1].length;
@@ -658,4 +658,4 @@ function flatten(data) {
     return result;
 }
 
-export { earcut, flatten };
+export { earcut, flatten };

package/src/og/utils/shared.js

@@ -152,7 +152,7 @@ export function parseHTML(htmlStr) {
     var p = document.createElement("div");
     p.innerHTML = htmlStr;
     var domArr = [];
-    for (var i = 0; i < p.childNodes.length; i++) {
+    for (let i = 0; i < p.childNodes.length; i++) {
         domArr.push(p.childNodes[i]);
         p.removeChild(p.childNodes[i]);
     }
@@ -419,7 +419,7 @@ export function xmlToJson(xml) {
         // do attributes
         if (xml.attributes.length > 0) {
             obj["@attributes"] = {};
-            for (var j = 0; j < xml.attributes.length; j++) {
+            for (let j = 0; j < xml.attributes.length; j++) {
                 var attribute = xml.attributes.item(j);
                 obj["@attributes"][attribute.nodeName] = attribute.nodeValue;
             }
@@ -431,7 +431,7 @@ export function xmlToJson(xml) {
 
     // do children
     if (xml.hasChildNodes()) {
-        for (var i = 0; i < xml.childNodes.length; i++) {
+        for (let i = 0; i < xml.childNodes.length; i++) {
             var item = xml.childNodes.item(i);
             var nodeName = item.nodeName;
             if (typeof obj[nodeName] === "undefined") {
@@ -511,12 +511,12 @@ export function base64toBlob(base64Data, contentType) {
     var slicesCount = Math.ceil(bytesLength / sliceSize);
     var byteArrays = new Array(slicesCount);
 
-    for (var sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+    for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
         var begin = sliceIndex * sliceSize;
         var end = Math.min(begin + sliceSize, bytesLength);
 
         var bytes = new Array(end - begin);
-        for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
+        for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
             bytes[i] = byteCharacters[offset].charCodeAt(0);
         }
         byteArrays[sliceIndex] = new Uint8Array(bytes);
@@ -751,7 +751,7 @@ export function concatArrays(a = [], b) {
     if (ArrayBuffer.isView(a)) {
         return concatTypedArrays(a, b);
     } else {
-        for (var i = 0; i < b.length; i++) {
+        for (let i = 0; i < b.length; i++) {
             a.push(b[i]);
         }
         return a;
@@ -858,8 +858,8 @@ export function getMatrixSubArray(sourceArr, gridSize, i0, j0, size) {
     var res = new Float64Array(size_1 * size_1 * 3);
 
     var vInd = 0;
-    for (var i = i0; i < i0size; i++) {
-        for (var j = j0; j < j0size; j++) {
+    for (let i = i0; i < i0size; i++) {
+        for (let j = j0; j < j0size; j++) {
             var ind = 3 * (i * (gridSize + 1) + j);
 
             res[vInd++] = sourceArr[ind];
@@ -902,8 +902,8 @@ export function getMatrixSubArrayBoundsExt(
     gridSize += 1;
     var vInd = 0,
         nInd = 0;
-    for (var i = i0; i < i0size; i++) {
-        for (var j = j0; j < j0size; j++) {
+    for (let i = i0; i < i0size; i++) {
+        for (let j = j0; j < j0size; j++) {
             let indBy3 = i * gridSize + j,
                 ind = 3 * indBy3;