@openglobus/og 0.17.0 → 0.17.2

package/src/og/input/KeyboardHandler.js

@@ -1,37 +1,100 @@
 'use strict';
 
 import { input } from './input.js';
+import { stamp } from "../utils/shared.js";
+
+const STAMP_SPACER = "_";
 
 class KeyboardHandler {
 
     constructor() {
-        var _currentlyPressedKeys = {};
-        var _pressedKeysCallbacks = {};
-        var _unpressedKeysCallbacks = {};
-        var _charkeysCallbacks = {};
-        var _that = this;
-        var _anykeyCallback = null;
-        var _event = null;
+        let _currentlyPressedKeys = {};
+        let _pressedKeysCallbacks = {};
+        let _unpressedKeysCallbacks = {};
+        let _charkeysCallbacks = {};
+
+        let _that = this;
+        let _anykeyCallback = null;
+        let _event = null;
 
-        var _active = true;
+        let _active = true;
+
+        let _stampCache = {};
 
         if (KeyboardHandler.prototype._instance) {
             return KeyboardHandler.prototype._instance;
         } else {
             KeyboardHandler.prototype._instance = this;
 
-            document.onkeydown = function (event) { _event = event; _active && _that.handleKeyDown(); };
-            document.onkeyup = function (event) { _event = event; _active && _that.handleKeyUp(); };
+            document.onkeydown = function (event) {
+                _event = event;
+                _active && _that.handleKeyDown();
+            };
+            document.onkeyup = function (event) {
+                _event = event;
+                _active && _that.handleKeyUp();
+            };
         }
 
         var _sortByPriority = function (a, b) {
             return a.priority < b.priority;
         };
 
-        this.removeEvent = function (events, callback) {
-            //
-            // TODO:...
-            //
+        this.getcurrentlyPressedKeys = function () {
+            return _currentlyPressedKeys;
+        }
+
+        this.getPressedKeysCallbacks = function () {
+            return _pressedKeysCallbacks;
+        }
+
+        this.getUnpressedKeysCallbacks = function () {
+            return _unpressedKeysCallbacks;
+        }
+
+        this.getCharkeysCallbacks = function () {
+            return _charkeysCallbacks;
+        }
+
+        this.removeEvent = function (event, keyCode, callback) {
+            let st = this._getStamp(event, keyCode, callback._openglobus_id);
+            if (callback._openglobus_id && _stampCache[st]) {
+                _stampCache[st] = null;
+                delete _stampCache[st];
+
+                if (event === "keypress") {
+                    this._removeCallback(_pressedKeysCallbacks[keyCode], callback);
+                } else if (event === "keyfree") {
+                    this._removeCallback(_unpressedKeysCallbacks[keyCode], callback);
+                } else if (event === "charkeypress") {
+                    this._removeCallback(_charkeysCallbacks[keyCode], callback);
+                }
+            }
+        };
+
+        this._removeCallback = function (handlers, callback) {
+            for (let i = 0; i < handlers.length; i++) {
+                if (handlers[i].callback._openglobus_id === callback._openglobus_id) {
+                    handlers.splice(i, 1);
+                }
+            }
+        };
+
+        this._getStamp = function (name, keyCode, ogid) {
+            return `${name}${STAMP_SPACER}${keyCode}${STAMP_SPACER}${ogid}`;
+        };
+
+        this._stamp = function (name, keyCode, obj) {
+            let ogid = stamp(obj);
+
+            let st = this._getStamp(name, keyCode, ogid);
+
+            if (!_stampCache[st]) {
+                _stampCache[st] = ogid;
+                return true;
+            }
+
+            return false;
         };
 
         this.setActivity = function (activity) {
@@ -40,9 +103,13 @@ class KeyboardHandler {
 
         this.releaseKeys = function () {
             _currentlyPressedKeys = {};
-        }
+        };
+
+        this.addEvent = function (event, keyCode, callback, sender, priority) {
+
+            // Event is already bound with the callback
+            if (!this._stamp(event, keyCode, callback)) return;
 
-        this.addEvent = function (event, sender, callback, keyCode, priority) {
             if (priority === undefined) {
                 priority = 1600;
             }
@@ -84,10 +151,10 @@ class KeyboardHandler {
         this.handleKeyDown = function () {
             _anykeyCallback && _anykeyCallback.callback.call(_anykeyCallback.sender, _event);
             _currentlyPressedKeys[_event.keyCode] = true;
-            for (var ch in _charkeysCallbacks) {
+            for (let ch in _charkeysCallbacks) {
                 if (String.fromCharCode(_event.keyCode) == String.fromCharCode(ch)) {
                     var ccl = _charkeysCallbacks[ch];
-                    for (var i = 0; i < ccl.length; i++) {
+                    for (let i = 0; i < ccl.length; i++) {
                         ccl[i].callback.call(ccl[i].sender, _event);
                     }
                 }
@@ -100,10 +167,10 @@ class KeyboardHandler {
 
         this.handleKeyUp = function () {
             if (_currentlyPressedKeys[_event.keyCode] || _event.keyCode === input.KEY_PRINTSCREEN) {
-                for (var pk in _unpressedKeysCallbacks) {
+                for (let pk in _unpressedKeysCallbacks) {
                     if (_currentlyPressedKeys[pk] || _event.keyCode === input.KEY_PRINTSCREEN && pk == input.KEY_PRINTSCREEN) {
                         var cpk = _unpressedKeysCallbacks[pk];
-                        for (var i = 0; i < cpk.length; i++) {
+                        for (let i = 0; i < cpk.length; i++) {
                             cpk[i].callback.call(cpk[i].sender, _event);
                         }
                     }
@@ -113,10 +180,10 @@ class KeyboardHandler {
         };
 
         this.handleEvents = function () {
-            for (var pk in _pressedKeysCallbacks) {
+            for (let pk in _pressedKeysCallbacks) {
                 if (_currentlyPressedKeys[pk]) {
-                    var cpk = _pressedKeysCallbacks[pk];
-                    for (var i = 0; i < cpk.length; i++) {
+                    let cpk = _pressedKeysCallbacks[pk];
+                    for (let i = 0; i < cpk.length; i++) {
                         cpk[i].callback.call(cpk[i].sender, _event);
                     }
                 }

package/src/og/layer/BaseGeoImage.js

@@ -146,7 +146,7 @@ class BaseGeoImage extends Layer {
             corners[3].clone()
         ] || [0, 0, 0, 0];
 
-        for (var i = 0; i < this._cornersWgs84.length; i++) {
+        for (let i = 0; i < this._cornersWgs84.length; i++) {
             if (this._cornersWgs84[i].lat >= 89.9) {
                 this._cornersWgs84[i].lat = 89.9;
             }

package/src/og/layer/CanvasTiles.js

@@ -102,7 +102,7 @@ class CanvasTiles extends Layer {
      */
     abortLoading() {
         var q = this._pendingsQueue;
-        for (var i = q._shiftIndex + 1; i < q._popIndex + 1; i++) {
+        for (let i = q._shiftIndex + 1; i < q._popIndex + 1; i++) {
             if (q._array[i]) {
                 this.abortMaterialLoading(q._array[i]);
             }

package/src/og/layer/Vector.js

@@ -22,7 +22,7 @@ import { Layer } from "./Layer.js";
  */
 function _entitiesConstructor(entities) {
     var res = [];
-    for (var i = 0; i < entities.length; i++) {
+    for (let i = 0; i < entities.length; i++) {
         var ei = entities[i];
         if (ei.instanceName === "Entity") {
             res.push(ei);
@@ -447,7 +447,7 @@ class Vector extends Layer {
      */
     _reindexEntitiesArray(startIndex) {
         var e = this._entities;
-        for (var i = startIndex; i < e.length; i++) {
+        for (let i = startIndex; i < e.length; i++) {
             e[i]._layerIndex = i;
         }
     }

package/src/og/math/Vec3.js

@@ -81,6 +81,11 @@ export class Vec3 {
         return new Vec3(0, 0, 1);
     }
 
+    /** @const */
+    static get NORTH() {
+        return Vec3.UNIT_Z;
+    }
+
     /**
      * Separate 63 bit Vec3 to two Vec3 32 bit float values.
      * @function

package/src/og/math.js

@@ -138,7 +138,7 @@ export function isPowerOfTwo(x) {
  */
 export function nextHighestPowerOfTwo(x, maxValue = 4096) {
     --x;
-    for (var i = 1; i < 32; i <<= 1) {
+    for (let i = 1; i < 32; i <<= 1) {
         x = x | (x >> i);
     }
     return (x + 1) > maxValue ? maxValue : x + 1
@@ -362,7 +362,7 @@ export function negativePItoPI(a) {
 export function solve_iteration_fixed(f, x0, maxIter) {
     var x = 0;
     var x2 = x0;
-    for (var i = 0; i < maxIter; i++) {
+    for (let i = 0; i < maxIter; i++) {
         x = x2;
         x2 = f(x);
     }
@@ -382,7 +382,7 @@ export function solve_iteration_fixed(f, x0, maxIter) {
 export function solve_iteration(f, x0, err, maxIter = 50) {
     var x = 0;
     var x2 = x0;
-    for (var i = 0; i < maxIter; i++) {
+    for (let i = 0; i < maxIter; i++) {
         x = x2;
         x2 = f(x);
         if (Math.abs(x2 - x) < err) {

package/src/og/mercator.js

@@ -122,7 +122,7 @@ export function getTileY(lat, zoom) {
  */
 export function forwardArray(lonlatArr) {
     var res = [];
-    for (var i = 0; i < lonlatArr.length; i++) {
+    for (let i = 0; i < lonlatArr.length; i++) {
         res.push(lonlatArr[i].forwardMercator());
     }
     return res;

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/renderer/RendererEvents.js

@@ -256,33 +256,19 @@ class RendererEvents extends Events {
         }
     }
 
-    /**
-     * Set render event callback.
-     * @public
-     * @param {string} name - Event name
-     * @param {eventCallback} callback - Callback function
-     * @param {number} [key] - Key code from og.input
-     * @param {*} sender - Callback context
-     * @param {number} [priority] - Event callback priority
-     */
     on(name, p0, p1, p2, p3) {
         if (name === "keypress" || name === "charkeypress" || name === "keyfree") {
-            this._keyboardHandler.addEvent(name, p2, p1, p0, p3);
+            this._keyboardHandler.addEvent(name, p0, p1, p2, p3);
         } else {
             super.on(name, p0, p1, p2);
         }
     }
 
-    /**
-     * TODO: DOESNT WORK!!!
-     * @param {any} name
-     * @param {any} callback
-     */
-    off(name, callback) {
+    off(name, p1, p2) {
         if (name === "keypress" || name === "charkeypress" || name === "keyfree") {
-            this._keyboardHandler.removeEvent(name, callback);
+            this._keyboardHandler.removeEvent(name, p1, p2);
         } else {
-            super.off(name, callback);
+            super.off(name, p1);
         }
     }
 

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

@@ -117,8 +117,6 @@ export class Planet extends RenderNode {
     constructor(options = {}) {
         super(options.name);
 
-        this._cameraFrustums = options.frustums || [[1, 100], [100, 1000 + 7.0], [1000 - 7.0, 1e6 + 17], [1e6 - 17, 1e9]];
-
         /**
          * @public
          * @type {Ellipsoid}
@@ -205,10 +203,10 @@ export class Planet extends RenderNode {
          * @type {PlanetCamera}
          */
         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),
+            frustums: options.frustums,
+            eye: new Vec3(25000000, 0, 0),
+            look: Vec3.ZERO,
+            up: Vec3.NORTH,
             minAltitude: this._minAltitude,
             maxAltitude: this._maxAltitude
         });
@@ -438,13 +436,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 +525,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 +766,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 +1096,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 +1294,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 +1303,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 +1416,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 +1425,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);