@openglobus/og 0.17.0 → 0.17.2

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;
@@ -189,7 +189,7 @@ class TextureAtlas {
      * @public
      */
     createTexture(img, internalFormat) {
-        if (this._handler) {
+        if (this._handler && this._handler.gl) {
             this._handler.gl.deleteTexture(this.texture);
             if (img) {
                 this.canvas.resize(img.width, img.height);

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;
 

package/src/og/webgl/Framebuffer.js

@@ -121,7 +121,7 @@ export class Framebuffer {
     destroy() {
         var gl = this.handler.gl;
 
-        for (var i = 0; i < this.textures.length; i++) {
+        for (let i = 0; i < this.textures.length; i++) {
             gl.deleteTexture(this.textures[i]);
         }
         this.textures = new Array(this._size);
@@ -148,7 +148,7 @@ export class Framebuffer {
 
         if (!this._isBare) {
             let attachmentArr = [];
-            for (var i = 0; i < this.textures.length; i++) {
+            for (let i = 0; i < this.textures.length; i++) {
                 let ti = this.textures[i] || this.handler.createEmptyTexture2DExt(this._width, this._height, this._filter, this._internalFormatArr[i], this._formatArr[i], this._typeArr[i]);
 
                 let att_i = gl[this._attachmentArr[i]];

package/src/og/webgl/Handler.js

@@ -1026,6 +1026,8 @@ class Handler {
     destroy() {
         let gl = this.gl;
 
+        this.resizeObserver.disconnect();
+        this.intersectionObserver.disconnect();
         this.stop();
 
         //
@@ -1138,7 +1140,7 @@ class Handler {
     //         const data = new DataView(xhr.response);
     //         const array =
     //             new Float32Array(data.byteLength / Float32Array.BYTES_PER_ELEMENT);
-    //         for (var i = 0; i < array.length; ++i) {
+    //         for (let i = 0; i < array.length; ++i) {
     //             array[i] = data.getFloat32(i * Float32Array.BYTES_PER_ELEMENT, true);
     //         }
     //         callback(array);

package/src/og/webgl/Multisample.js

@@ -88,7 +88,7 @@ export class Multisample {
     destroy() {
         var gl = this.handler.gl;
 
-        for (var i = 0; i < this.renderbuffers.length; i++) {
+        for (let i = 0; i < this.renderbuffers.length; i++) {
             gl.deleteRenderbuffer(this.renderbuffers[i]);
         }
         this.renderbuffers = new Array(this._size);
@@ -116,7 +116,7 @@ export class Multisample {
         gl.bindFramebuffer(gl.FRAMEBUFFER, this._fbo);
 
         let colorAttachments = [];
-        for (var i = 0; i < this.renderbuffers.length; i++) {
+        for (let i = 0; i < this.renderbuffers.length; i++) {
             let rb = gl.createRenderbuffer();
             gl.bindRenderbuffer(gl.RENDERBUFFER, rb);
 

package/src/og/webgl/Program.js

@@ -154,7 +154,7 @@ class Program {
      */
     set(material) {
         this._textureID = 0;
-        for (var i in material) {
+        for (let i in material) {
             this._variables[i].value = material[i];
             this._variables[i]._callback(this, this._variables[i]);
         }
@@ -167,7 +167,7 @@ class Program {
     apply() {
         this._textureID = 0;
         var v = this._variables;
-        for (var i in v) {
+        for (let i in v) {
             v[i]._callback(this, v[i]);
         }
     }
@@ -318,7 +318,7 @@ class Program {
 
         this.use();
 
-        for (var a in this._attributes) {
+        for (let a in this._attributes) {
             //this.attributes[a]._name = a;
             this._variables[a] = this._attributes[a];
 
@@ -371,7 +371,7 @@ class Program {
             this.attributes[a] = this._p[a];
         }
 
-        for (var u in this._uniforms) {
+        for (let u in this._uniforms) {
             //this.uniforms[u]._name = u;
 
             if (typeof this._uniforms[u].type === "string") {

package/types/ImageCanvas.d.ts

@@ -41,7 +41,7 @@ export class ImageCanvas {
      * Fills canvas RGBA with color.
      * @public
      */
-    public fill(c: any): void;
+    public fill(color: any): void;
     /**
      * Gets canvas pixels RGBA data.
      * @public

package/types/ellipsoid/Ellipsoid.d.ts

@@ -92,7 +92,7 @@ export class Ellipsoid {
      * @param {Number} height - Height.
      * @returns {Vec3} -
      */
-    public geodeticToCartesian(lon: number, lat: number, height?: number): Vec3;
+    public geodeticToCartesian(lon: number, lat: number, height: number, res: any): Vec3;
     /**
      * Gets Wgs84 geodetic coordinates from cartesian ECEF.
      * @public
@@ -155,6 +155,7 @@ export class Ellipsoid {
      * @returns {Vec3} -
      */
     public hitRay(origin: Vec3, direction: Vec3): Vec3;
+    getNorthFrameRotation(cartesian: any): Quat;
     /**
      * @todo this is not precise function, needs to be replaced or removed
      * @param lonLat1
@@ -166,3 +167,4 @@ export class Ellipsoid {
 }
 import { Vec3 } from "../math/Vec3.js";
 import { LonLat } from "../LonLat.js";
+import { Quat } from "../math/Quat.js";

package/types/entity/GeoObject.d.ts

@@ -112,7 +112,6 @@ export class GeoObject {
      */
     public setPickingColor3v(color: og.Vec3): void;
     updateDirection(): void;
-    _qNorthFrame: Quat;
+    _qNorthFrame: any;
 }
 import { Vec3 } from "../math/index.js";
-import { Quat } from "../math/index.js";

package/types/input/KeyboardHandler.d.ts

@@ -1,8 +1,15 @@
 export class KeyboardHandler {
-    removeEvent: (events: any, callback: any) => void;
+    getcurrentlyPressedKeys: () => {};
+    getPressedKeysCallbacks: () => {};
+    getUnpressedKeysCallbacks: () => {};
+    getCharkeysCallbacks: () => {};
+    removeEvent: (event: any, keyCode: any, callback: any) => void;
+    _removeCallback: (handlers: any, callback: any) => void;
+    _getStamp: (name: any, keyCode: any, ogid: any) => string;
+    _stamp: (name: any, keyCode: any, obj: any) => boolean;
     setActivity: (activity: any) => void;
     releaseKeys: () => void;
-    addEvent: (event: any, sender: any, callback: any, keyCode: any, priority: any) => void;
+    addEvent: (event: any, keyCode: any, callback: any, sender: any, priority: any) => void;
     isKeyPressed: (keyCode: any) => any;
     handleKeyDown: () => void;
     handleKeyUp: () => void;

package/types/math/Vec3.d.ts

@@ -35,6 +35,8 @@ export class Vec3 {
     static get UNIT_Y(): Vec3;
     /** @const */
     static get UNIT_Z(): Vec3;
+    /** @const */
+    static get NORTH(): Vec3;
     /**
      * Separate 63 bit Vec3 to two Vec3 32 bit float values.
      * @function

package/types/renderer/RendererEvents.d.ts

@@ -170,22 +170,8 @@ export class RendererEvents extends Events {
      * @public
      */
     public handleEvents(): void;
-    /**
-     * 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
-     */
-    public on(name: string, p0: any, p1: any, p2: any, p3: any): void;
-    /**
-     * TODO: DOESNT WORK!!!
-     * @param {any} name
-     * @param {any} callback
-     */
-    off(name: any, callback: any): void;
+    on(name: any, p0: any, p1: any, p2: any, p3: any): void;
+    off(name: any, p1: any, p2: any): void;
     /**
      * Check key is pressed.
      * @public

package/types/scene/Planet.d.ts

@@ -16,9 +16,7 @@
  * @fires og.scene.Planet#geoimageadd
  */
 export class Planet extends RenderNode {
-    static getBearingNorthRotationQuat(cartesian: any): Quat;
     constructor(options?: {});
-    _cameraFrustums: any;
     /**
      * @public
      * @type {Ellipsoid}
@@ -260,6 +258,7 @@ export class Planet extends RenderNode {
     _renderScreenNodesPASS: () => void;
     _atmosphereEnabled: any;
     _atmosphereMaxMinOpacity: Float32Array;
+    getNorthFrameRotation(cartesian: any): any;
     set atmosphereMaxOpacity(arg: number);
     get atmosphereMaxOpacity(): number;
     set atmosphereMinOpacity(arg: number);
@@ -593,4 +592,3 @@ import { PlainSegmentWorker } from "../utils/PlainSegmentWorker.js";
 import { Loader } from "../utils/Loader.js";
 import { Key } from "../Lock.js";
 import { LonLat } from "../LonLat.js";
-import { Quat } from "../math/index.js";