@openglobus/og 0.16.3 → 0.17.1

package/src/og/segment/segmentHelper.js

@@ -1,226 +1,230 @@
-'use strict';
-
-import { N, W, S, E } from '../quadTree/quadTree.js';
-
-function NewIndexesTypedArray(arr) {
-    return new Uint32Array(arr);
-}
-
-function createCenterBodyIndexes(size) {
-
-    let indexes = [];
-
-    var i0 = 1,
-        j0 = 1;
-
-    var i1 = 1,
-        j1 = 1;
-
-    var ind1, ind2, nr;
-    for (var i = i0; i < size - 1 - i1; i++) {
-        for (var j = j0; j < size - j1; j++) {
-            ind1 = i * size + j;
-            nr = (i + 1) * size;
-            ind2 = nr + j;
-            indexes.push(ind1, ind2);
-        }
-        indexes.push(ind2, nr + j0);
-    }
-    indexes.push(indexes[indexes.length - 1], size * size - size);
-
-    return NewIndexesTypedArray(indexes);
-}
-
-function createWestNeighborSkirt(size, deltaGr) {
-    let indexes = [];
-    var grCount = (size - 1) / deltaGr;
-    var b = size * size - size;
-    var k = 0;
-    for (var i = 0; i < size - 2; i++) {
-        if (i % grCount === 0) {
-            k = i;
-        }
-        var rind = b - size * i - size + 1,
-            lind = b - size * k;
-        indexes.push(lind, rind);
-    }
-
-    if (deltaGr === (size - 1)) {
-        indexes.push(size);
-        indexes.push(0);
-    }
-
-    return NewIndexesTypedArray(indexes);
-}
-
-function createNorthNeighborSkirt(size, deltaGr) {
-    let indexes = [];
-    var grCount = (size - 1) / deltaGr;
-    var k = 0;
-    for (var i = 0; i < size - 2; i++) {
-        if (i % grCount === 0) {
-            k = i;
-        }
-        var rind = size + i + 1,
-            lind = k;
-        indexes.push(lind, rind);
-    }
-
-    if (deltaGr === (size - 1)) {
-        indexes.push(size - 2);
-        indexes.push(size - 1);
-    }
-
-    return NewIndexesTypedArray(indexes);
-}
-
-function createEastNeighborSkirt(size, deltaGr) {
-    let indexes = [];
-    var grCount = (size - 1) / deltaGr;
-    var k = 0;
-    for (var i = 0; i < size - 2; i++) {
-        if (i % grCount === 0) {
-            k = i;
-        }
-        var rind = size * (i + 1) + size - 2,
-            lind = size + size * k - 1;
-        indexes.push(lind, rind);
-    }
-
-    if (deltaGr === (size - 1)) {
-        indexes.push(size * (size - 1) - 1);
-        indexes.push(size * size - 1);
-    }
-
-    return NewIndexesTypedArray(indexes);
-}
-
-function createSouthNeighborSkirt(size, deltaGr) {
-    let indexes = [];
-    var grCount = (size - 1) / deltaGr;
-    var k = 0;
-    var rb = size * (size - 1) - 2;
-    var lb = size * size - 1;
-    for (var i = 0; i < size - 2; i++) {
-        if (i % grCount === 0) {
-            k = i;
-        }
-        var rind = rb - i,
-            lind = lb - k;
-        indexes.push(lind, rind);
-    }
-
-    if (deltaGr === (size - 1)) {
-        indexes.push(size * size - size + 1);
-    }
-    indexes.push(size * size - size);
-
-    return NewIndexesTypedArray(indexes);
-}
-
-function initIndexesBodySkirts(pow) {
-    var table = [];
-
-    table[N] = [];
-    table[W] = [];
-    table[S] = [];
-    table[E] = [];
-
-    for (var i = 0; i <= pow; i++) {
-        var d = Math.pow(2, i),
-            d1 = d + 1;
-
-        table[N][i] = [];
-        table[W][i] = [];
-        table[S][i] = [];
-        table[E][i] = [];
-
-        for (var 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);
-            table[E][i][j] = createEastNeighborSkirt(d1, dd);
-            table[S][i][j] = createSouthNeighborSkirt(d1, dd);
-
-        }
-    }
-    return table;
-}
-
-function initIndexBodiesTable(pow) {
-    var table = [];
-    for (var i = 0; i <= pow; i++) {
-        var d = Math.pow(2, i);
-        table[i] = createCenterBodyIndexes(d + 1);
-    }
-    return table;
-}
-
-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++) {
-            texCoords[k++] = j / size * 0xFFFF;
-            texCoords[k++] = i / size * 0xFFFF;
-        }
-    }
-    return texCoords;
-}
-
-class SegmentHelper {
-    constructor(maxGridSize = 0) {
-        this._maxGridSize = maxGridSize;
-    }
-
-    get maxGridSize() {
-        return this._maxGridSize;
-    }
-
-    init() {
-        this.centerIndexesTable = initIndexBodiesTable(this._maxGridSize);
-        this.skirtsIndexesTable = initIndexesBodySkirts(this._maxGridSize);
-    }
-
-    setMaxGridSize(gridSize) {
-        this._maxGridSize = gridSize;
-        this.init();
-    }
-
-    createSegmentIndexes(size, sidesSizes) {
-        if (size) {
-            let c = this.centerIndexesTable[size],
-                w = this.skirtsIndexesTable[W][size][sidesSizes[W]],
-                n = this.skirtsIndexesTable[N][size][sidesSizes[N]],
-                e = this.skirtsIndexesTable[E][size][sidesSizes[E]],
-                s = this.skirtsIndexesTable[S][size][sidesSizes[S]];
-
-            let indexes = NewIndexesTypedArray(c.length + w.length + n.length + e.length + s.length);
-
-            indexes.set(c, 0);
-            indexes.set(w, c.length);
-            indexes.set(n, c.length + w.length);
-            indexes.set(e, c.length + w.length + n.length);
-            indexes.set(s, c.length + w.length + n.length + e.length);
-
-            return indexes;
-        } else {
-            return NewIndexesTypedArray([0, 2, 1, 3]);
-        }
-    }
-
-    initTextureCoordsTable(pow) {
-        var table = [];
-        for (var i = 0; i <= pow; i++) {
-            var d = Math.pow(2, i);
-            table[i] = createTextureCoords(d);
-        }
-        return table;
-    }
-}
-
-let instance = new SegmentHelper();
-
-export function getInstance() {
-    return instance;
+/**
+ * @module og/segment/SegmentHelper
+ */
+
+'use strict';
+
+import { N, W, S, E } from '../quadTree/quadTree.js';
+
+function NewIndexesTypedArray(arr) {
+    return new Uint32Array(arr);
+}
+
+function createCenterBodyIndexes(size) {
+
+    let indexes = [];
+
+    var i0 = 1,
+        j0 = 1;
+
+    var i1 = 1,
+        j1 = 1;
+
+    var ind1, ind2, nr;
+    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;
+            indexes.push(ind1, ind2);
+        }
+        indexes.push(ind2, nr + j0);
+    }
+    indexes.push(indexes[indexes.length - 1], size * size - size);
+
+    return NewIndexesTypedArray(indexes);
+}
+
+function createWestNeighborSkirt(size, deltaGr) {
+    let indexes = [];
+    var grCount = (size - 1) / deltaGr;
+    var b = size * size - size;
+    var k = 0;
+    for (let i = 0; i < size - 2; i++) {
+        if (i % grCount === 0) {
+            k = i;
+        }
+        var rind = b - size * i - size + 1,
+            lind = b - size * k;
+        indexes.push(lind, rind);
+    }
+
+    if (deltaGr === (size - 1)) {
+        indexes.push(size);
+        indexes.push(0);
+    }
+
+    return NewIndexesTypedArray(indexes);
+}
+
+function createNorthNeighborSkirt(size, deltaGr) {
+    let indexes = [];
+    var grCount = (size - 1) / deltaGr;
+    var k = 0;
+    for (let i = 0; i < size - 2; i++) {
+        if (i % grCount === 0) {
+            k = i;
+        }
+        var rind = size + i + 1,
+            lind = k;
+        indexes.push(lind, rind);
+    }
+
+    if (deltaGr === (size - 1)) {
+        indexes.push(size - 2);
+        indexes.push(size - 1);
+    }
+
+    return NewIndexesTypedArray(indexes);
+}
+
+function createEastNeighborSkirt(size, deltaGr) {
+    let indexes = [];
+    var grCount = (size - 1) / deltaGr;
+    var k = 0;
+    for (let i = 0; i < size - 2; i++) {
+        if (i % grCount === 0) {
+            k = i;
+        }
+        var rind = size * (i + 1) + size - 2,
+            lind = size + size * k - 1;
+        indexes.push(lind, rind);
+    }
+
+    if (deltaGr === (size - 1)) {
+        indexes.push(size * (size - 1) - 1);
+        indexes.push(size * size - 1);
+    }
+
+    return NewIndexesTypedArray(indexes);
+}
+
+function createSouthNeighborSkirt(size, deltaGr) {
+    let indexes = [];
+    var grCount = (size - 1) / deltaGr;
+    var k = 0;
+    var rb = size * (size - 1) - 2;
+    var lb = size * size - 1;
+    for (let i = 0; i < size - 2; i++) {
+        if (i % grCount === 0) {
+            k = i;
+        }
+        var rind = rb - i,
+            lind = lb - k;
+        indexes.push(lind, rind);
+    }
+
+    if (deltaGr === (size - 1)) {
+        indexes.push(size * size - size + 1);
+    }
+    indexes.push(size * size - size);
+
+    return NewIndexesTypedArray(indexes);
+}
+
+function initIndexesBodySkirts(pow) {
+    var table = [];
+
+    table[N] = [];
+    table[W] = [];
+    table[S] = [];
+    table[E] = [];
+
+    for (let i = 0; i <= pow; i++) {
+        var d = Math.pow(2, i),
+            d1 = d + 1;
+
+        table[N][i] = [];
+        table[W][i] = [];
+        table[S][i] = [];
+        table[E][i] = [];
+
+        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);
+            table[E][i][j] = createEastNeighborSkirt(d1, dd);
+            table[S][i][j] = createSouthNeighborSkirt(d1, dd);
+
+        }
+    }
+    return table;
+}
+
+function initIndexBodiesTable(pow) {
+    var table = [];
+    for (let i = 0; i <= pow; i++) {
+        var d = Math.pow(2, i);
+        table[i] = createCenterBodyIndexes(d + 1);
+    }
+    return table;
+}
+
+function createTextureCoords(size) {
+    var texCoords = new Uint16Array((size + 1) * (size + 1) * 2);
+    let k = 0;
+    for (let i = 0; i <= size; i++) {
+        for (let j = 0; j <= size; j++) {
+            texCoords[k++] = j / size * 0xFFFF;
+            texCoords[k++] = i / size * 0xFFFF;
+        }
+    }
+    return texCoords;
+}
+
+class SegmentHelper {
+    constructor(maxGridSize = 0) {
+        this._maxGridSize = maxGridSize;
+    }
+
+    get maxGridSize() {
+        return this._maxGridSize;
+    }
+
+    init() {
+        this.centerIndexesTable = initIndexBodiesTable(this._maxGridSize);
+        this.skirtsIndexesTable = initIndexesBodySkirts(this._maxGridSize);
+    }
+
+    setMaxGridSize(gridSize) {
+        this._maxGridSize = gridSize;
+        this.init();
+    }
+
+    createSegmentIndexes(size, sidesSizes) {
+        if (size) {
+            let c = this.centerIndexesTable[size],
+                w = this.skirtsIndexesTable[W][size][sidesSizes[W]],
+                n = this.skirtsIndexesTable[N][size][sidesSizes[N]],
+                e = this.skirtsIndexesTable[E][size][sidesSizes[E]],
+                s = this.skirtsIndexesTable[S][size][sidesSizes[S]];
+
+            let indexes = NewIndexesTypedArray(c.length + w.length + n.length + e.length + s.length);
+
+            indexes.set(c, 0);
+            indexes.set(w, c.length);
+            indexes.set(n, c.length + w.length);
+            indexes.set(e, c.length + w.length + n.length);
+            indexes.set(s, c.length + w.length + n.length + e.length);
+
+            return indexes;
+        } else {
+            return NewIndexesTypedArray([0, 2, 1, 3]);
+        }
+    }
+
+    initTextureCoordsTable(pow) {
+        var table = [];
+        for (let i = 0; i <= pow; i++) {
+            var d = Math.pow(2, i);
+            table[i] = createTextureCoords(d);
+        }
+        return table;
+    }
+}
+
+let instance = new SegmentHelper();
+
+export function getInstance() {
+    return instance;
 }

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/shaders/billboard.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/billboard
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/shaders/drawnode.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/drawnode
- */
-
 "use strict";
 
 import { Program } from "../webgl/Program.js";
