@openglobus/og 0.18.0 → 0.18.2

package/{src/utils/VectorTileCreator.ts → lib/js/utils/VectorTileCreator.js}

@@ -1,25 +1,11 @@
-import {doubleToTwoFloats2} from '../math/coder';
-import {Framebuffer} from '../webgl/Framebuffer';
-import {Handler} from "../webgl/Handler";
-import {Material} from "../layer/Material";
-import {Program} from '../webgl/Program';
-import {Planet} from "../scene/Planet";
-import {RENDERING} from '../quadTree/quadTree';
-import {Vector} from "../layer/Vector";
-
+import { doubleToTwoFloats2 } from '../math/coder';
+import { Framebuffer } from '../webgl/Framebuffer';
+import { Program } from '../webgl/Program';
+import { RENDERING } from '../quadTree/quadTree';
 let tempArr = new Float32Array(2);
-
 const MAX_FRAME_TIME = 25.0;
-
 export class VectorTileCreator {
-    protected _width: number;
-    protected _height: number;
-    protected _planet: Planet;
-    protected _framebuffer: Framebuffer | null;
-    protected _queue: Material[];
-    protected _handler: Handler | null;
-
-    constructor(planet: Planet, width: number = 512, height: number = 512) {
+    constructor(planet, width = 512, height = 512) {
         this._width = width;
         this._height = height;
         this._planet = planet;
@@ -27,11 +13,8 @@ export class VectorTileCreator {
         this._queue = [];
         this._handler = null;
     }
-
-    public init() {
-
-        this._handler = this._planet.renderer!.handler;
-
+    init() {
+        this._handler = this._planet.renderer.handler;
         //Line
         if (!this._handler.programs.vectorTileLineRasterization) {
             this._handler.addProgram(new Program("vectorTileLineRasterization", {
@@ -46,17 +29,14 @@ export class VectorTileCreator {
                     'prevHigh': "vec2",
                     'currentHigh': "vec2",
                     'nextHigh': "vec2",
-
                     'prevLow': "vec2",
                     'currentLow': "vec2",
                     'nextLow': "vec2",
-
                     'order': "float",
                     'color': "vec4",
                     'thickness': "float"
                 },
-                vertexShader:
-                    `attribute vec2 prevHigh;
+                vertexShader: `attribute vec2 prevHigh;
                 attribute vec2 currentHigh;
                 attribute vec2 nextHigh;
 
@@ -147,7 +127,6 @@ export class VectorTileCreator {
                 }`
             }));
         }
-
         //Polygon
         if (!this._handler.programs.vectorTilePolygonRasterization) {
             this._handler.addProgram(new Program("vectorTilePolygonRasterization", {
@@ -160,8 +139,7 @@ export class VectorTileCreator {
                     'coordinatesLow': "vec2",
                     'colors': "vec4"
                 },
-                vertexShader:
-                    `attribute vec2 coordinatesHigh;
+                vertexShader: `attribute vec2 coordinatesHigh;
                 attribute vec2 coordinatesLow; 
                 attribute vec4 colors; 
                 uniform vec4 extentParamsHigh; 
@@ -178,229 +156,165 @@ export class VectorTileCreator {
                     color = colors;
                     gl_Position = vec4(proj(coordinatesHigh, coordinatesLow), 0.0, 1.0); 
                 }`,
-                fragmentShader:
-                    `precision highp float;
+                fragmentShader: `precision highp float;
                 varying vec4 color;
                 void main () {  
                     gl_FragColor = color; 
                 }`
             }));
         }
-
         this._framebuffer = new Framebuffer(this._handler, {
             width: this._width,
             height: this._height,
             useDepth: false
         });
-
         this._framebuffer.init();
     }
-
-    public frame() {
+    frame() {
         if (this._planet.layerLock.isFree() && this._queue.length) {
-            let h = this._handler!,
-                gl = h.gl!;
-
+            let h = this._handler, gl = h.gl;
             gl.disable(gl.CULL_FACE);
             gl.disable(gl.DEPTH_TEST);
-
-            let hLine = h.programs.vectorTileLineRasterization,
-                hPoly = h.programs.vectorTilePolygonRasterization;
-
-            let _w = this._width,
-                _h = this._height,
-                width = _w,
-                height = _h,
-                _w2 = width << 1,
-                _h2 = height << 1;
-
+            let hLine = h.programs.vectorTileLineRasterization, hPoly = h.programs.vectorTilePolygonRasterization;
+            let _w = this._width, _h = this._height, width = _w, height = _h, _w2 = width << 1, _h2 = height << 1;
             // var prevLayerId = -1;
-
             let extentParamsHigh = new Float32Array(4);
             let extentParamsLow = new Float32Array(4);
-
-            let f = this._framebuffer!.activate();
-
-            let deltaTime = 0,
-                startTime = window.performance.now();
-
+            let f = this._framebuffer.activate();
+            let deltaTime = 0, startTime = window.performance.now();
             while (this._queue.length && deltaTime < MAX_FRAME_TIME) {
-                let material = this._queue.shift()!;
+                let material = this._queue.shift();
                 if (material.isLoading && material.segment.node.getState() === RENDERING) {
                     let pickingEnabled = material.layer._pickingEnabled;
-
                     if (material.segment.tileZoom < 4) {
                         width = _w2;
                         height = _h2;
-                    } else {
+                    }
+                    else {
                         width = _w;
                         height = _h;
                     }
-
                     let texture = material._updateTexture || h.createEmptyTexture_l(width, height);
                     let pickingMask = pickingEnabled ? material._updatePickingMask || h.createEmptyTexture_n(width, height) : null;
-
                     material.applyTexture(texture, pickingMask);
-
                     f.setSize(width, height);
-
-                    f.bindOutputTexture(texture!);
-
+                    f.bindOutputTexture(texture);
                     gl.clearColor(0.0, 0.0, 0.0, 0.0);
                     gl.clear(gl.COLOR_BUFFER_BIT);
-
                     let extent = material.segment.getExtentMerc();
-
                     doubleToTwoFloats2(extent.southWest.lon, tempArr);
                     extentParamsHigh[0] = tempArr[0];
                     extentParamsLow[0] = tempArr[1];
-
                     doubleToTwoFloats2(extent.southWest.lat, tempArr);
                     extentParamsHigh[1] = tempArr[0];
                     extentParamsLow[1] = tempArr[1];
-
                     extentParamsHigh[2] = 2.0 / extent.getWidth();
                     extentParamsHigh[3] = 2.0 / extent.getHeight();
-
                     hPoly.activate();
                     let sh = hPoly._program;
-                    let sha = sh.attributes,
-                        shu = sh.uniforms;
-
-                    let geomHandler = (material.layer as Vector)._geometryHandler;
-
+                    let sha = sh.attributes, shu = sh.uniforms;
+                    let geomHandler = material.layer._geometryHandler;
                     //=========================================
                     //Polygon rendering
                     //=========================================
                     gl.uniform4fv(shu.extentParamsHigh, extentParamsHigh);
                     gl.uniform4fv(shu.extentParamsLow, extentParamsLow);
-
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyVerticesHighBufferMerc!);
-                    gl.vertexAttribPointer(sha.coordinatesHigh, geomHandler._polyVerticesHighBufferMerc!.itemSize, gl.FLOAT, false, 0, 0);
-
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyVerticesLowBufferMerc!);
-                    gl.vertexAttribPointer(sha.coordinatesLow, geomHandler._polyVerticesLowBufferMerc!.itemSize, gl.FLOAT, false, 0, 0);
-
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyColorsBuffer!);
-                    gl.vertexAttribPointer(sha.colors, geomHandler._polyColorsBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-                    gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, geomHandler._polyIndexesBuffer!);
-
-                    gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
-
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyVerticesHighBufferMerc);
+                    gl.vertexAttribPointer(sha.coordinatesHigh, geomHandler._polyVerticesHighBufferMerc.itemSize, gl.FLOAT, false, 0, 0);
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyVerticesLowBufferMerc);
+                    gl.vertexAttribPointer(sha.coordinatesLow, geomHandler._polyVerticesLowBufferMerc.itemSize, gl.FLOAT, false, 0, 0);
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyColorsBuffer);
+                    gl.vertexAttribPointer(sha.colors, geomHandler._polyColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                    gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, geomHandler._polyIndexesBuffer);
+                    gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     //Polygon picking PASS
                     if (pickingEnabled) {
-                        f.bindOutputTexture(pickingMask!);
-
+                        f.bindOutputTexture(pickingMask);
                         gl.clearColor(0.0, 0.0, 0.0, 0.0);
                         gl.clear(gl.COLOR_BUFFER_BIT);
-
-                        gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyPickingColorsBuffer!);
-                        gl.vertexAttribPointer(sha.colors, geomHandler._polyPickingColorsBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-                        gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
+                        gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyPickingColorsBuffer);
+                        gl.vertexAttribPointer(sha.colors, geomHandler._polyPickingColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                        gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     }
-
                     //=========================================
                     //Strokes and linestrings rendering
                     //=========================================
-                    f.bindOutputTexture(texture!);
-
+                    f.bindOutputTexture(texture);
                     hLine.activate();
                     sh = hLine._program;
                     sha = sh.attributes;
                     shu = sh.uniforms;
-
                     gl.uniform2fv(shu.viewport, [width, height]);
-
                     gl.uniform4fv(shu.extentParamsHigh, extentParamsHigh);
                     gl.uniform4fv(shu.extentParamsLow, extentParamsLow);
-
                     //vertex
-                    let mb = geomHandler._lineVerticesHighBufferMerc!;
+                    let mb = geomHandler._lineVerticesHighBufferMerc;
                     gl.bindBuffer(gl.ARRAY_BUFFER, mb);
-
                     gl.vertexAttribPointer(sha.prevHigh, mb.itemSize, gl.FLOAT, false, 8, 0);
                     gl.vertexAttribPointer(sha.currentHigh, mb.itemSize, gl.FLOAT, false, 8, 32);
                     gl.vertexAttribPointer(sha.nextHigh, mb.itemSize, gl.FLOAT, false, 8, 64);
-
-                    mb = geomHandler._lineVerticesLowBufferMerc!;
+                    mb = geomHandler._lineVerticesLowBufferMerc;
                     gl.bindBuffer(gl.ARRAY_BUFFER, mb);
-
                     gl.vertexAttribPointer(sha.prevLow, mb.itemSize, gl.FLOAT, false, 8, 0);
                     gl.vertexAttribPointer(sha.currentLow, mb.itemSize, gl.FLOAT, false, 8, 32);
                     gl.vertexAttribPointer(sha.nextLow, mb.itemSize, gl.FLOAT, false, 8, 64);
-
                     //order
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineOrdersBuffer!);
-                    gl.vertexAttribPointer(sha.order, geomHandler._lineOrdersBuffer!.itemSize, gl.FLOAT, false, 4, 0);
-
-                    gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, geomHandler._lineIndexesBuffer!);
-
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineOrdersBuffer);
+                    gl.vertexAttribPointer(sha.order, geomHandler._lineOrdersBuffer.itemSize, gl.FLOAT, false, 4, 0);
+                    gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, geomHandler._lineIndexesBuffer);
                     //PASS - stroke
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineStrokesBuffer!);
-                    gl.vertexAttribPointer(sha.thickness, geomHandler._lineStrokesBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineStrokeColorsBuffer!);
-                    gl.vertexAttribPointer(sha.color, geomHandler._lineStrokeColorsBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineStrokesBuffer);
+                    gl.vertexAttribPointer(sha.thickness, geomHandler._lineStrokesBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineStrokeColorsBuffer);
+                    gl.vertexAttribPointer(sha.color, geomHandler._lineStrokeColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
                     //Antialias pass
                     gl.uniform1f(shu.thicknessOutline, 2);
                     gl.uniform1f(shu.alpha, 0.54);
-                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
+                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     //
                     //Aliased pass
                     gl.uniform1f(shu.thicknessOutline, 1);
                     gl.uniform1f(shu.alpha, 1.0);
-                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
-
+                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     //PASS - inside line
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineThicknessBuffer!);
-                    gl.vertexAttribPointer(sha.thickness, geomHandler._lineThicknessBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
-                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineColorsBuffer!);
-                    gl.vertexAttribPointer(sha.color, geomHandler._lineColorsBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineThicknessBuffer);
+                    gl.vertexAttribPointer(sha.thickness, geomHandler._lineThicknessBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                    gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._lineColorsBuffer);
+                    gl.vertexAttribPointer(sha.color, geomHandler._lineColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
                     //Antialias pass
                     gl.uniform1f(shu.thicknessOutline, 2);
                     gl.uniform1f(shu.alpha, 0.54);
-                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
+                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     //
                     //Aliased pass
                     gl.uniform1f(shu.thicknessOutline, 1);
                     gl.uniform1f(shu.alpha, 1.0);
-                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
-
+                    gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     if (pickingEnabled) {
-                        f.bindOutputTexture(pickingMask!);
+                        f.bindOutputTexture(pickingMask);
                         gl.uniform1f(shu.thicknessOutline, 8);
-                        gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._linePickingColorsBuffer!);
-                        gl.vertexAttribPointer(sha.color, geomHandler._linePickingColorsBuffer!.itemSize, gl.FLOAT, false, 0, 0);
-                        gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
+                        gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._linePickingColorsBuffer);
+                        gl.vertexAttribPointer(sha.color, geomHandler._linePickingColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                        gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     }
-                } else {
+                }
+                else {
                     material.isLoading = false;
                 }
-
                 deltaTime = window.performance.now() - startTime;
             }
-
             gl.enable(gl.DEPTH_TEST);
             gl.enable(gl.CULL_FACE);
-
             f.deactivate();
         }
     }
-
-    public add(material: Material) {
+    add(material) {
         this._queue.push(material);
     }
-
-    public remove(material: Material) {
+    remove(material) {
         //...
     }
-
-    public get queueSize(): number {
+    get queueSize() {
         return this._queue.length;
     }
 }

package/lib/js/utils/colorTable.d.ts

@@ -0,0 +1,3 @@
+export declare const colorTable: {
+    [id: string]: string;
+};

package/{src/utils/colorTable.ts → lib/js/utils/colorTable.js}

@@ -1,4 +1,4 @@
-export const colorTable: { [id: string]: string } = {
+export const colorTable = {
     "aliceblue": "#f0f8ff",
     "antiquewhite": "#faebd7",
     "aqua": "#00ffff",
@@ -140,4 +140,4 @@ export const colorTable: { [id: string]: string } = {
     "whitesmoke": "#f5f5f5",
     "yellow": "#ffff00",
     "yellowgreen": "#9acd32"
-};
+};

package/lib/js/utils/earcut.d.ts

@@ -0,0 +1,7 @@
+declare function earcut(data: any, holeIndices: any, dim: any): any[];
+declare function flatten(data: any): {
+    vertices: never[];
+    holes: never[];
+    dimensions: any;
+};
+export { earcut, flatten };