@pirireis/webglobeplugins 0.16.7 → 0.17.1

package/compass-rose/compass-text-writer.js

@@ -1,17 +1,5 @@
-import { CSZMode, CSMeasureTextPositionTypes } from "@pirireis/webglobe";
-// const defaultStyle = {
-//     textFont: {
-//         name: 'Arial',
-//         textColor: '#FFFFFF', // beyaz
-//         hollowColor: '#000000', // siyah
-//         size: 12, // piksel
-//         hollow: true,
-//         bold: true,
-//         italic: false,
-//     },
-//     opacity: 1.0,
-//     zMode: CSZMode.Z_GROUND_PERVERTEX,
-// }
+// filepath: d:\webglobeplugins\webglobePlugin\src\webglobeplugins\compass-rose\compass-text-writer.ts
+import { CSMeasureTextPositionTypes } from "@pirireis/webglobe";
 /**
  * TODOs:
  * 1) update all if initials change (propably need a context and a callback to iterate over data)
@@ -21,19 +9,32 @@ import { CSZMode, CSMeasureTextPositionTypes } from "@pirireis/webglobe";
 const yGapFit = -2;
 const xGapFit = -5;
 export class PixelPaddingCompassTextWriter {
+    globe;
+    itemMap;
+    font;
+    northFont;
+    doDraw;
+    angle;
+    angles;
+    texts;
+    positions;
+    _lastNorthAngle;
+    offsets;
+    keyAdaptor;
+    opacity;
     constructor(globe, { font = {
         name: 'Arial',
-        textColor: '#FFFFFF', // beyaz
-        hollowColor: '#000000', // siyah
-        size: 12, // piksel
+        textColor: '#FFFFFF',
+        hollowColor: '#000000',
+        size: 12,
         hollow: true,
         bold: true,
         italic: false,
     }, northFont = {
         name: 'Arial',
-        textColor: '#BB0000', // beyaz
-        hollowColor: '#000000', // siyah
-        size: 14, // piksel
+        textColor: '#BB0000',
+        hollowColor: '#000000',
+        size: 14,
         hollow: true,
         bold: true,
         italic: false,
@@ -56,17 +57,16 @@ export class PixelPaddingCompassTextWriter {
                 this.positions.push(null);
             }
             this.angles.push(currentAngle);
-            if (currentAngle == 0) {
+            if (currentAngle === 0) {
                 this.texts.push("K");
             }
             else {
-                // to string 3 chars fill left with 0
                 this.texts.push(currentAngle.toString().padStart(3, '0'));
             }
             currentAngle += this.angle;
         }
         this._lastNorthAngle = globe.api_GetCurrentLookInfo()["NorthAng"] * (Math.PI / 180);
-        this.offsets = this.__offset(this._lastNorthAngle);
+        this.offsets = this.__offset();
     }
     setKeyAdaptor(adaptor) {
         this.keyAdaptor = adaptor;
@@ -86,7 +86,6 @@ export class PixelPaddingCompassTextWriter {
     _checkSetOffsets() {
         const { globe } = this;
         const newAngle = globe.api_GetCurrentLookInfo()["NorthAng"] * (Math.PI / 180);
-        ;
         if (newAngle !== this._lastNorthAngle) {
             this._lastNorthAngle = newAngle;
             this.offsets = this.__offset();
@@ -96,42 +95,49 @@ export class PixelPaddingCompassTextWriter {
         if (!this.doDraw)
             return;
         const { globe, font, opacity: opacity_, northFont, itemMap, texts, angles, positions } = this;
-        this._checkSetOffsets(); //  zMode: CSZMode.Z_GROUND_PERVERTEX,
+        this._checkSetOffsets();
         const offsets = this.offsets;
         for (const [key, { center, radius, opacity = null }] of itemMap) {
-            const o = opacity === null ? opacity_ : opacity * opacity_;
-            if (center.x !== null && center.y !== null) {
+            const o = opacity === null ? (opacity_ ?? 1.0) : opacity * (opacity_ ?? 1.0);
+            if (center && radius !== undefined) {
+                const { x, y } = center;
+                if (x === null || y === null)
+                    continue;
                 offsets.forEach(({ offsetX, offsetY }, i) => {
                     const text = texts[i];
                     const angle = angles[i];
                     font.position = positions[i];
                     if (angle === 0) {
-                        globe.api_DrawContextTextMultiLine(text, northFont, o, { x: center.x + offsetX * radius + xGapFit, y: center.y + offsetY * radius + yGapFit });
+                        globe.api_DrawContextTextMultiLine(text, northFont, o, { x: x + offsetX * radius + xGapFit, y: y + offsetY * radius + yGapFit });
                     }
                     else {
-                        globe.api_DrawContextTextMultiLine(text, font, o, { x: center.x + offsetX * radius + xGapFit, y: center.y + offsetY * radius + yGapFit });
+                        globe.api_DrawContextTextMultiLine(text, font, o, { x: x + offsetX * radius + xGapFit, y: y + offsetY * radius + yGapFit });
                     }
                 });
             }
         }
     }
-    insertTextItem(key, x, y, radius = undefined) {
+    insertTextItem(key, x, y, radius) {
         const item = this.getItem(key);
         item.center = { x, y };
         if (radius === undefined)
             return;
-        if (item.radius != undefined && item.radius === radius)
+        if (item.radius !== undefined && item.radius === radius)
             return;
         item.radius = radius;
     }
     getItem(key) {
-        if (!this.itemMap.has(key))
+        if (!this.itemMap.has(key)) {
             this.itemMap.set(key, {});
+        }
         return this.itemMap.get(key);
     }
     __calculateOffset(angle) {
         const rAngle = (angle - 90) * (Math.PI / 180);
-        return { offsetX: Math.cos(rAngle + this._lastNorthAngle), offsetY: Math.sin(rAngle + this._lastNorthAngle) };
+        return {
+            offsetX: Math.cos(rAngle + this._lastNorthAngle),
+            offsetY: Math.sin(rAngle + this._lastNorthAngle)
+        };
     }
     __offset() {
         const angle = this.angle;

package/constants.js

@@ -1,3 +1,6 @@
+export const CSRenderPassPluginKeys = ["supportNormalPass",
+    "supportSelectedPass",
+    "supportEditingPass"];
 export const GLOBE_DEFAULT_MIN_LOD = 2;
 export const GLOBE_DEFAULT_MAX_LOD = 25;
 export const POLE2 = 12756274.0;

package/{util/heatwavedatamanager → heatwave}/datamanager.js

@@ -2,7 +2,7 @@
  * todo:
  * data must be processed before being set to the cache
  */
