@pirireis/webglobeplugins 1.0.2 → 1.0.3

package/investigation-tools/draw/tiles/{tiles.ts → tiles.js}

@@ -1,162 +1,128 @@
-import { Color, Globe, DrawnTileInfo } from "../../../types";
-import { ArcOnTerrainPlugin } from "../../../semiplugins/shape-on-terrain/arc-plugin";
-import { tileToArcInputs, tilesToContextWriter4Inputs, mergedTileToArcInputs } from "./adapters";
-import { ContextTextWriter4 } from "../../../write-text/context-text4";
-import { mergeMeshes } from "../../../Math/tessellation/tile-merger";
-
-// diverse ColorRamp
-const defaultColorsRamp: [number, Color][] = [
-    [0.0, [0, 0, 255, 255]],       // Blue
-    // [0.3, [255, 165, 0, 255]],    // Orange
-    [0.25, [0, 255, 0, 255]],      // Green
-    // [0.4, [255, 0, 0, 255]],      // Red
-    [0.5, [128, 0, 128, 255]],    // Purple
-    // [0.6, [0, 255, 255, 255]],    // Cyan
-    [0.75, [255, 192, 203, 255]],  // Pink
-    [1.0, [255, 255, 255, 255]],  // White
-    // [1.0, [0, 0, 0, 255]]         // Black
-];
-
-
-export class TilesRendererPlugin {
-    public id: string;
-    private globe: Globe;
-    private gl: WebGL2RenderingContext;
-    private arcPlugin: ArcOnTerrainPlugin;
-    private contextTextWriter: ContextTextWriter4;
-    colorsRamp: [number, Color][];
-    private _lastTilesUniqueIdentifier: string | null = null;
-    constructor(id: string, colorsRamp: [number, Color][] = defaultColorsRamp) {
-        this.globe = null as any;
-        this.gl = null as any;
-        this.contextTextWriter = null as any;
-        this.id = id;
-
-        this.colorsRamp = colorsRamp;
-        this.arcPlugin = new ArcOnTerrainPlugin(id + "_arc_plugin", {
-            variativeColorsOn: true,
-            defaultHeightFromGroundIn3D: 0,
-        });
-    }
-
-    init(globe: Globe, gl: WebGL2RenderingContext): void {
-        this.globe = globe;
-        this.gl = gl;
-        this.contextTextWriter = new ContextTextWriter4(
-            globe,
-            (item) => { return [item] },
-            (item) => { return item.key },
-            (zoomLevel: number) => (item: any) => {
-                return {
-                    opacityMultiplier: 1,
-                    sizeMultiplier: 1
-                }
-            },
-        );
-
-        this.arcPlugin.init(globe, gl);
-    }
-
-
-
-
-
-    draw3D(projectionMatrix: Float32Array, modelViewMatrix: Float32Array, transPosition: { x: number, y: number, z: number }): void {
-        // if (this.globe.api_IsScreenMoving()) {
-        this._prepareArcInputs();
-        // }
-        this.arcPlugin.draw3D();
-        this.contextTextWriter.draw();
-    }
-
-
-    free(): void {
-        this.arcPlugin.free();
-    }
-
-
-
-
-    _prepareArcInputs(): void {
-        // const drawnTiles = filterTilesInScreen(
-        //     this.globe.api_GetDrawedTilesInfo(),
-        //     this.globe
-        // );
-
-        const drawnTiles = this.globe.api_GetVisibleTilesInfo();
-
-        let maxLevel = 0;
-        let minLevel = Number.MAX_VALUE;
-        const tileMap = new Map<number, DrawnTileInfo[]>();
-        for (const tile of drawnTiles) {
-            if (tile.level > maxLevel) {
-                maxLevel = tile.level;
-            }
-            if (tile.level < minLevel) {
-                minLevel = tile.level;
-            }
-            if (!tileMap.has(tile.level)) {
-                tileMap.set(tile.level, []);
-            }
-            tileMap.get(tile.level)!.push(tile);
-        }
-        let tilesUniqueId = "";
-        for (let level = minLevel; level <= maxLevel; level++) {
-            const tiles = tileMap.get(level);
-            if (!tiles) continue;
-            tilesUniqueId += `L${level}_C${tiles.length}_`;
-        }
-        if (tilesUniqueId === this._lastTilesUniqueIdentifier) return;
-        this._lastTilesUniqueIdentifier = tilesUniqueId;
-
-        const levelRange = maxLevel - minLevel;
-        const colors = this._interpolateColors(levelRange);
-
-        this.arcPlugin.deleteAll();
-
-        for (let level = maxLevel; level >= minLevel; level--) {
-            const tiles = tileMap.get(level);
-            if (!tiles) continue;
-            const colorIndex = level - minLevel;
-            const color = colors[colorIndex];
-            const arcInputs = tileToArcInputs(tiles, color);
-            this.arcPlugin.insertBulk(arcInputs);
-        }
-
-        // drawMergedBBoxes:
-        const mergedTiles = mergeMeshes(drawnTiles, 12, 5, 4, this.globe);
-        const color: Color = [255, 255, 0, 255];   // Yellow
-        const arcMergedInputs = mergedTiles.map(mergedTile => mergedTileToArcInputs(mergedTile, color)).flat();
-        this.arcPlugin.insertBulk(arcMergedInputs);
-
-        const contextWriterInputs = tilesToContextWriter4Inputs(drawnTiles);
-        this.contextTextWriter.clear();
-        this.contextTextWriter.insertTextBulk(contextWriterInputs);
-    }
-
-
-    _interpolateColors(maxValue: number): Color[] {
-
-        let colors: Color[] = [];
-        let colorRampIndex = 0;
-        for (let i = 0; i <= maxValue; i++) {
-            const t = i / maxValue;
-            while (colorRampIndex < this.colorsRamp.length - 1 && t > this.colorsRamp[colorRampIndex + 1][0]) {
-                colorRampIndex++;
-            }
-            const [t0, color0] = this.colorsRamp[colorRampIndex];
-            const [t1, color1] = this.colorsRamp[Math.min(colorRampIndex + 1, this.colorsRamp.length - 1)];
-            const localT = (t - t0) / (t1 - t0);
-            const r = Math.round(color0[0] + (color1[0] - color0[0]) * localT);
-            const g = Math.round(color0[1] + (color1[1] - color0[1]) * localT);
-            const b = Math.round(color0[2] + (color1[2] - color0[2]) * localT);
-            // const a = Math.round(color0[3] + (color1[3] - color0[3]) * localT);
-            colors.push([r, g, b, 255]);
-        }
-        return colors;
-    }
-
-
-
-
-} 
+import { ArcOnTerrainPlugin } from "../../../semiplugins/shape-on-terrain/arc-plugin";
+import { tileToArcInputs, tilesToContextWriter4Inputs, mergedTileToArcInputs } from "./adapters";
+import { ContextTextWriter4 } from "../../../write-text/context-text4";
+import { mergeMeshes } from "../../../Math/tessellation/tile-merger";
+// diverse ColorRamp
+const defaultColorsRamp = [
+    [0.0, [0, 0, 255, 255]], // Blue
+    // [0.3, [255, 165, 0, 255]],    // Orange
+    [0.25, [0, 255, 0, 255]], // Green
+    // [0.4, [255, 0, 0, 255]],      // Red
+    [0.5, [128, 0, 128, 255]], // Purple
+    // [0.6, [0, 255, 255, 255]],    // Cyan
+    [0.75, [255, 192, 203, 255]], // Pink
+    [1.0, [255, 255, 255, 255]], // White
+    // [1.0, [0, 0, 0, 255]]         // Black
+];
+export class TilesRendererPlugin {
+    id;
+    globe;
+    gl;
+    arcPlugin;
+    contextTextWriter;
+    colorsRamp;
+    _lastTilesUniqueIdentifier = null;
+    constructor(id, colorsRamp = defaultColorsRamp) {
+        this.globe = null;
+        this.gl = null;
+        this.contextTextWriter = null;
+        this.id = id;
+        this.colorsRamp = colorsRamp;
+        this.arcPlugin = new ArcOnTerrainPlugin(id + "_arc_plugin", {
+            variativeColorsOn: true,
+            defaultHeightFromGroundIn3D: 0,
+        });
+    }
+    init(globe, gl) {
+        this.globe = globe;
+        this.gl = gl;
+        this.contextTextWriter = new ContextTextWriter4(globe, (item) => { return [item]; }, (item) => { return item.key; }, (zoomLevel) => (item) => {
+            return {
+                opacityMultiplier: 1,
+                sizeMultiplier: 1
+            };
+        });
+        this.arcPlugin.init(globe, gl);
+    }
+    draw3D(projectionMatrix, modelViewMatrix, transPosition) {
+        // if (this.globe.api_IsScreenMoving()) {
+        this._prepareArcInputs();
+        // }
+        this.arcPlugin.draw3D();
+        this.contextTextWriter.draw();
+    }
+    free() {
+        this.arcPlugin.free();
+    }
+    _prepareArcInputs() {
+        // const drawnTiles = filterTilesInScreen(
+        //     this.globe.api_GetDrawedTilesInfo(),
+        //     this.globe
+        // );
+        const drawnTiles = this.globe.api_GetVisibleTilesInfo();
+        let maxLevel = 0;
+        let minLevel = Number.MAX_VALUE;
+        const tileMap = new Map();
+        for (const tile of drawnTiles) {
+            if (tile.level > maxLevel) {
+                maxLevel = tile.level;
+            }
+            if (tile.level < minLevel) {
+                minLevel = tile.level;
+            }
+            if (!tileMap.has(tile.level)) {
+                tileMap.set(tile.level, []);
+            }
+            tileMap.get(tile.level).push(tile);
+        }
+        let tilesUniqueId = "";
+        for (let level = minLevel; level <= maxLevel; level++) {
+            const tiles = tileMap.get(level);
+            if (!tiles)
+                continue;
+            tilesUniqueId += `L${level}_C${tiles.length}_`;
+        }
+        if (tilesUniqueId === this._lastTilesUniqueIdentifier)
+            return;
+        this._lastTilesUniqueIdentifier = tilesUniqueId;
+        const levelRange = maxLevel - minLevel;
+        const colors = this._interpolateColors(levelRange);
+        this.arcPlugin.deleteAll();
+        for (let level = maxLevel; level >= minLevel; level--) {
+            const tiles = tileMap.get(level);
+            if (!tiles)
+                continue;
+            const colorIndex = level - minLevel;
+            const color = colors[colorIndex];
+            const arcInputs = tileToArcInputs(tiles, color);
+            this.arcPlugin.insertBulk(arcInputs);
+        }
+        // drawMergedBBoxes:
+        const mergedTiles = mergeMeshes(drawnTiles, 12, 5, 4, this.globe);
+        const color = [255, 255, 0, 255]; // Yellow
+        const arcMergedInputs = mergedTiles.map(mergedTile => mergedTileToArcInputs(mergedTile, color)).flat();
+        this.arcPlugin.insertBulk(arcMergedInputs);
+        const contextWriterInputs = tilesToContextWriter4Inputs(drawnTiles);
+        this.contextTextWriter.clear();
+        this.contextTextWriter.insertTextBulk(contextWriterInputs);
+    }
+    _interpolateColors(maxValue) {
+        let colors = [];
+        let colorRampIndex = 0;
+        for (let i = 0; i <= maxValue; i++) {
+            const t = i / maxValue;
+            while (colorRampIndex < this.colorsRamp.length - 1 && t > this.colorsRamp[colorRampIndex + 1][0]) {
+                colorRampIndex++;
+            }
+            const [t0, color0] = this.colorsRamp[colorRampIndex];
+            const [t1, color1] = this.colorsRamp[Math.min(colorRampIndex + 1, this.colorsRamp.length - 1)];
+            const localT = (t - t0) / (t1 - t0);
+            const r = Math.round(color0[0] + (color1[0] - color0[0]) * localT);
+            const g = Math.round(color0[1] + (color1[1] - color0[1]) * localT);
+            const b = Math.round(color0[2] + (color1[2] - color0[2]) * localT);
+            // const a = Math.round(color0[3] + (color1[3] - color0[3]) * localT);
+            colors.push([r, g, b, 255]);
+        }
+        return colors;
+    }
+}

package/jest.config.js

@@ -1,6 +1,7 @@
-module.exports = {
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-    testMatch: ['**/tests/**/*.test.ts'],
-    moduleFileExtensions: ['ts', 'js'],
-}
+"use strict";
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    testMatch: ['**/tests/**/*.test.ts'],
+    moduleFileExtensions: ['ts', 'js'],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",