@@ -799,30 +795,30 @@ export function drawnode_screen_wl_webgl2Atmos() {
 
                 blend(diffuseColor, samplerArr[0], tileOffsetArr[0], layerOpacityArr[0]);
                 if( samplerCount == 1 ) {                
-                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[1], tileOffsetArr[1], layerOpacityArr[1]);
                 if( samplerCount == 2 ) {
-                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[2], tileOffsetArr[2], layerOpacityArr[2]);
                 if( samplerCount == 3 ) {
-                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[3], tileOffsetArr[3], layerOpacityArr[3]);
                 if( samplerCount == 4 ) {
-                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor, fadingOpacity) + vec4(spec, 0.0);
+                    diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
                     return;
                 }
 
                 blend(diffuseColor, samplerArr[4], tileOffsetArr[4], layerOpacityArr[4]);
-                diffuseColor = mix(diffuseColor * lightWeighting, atmosColor, fadingOpacity) + vec4(spec, 0.0);
+                diffuseColor = mix(diffuseColor * lightWeighting, atmosColor * diffuseColor.a, fadingOpacity) + vec4(spec, 0.0);
             }`
     });
 }

package/src/og/shaders/geoObject.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/drawnode
- */
-
 "use strict";
 
 import { Program } from "../webgl/Program.js";

package/src/og/shaders/label.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/label
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/shaders/pickingMask.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/pickingMask
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/shaders/pointCloud.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/pointCloud
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/shaders/polyline.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/polyline
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/shaders/ray.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/ray
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/shaders/skybox.js

@@ -1,7 +1,3 @@
-/**
- * @module og/shaders/skybox
- */
-
 'use strict';
 
 import { Program } from '../webgl/Program.js';

package/src/og/terrain/EmptyTerrain.js

@@ -1,7 +1,3 @@
-/**
- * @module og/terrainProvider/EmptyTerrain
- */
-
 "use strict";
 
 import { binarySearchFast } from "../utils/shared.js";

package/src/og/utils/FontAtlas.js

@@ -1,7 +1,3 @@
-/**
- * @module og/utils/FontAtlas
- */
-
 'use strict';
 
 import { Deferred } from '../Deferred.js';

package/src/og/utils/GeoImageCreator.js

@@ -18,10 +18,9 @@ export class GeoImageCreator {
         this._currentFrame = 0;
         this._queue = [];
         this._animate = [];
-        this._initialize();
     }
 
-    _initialize() {
+    init() {
         this._initShaders();
         this._initBuffers();
     }
@@ -132,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;