-export default class DataManager {
+export class DataManager {
     /**
      *
      * @param {Array<number>} timeEpocs | array of time epocs

package/heatwave/{plugins/heatwaveglobeshell.js → heatwave.js}

@@ -1,7 +1,9 @@
-import { getColorRampModed, DataManager, } from "../../util/index";
-import { TexturePointSampler } from "../../util/heatwavedatamanager/texture-point-sampler";
-import { GlobeShellWiggle, Float2LegendWithRatio } from "../../programs";
-import { opacityCheck } from "../../util/check/typecheck";
+import { getColorRampModed } from "../util/webglobjectbuilders";
+import { DataManager } from "./datamanager";
+import { TexturePointSampler } from "./texture-point-sampler";
+import { BBOXGlobeShell } from "../semiplugins/shell/bbox-renderer";
+import { Float2LegendWithRatio } from "../programs/float2legendwithratio";
+import { opacityCheck } from "../util/check/typecheck";
 /**
  * @param id : string
  * @param dataManager : DataManager
@@ -9,7 +11,7 @@ import { opacityCheck } from "../../util/check/typecheck";
  * @param dataWidthHeight : {width: number, height: number}
  * @param options : {bbox: number[], minMaxEdges: {min: number, max: number}, escapeValue: number, resolution: number[], meshPartition: number[]}
  */
-export default class HeatWaveGlobeShellPlugin {
+export class HeatWavePlugin {
     constructor(id, dataManager, colorRampData, dataWidthHeight, { bbox = [-180, -90, 180, 90], minMaxEdges = { min: -99999, max: 99999 }, escapeValue = 99999, resolution = [2056, 2056], yFlip = true, } = {}) {
         this.id = id;
         this.dataManager = dataManager;
@@ -152,7 +154,7 @@ export default class HeatWaveGlobeShellPlugin {
         this.setEscapeValue(this._escapeValue);
     }
     _init(globe, gl) {
-        this.globeShell = new GlobeShellWiggle(gl, globe, {
+        this.globeShell = new BBOXGlobeShell(gl, globe, {
             minLon: this._bbox[0],
             minLat: this._bbox[1],
             maxLon: this._bbox[2],

package/heatwave/index.js

@@ -1,3 +1,5 @@
-import HeatWavePlugin from './plugins/heatwaveglobeshell';
-import { IsobarRasterToVector } from './isobar/plugin';
-export { HeatWavePlugin, IsobarRasterToVector };
+import { DataManager } from "./datamanager.js";
+import { HeatWavePlugin } from "./heatwave.js";
+import { IsobarRasterToVector } from "./isobar.js";
+import { TexturePointSampler } from "./texture-point-sampler";
+export { DataManager, HeatWavePlugin, IsobarRasterToVector, TexturePointSampler };

package/heatwave/{isobar/plugin.js → isobar.js}

@@ -1,7 +1,8 @@
-import { ShapesOnGlobeProgram, latLongToPixelXY } from "../../util";
-import ContourMipmap, { scaleParameters } from "./quadtreecontours";
-import ObjectArrayLabels from "./objectarraylabels";
-import { isBoolean, opacityCheck } from "../../util/check/typecheck";
+import { DrawFromPixelCoords, } from "../util/programs/draw-from-pixel-coords";
+import { latLongToPixelXY } from "../util/geometry/index";
+import ContourMipmap, { scaleParameters } from "../Math/contour/quadtreecontours";
+import ObjectArrayLabels from "../write-text/objectarraylabels";
+import { isBoolean, opacityCheck } from "../util/check/typecheck";
 export class IsobarRasterToVector {
     /**
      * @typedef {Object} IsobarData
@@ -151,7 +152,7 @@ export class IsobarRasterToVector {
     init(globe, gl) {
         this.gl = gl;
         this.globe = globe;
-        this.program = new ShapesOnGlobeProgram(gl, globe, 'line_strip');
+        this.program = new DrawFromPixelCoords(gl, globe, 'line_strip');
         if (this._isLabelsOn) {
             this._createLabelsLayer();
             this._labelsLayer.addToMap();

package/{util/heatwavedatamanager → heatwave}/texture-point-sampler.js

@@ -1,4 +1,25 @@
-import PointCoordsMeta from "./pointcoordsmeta";
+class PointCoordsMeta {
+    _bbox;
+    _width;
+    _height;
+    _xRatio;
+    _yRatio;
+    constructor(bbox, width, height) {
+        this._bbox = bbox;
+        this._width = width;
+        this._height = height;
+        this._xRatio = this._width / (this._bbox[2] - this._bbox[0]);
+        this._yRatio = this._height / (this._bbox[3] - this._bbox[1]);
+    }
+    getFlooredIndex(long, lat) {
+        let x = (long - this._bbox[0]) * this._xRatio;
+        let y = (this._bbox[3] - lat) * this._yRatio;
+        x = x > 0 ? x - 1 : 0;
+        y = y > 0 ? y - 1 : 0;
+        const index = Math.floor(y) * this._width + Math.floor(x);
+        return index;
+    }
+}
 const pointObject = (long, lat, posIndex, callback) => {
     return { long, lat, posIndex, callback };
 };
@@ -103,7 +124,7 @@ export class TexturePointSampler {
     }
     flush(callEmptyCallback = false) {
         if (callEmptyCallback) {
-            for (const [key, { callback }] of this._pointObjects.entries()) {
+            for (const [, { callback }] of this._pointObjects.entries()) {
                 callback(null, null, null);
             }
         }
@@ -141,7 +162,7 @@ export class TexturePointSampler {
             }
         }
         else {
-            for (const [key, { callback }] of this._pointObjects.entries()) {
+            for (const [, { callback }] of this._pointObjects.entries()) {
                 callback(null, null, null);
             }
         }

package/investigation-tools/draw/tiles/adapters.js

@@ -0,0 +1,67 @@
+function boilerArcInput(start, end, color, key) {
+    return {
+        key: key,
+        start: start,
+        end: end,
+        color: color,
+        height: null,
+        msl: null
+    };
+}
+export function tileToArcInputs(tiles, color) {
+    if (tiles.length === 0)
+        return [];
+    const result = [];
+    // (alias) type ArcInput = {
+    //     key: string;
+    //     start: LongLat;
+    //     end: LongLat;
+    //     color: Color;
+    //     height?: Meter | null;
+    //     msl?: boolean | null;
+    // }
+    for (const tile of tiles) {
+        const tileKey = `tile_${tile.row}_${tile.column}`;
+        const bbox = tile.bbox;
+        // left side
+        result.push(boilerArcInput([bbox.ll.x, bbox.ll.y], [bbox.ll.x, bbox.ur.y], color, `${tileKey}_left`));
+        // top side
+        result.push(boilerArcInput([bbox.ll.x, bbox.ur.y], [bbox.ur.x, bbox.ur.y], color, `${tileKey}_top`));
+        // bottom side
+        result.push(boilerArcInput([bbox.ll.x, bbox.ll.y], [bbox.ur.x, bbox.ll.y], color, `${tileKey}_bottom`));
+        // right side
+        result.push(boilerArcInput([bbox.ur.x, bbox.ll.y], [bbox.ur.x, bbox.ur.y], color, `${tileKey}_right`));
+    }
+    return result;
+}
+export function mergedTileToArcInputs(mergedTile, color) {
+    const result = [];
+    const bbox = mergedTile.bbox;
+    // left side
+    result.push(boilerArcInput([bbox.ll.x, bbox.ll.y], [bbox.ll.x, bbox.ur.y], color, `${mergedTile.zoom}_left`));
+    // right side
+    result.push(boilerArcInput([bbox.ur.x, bbox.ll.y], [bbox.ur.x, bbox.ur.y], color, `${mergedTile.zoom}_right`));
+    // top side
+    result.push(boilerArcInput([bbox.ll.x, bbox.ur.y], [bbox.ur.x, bbox.ur.y], color, `${mergedTile.zoom}_top`));
+    // bottom side
+    result.push(boilerArcInput([bbox.ll.x, bbox.ll.y], [bbox.ur.x, bbox.ll.y], color, `${mergedTile.zoom}_bottom`));
+    return result;
+}
+export function tilesToContextWriter4Inputs(tiles) {
+    const result = [];
+    for (const tile of tiles) {
+        const tileKey = `L_${tile.level}_R${tile.row}_C${tile.column}`;
+        const centerLong = (tile.bbox.ll.x + tile.bbox.ur.x) / 2;
+        const centerLat = (tile.bbox.ll.y + tile.bbox.ur.y) / 2;
+        result.push({
+            key: tileKey,
+            long: centerLong,
+            lat: centerLat,
+            text: tileKey,
+            opacity: null,
+            angle: null,
+            position: 'center'
+        });
+    }
+    return result;
+}

package/investigation-tools/draw/tiles/tiles.js

@@ -0,0 +1,128 @@
+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_GetDrawedTilesInfo();
+        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);
+        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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.16.7",
+    "version": "0.17.1",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",
@@ -8,9 +8,11 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@pirireis/webglobe": "^6.2.22",
         "delaunator": "^5.0.1",
         "earcut": "^3.0.2",
         "rbush": "^4.0.1"
+    },
+    "peerDependencies": {
+        "@pirireis/webglobe": "^6.2.22"
     }
 }

package/programs/arrowfield/{object.js → arrow-field.js}

@@ -4,7 +4,7 @@
 import Logic from './logic';
 import { globeProgramCache } from '../programcache';
 import { longlatbbox2normalbbox } from "../util";
-export default class ArrowField {
+export class ArrowField {
     constructor(gl, globe, { minLon = -180, maxLon = 180, minLat = -90, maxLat = 90, height = 0, opacity = 1, color = [0.04, 0.2, 0.8], targetWidth = 100, targetHeight = 100, dataWidth = null, dataHeight = null, tailLengthRatio = 1, wingLengthRatio = 0.5, noDataValue = null,
     // maxMagnitude = null
      } = {}) {

package/programs/arrowfield/logic.js

@@ -1,4 +1,4 @@
-import { createProgram } from "../../util";
+import { createProgram } from "../../util/webglobjectbuilders";
 import { globeProgramCache } from "../programcache";
 import { CameraUniformBlockTotem } from "../totems";
 const arrowVertexShader = `#version 300 es

package/programs/data2legend/density-to-legend.js

@@ -1,4 +1,4 @@
-import { createProgram } from "../../util/";
+import { createProgram } from "../../util/webglobjectbuilders";
 import { noRegisterGlobeProgramCache } from "../programcache";
 const vs = `#version 300 es
 precision highp float;
@@ -38,34 +38,29 @@ class DensityToLegendProgram {
             legendTexture: gl.getUniformLocation(program, "u_legend_texture"),
             opacity: gl.getUniformLocation(program, "u_opacity"),
         };
-        { // assign attribute locations
-            gl.bindAttribLocation(program, 0, "a_position");
-        }
-        {
-            this.vao = gl.createVertexArray();
-            const a_positionLocation = gl.getAttribLocation(program, "a_position");
-            gl.bindVertexArray(this.vao);
-            const buffer = gl.createBuffer();
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
-                -1, -1,
-                1, -1,
-                1, 1,
-                -1, 1,
-            ]), gl.STATIC_DRAW);
-            gl.enableVertexAttribArray(a_positionLocation);
-            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
-            gl.bindVertexArray(null);
-            // gl.bindBuffer(gl.ARRAY_BUFFER, null);
-            this._buffer = buffer;
-        }
-        {
-            this._lastOpacity = 1;
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(this.uniforms.opacity, this._lastOpacity);
-            gl.useProgram(currentProgram);
-        }
+        // assign attribute locations
+        gl.bindAttribLocation(program, 0, "a_position");
+        this.vao = gl.createVertexArray();
+        const a_positionLocation = gl.getAttribLocation(program, "a_position");
+        gl.bindVertexArray(this.vao);
+        const buffer = gl.createBuffer();
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+            -1, -1,
+            1, -1,
+            1, 1,
+            -1, 1,
+        ]), gl.STATIC_DRAW);
+        gl.enableVertexAttribArray(a_positionLocation);
+        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
+        gl.bindVertexArray(null);
+        // gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        this._buffer = buffer;
+        this._lastOpacity = 1;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(program);
+        gl.uniform1f(this.uniforms.opacity, this._lastOpacity);
+        gl.useProgram(currentProgram);
     }
     draw(densityTexture, legendTexture, opacity) {
         const { gl, program, uniforms } = this;

package/programs/data2legend/point-to-density-texture.js

@@ -1,4 +1,4 @@
-import { createProgram } from "../../util/";
+import { createProgram } from "../../util/webglobjectbuilders";
 import { noRegisterGlobeProgramCache } from "../programcache";
 import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems/camerauniformblock";
 import { mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
@@ -41,22 +41,19 @@ class PointHeatmapProgram {
         this.uniforms = {
             pointSize: gl.getUniformLocation(this.program, "pointSize"),
         };
-        { // assign attribute locations 
-            gl.bindAttribLocation(program, 0, "position");
-        }
-        { // arrange camera uniform block
-            this.cameraBlockBingingPoint = 0;
-            this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBingingPoint);
-        }
-        { // last values
-            this._lastPointSize = 0;
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(this.uniforms.pointSize, this._lastPointSize);
-            gl.useProgram(currentProgram);
-        }
+        // assign attribute locations 
+        gl.bindAttribLocation(program, 0, "position");
+        // arrange camera uniform block
+        this.cameraBlockBingingPoint = 0;
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBingingPoint);
+        // last values
+        this._lastPointSize = 0;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(program);
+        gl.uniform1f(this.uniforms.pointSize, this._lastPointSize);
+        gl.useProgram(currentProgram);
     }
     createVAO(positionBuffer, vectorSize) {
         const gl = this.gl;

package/programs/float2legendwithratio/logic.js

@@ -1,5 +1,5 @@
-import { createProgram } from "../../util";
-export default class {
+import { createProgram } from "../../util/webglobjectbuilders";
+export class Float2LegentWithRatioProgram {
     constructor(gl) {
         this.gl = gl;
         this._width = 1;

package/programs/float2legendwithratio/object.js

@@ -1,4 +1,4 @@
-import Float2LegentWithRatioProgram from './logic';
+import { Float2LegentWithRatioProgram } from './logic';
 import { glProgramCache } from '../programcache';
 // Uniform Buffer Objects use this 
 export default class DataObject {

package/programs/helpers/{blender/program.js → blender.js}

@@ -1,4 +1,4 @@
-import { createProgram } from "../util";
+import { createProgram } from "../util/webglobeplugins";
 /**
  * Blends two float32textures with given ratio.
  */