@pirireis/webglobeplugins 0.3.6 → 0.3.8

package/util/account/single-attribute-buffer-management/buffer-orchestrator.js

@@ -102,6 +102,8 @@
  
  */
 
+const EXTRA_SIZE = 10;
+
 export class BufferOrchestrator {
 
     constructor({ capacity = 10 } = {}) {
@@ -172,7 +174,7 @@ export class BufferOrchestrator {
         for (const [key, { bufferManager }] of bufferManagersMap) {
             bufferManager.deleteBulk(offsets);
         }
-        console.log("deleteBulk after item size", this.offsetMap.size);
+        //console.log("deleteBulk after item size", this.offsetMap.size);
     }
 
 
@@ -196,9 +198,9 @@ export class BufferOrchestrator {
     autoExtendBuffers(itemsLength, bufferManagersMap) {
         if (itemsLength <= this.emptySpace) return;
         const newCapacity = this.length + itemsLength;
-        console.log("autoExtendBuffers", "item L", itemsLength, "E space", this.emptySpace, "cap", this.capacity, "length", this.length, 'new Cap', newCapacity);
+        //console.log("autoExtendBuffers", "item L", itemsLength, "E space", this.emptySpace, "cap", this.capacity, "length", this.length, 'new Cap', newCapacity);
         for (const [key, { bufferManager }] of bufferManagersMap) {
-            console.log("length", this.length, "newCapacity", newCapacity);
+            //console.log("length", this.length, "newCapacity", newCapacity);
             bufferManager.extendBuffer(this.length, newCapacity);
         }
         this._capacity = newCapacity;
@@ -207,23 +209,23 @@ export class BufferOrchestrator {
 
     defrag(bufferManagers, bufferKeys) { // TODO defrag and leave some empty space
         const offsetMap = this.offsetMap;
-        console.log("defrag size", offsetMap.size, "cap", this.capacity, "length", this.length);
+        const newCapacity = offsetMap.size + EXTRA_SIZE;
         if (bufferKeys) {
             for (const key of bufferKeys) {
                 const offset = offsetMap.get(key);
                 if (offset !== undefined) {
                     for (const [key, { bufferManager }] of bufferManagers) {
-                        bufferManager.defrag([offset], this.length, offsetMap.size);
+                        bufferManager.defrag([offset], this.length, newCapacity);
                     }
                 }
             }
         } else {
             for (const [key, { bufferManager }] of bufferManagers) {
-                bufferManager.defrag(offsetMap.values(), this.length, offsetMap.size);
+                bufferManager.defrag(offsetMap.values(), this.length, newCapacity);
             }
         }
         this._defrag();
-        this._length = this._capacity = offsetMap.size;
+        this._length = this._capacity = newCapacity;
         this.tombstoneOffsets = [];
     }
 
@@ -233,7 +235,7 @@ export class BufferOrchestrator {
         const newOffsetMap = new Map();
         let newOffset = 0;
         for (const [key, offset] of this.offsetMap) {
-            console.log("defrag", key, offset, newOffset);
+            //console.log("defrag", key, offset, newOffset);
             newOffsetMap.set(key, newOffset++);
         }
         this.offsetMap = newOffsetMap

package/util/geometry/geodatafromtexture.js

@@ -27,10 +27,10 @@ export class GeoDataFromTexture {
     getFloored(lat, long) {
         const x = (long - this.bbox[0]) / this._longRatio;
         const y = (lat - this.bbox[1]) / this._latRatio;
-        console.log(x + " = (" + long + " - " + this.bbox[0] + ") / " + this._longRatio);
-        console.log(y + " = (" + lat + " - " + this.bbox[1] + ") / " + this._latRatio);
+        //console.log(x + " = (" + long + " - " + this.bbox[0] + ") / " + this._longRatio);
+        //console.log(y + " = (" + lat + " - " + this.bbox[1] + ") / " + this._latRatio);
         const index = Math.floor(y) * this.width + Math.floor(x);
-        console.log({ index, x, y, w: this.width, h: this.height, "total": this.width * this.height });
+        //console.log({ index, x, y, w: this.width, h: this.height, "total": this.width * this.height });
         return this.textureData[index];
     }
 

package/util/jshelpers/timefilters.js

@@ -9,7 +9,7 @@ function instantDebounce(func, delay) {
             if (runAtEnd) {
                 func(...lastArgs);
                 lastArgs = null;
-                console.log("processed with delay")
+                // console.log("processed with delay")
                 runAtEnd = false;
             }
             timeout = null;
@@ -23,7 +23,7 @@ function instantDebounce(func, delay) {
             return;
         } else {
             func(...args);
-            console.log("processed instantly")
+            // console.log("processed instantly")
             timeout = timeoutMethod();
         }
     }

package/util/programs/texturetoglobe.js

@@ -7,7 +7,7 @@ import { latLongBboxtoPixelXYBbox } from "..";
 
 
 class TextureToGlobeProgram {
-    constructor (gl, globe) {
+    constructor(gl, globe) {
         this.globe = globe;
         this.gl = gl;
         this._is3D = true;
@@ -19,7 +19,7 @@ class TextureToGlobeProgram {
     }
 
     _initUniforms() {
-        
+
         const { gl, _programWrapper } = this;
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(_programWrapper.program);
@@ -32,7 +32,7 @@ class TextureToGlobeProgram {
         gl.uniform1f(_programWrapper.u_is3D, 1.0);
         gl.uniform1f(_programWrapper.height, 0.0);
         gl.useProgram(currentProgram);
-        
+
     }
 
     _createProgramWrapper() {
@@ -94,7 +94,7 @@ class TextureToGlobeProgram {
 
         const program = createProgram(gl, vertexSource, fragmentSource);
         const vao = gl.createVertexArray();
-        
+
         const buffer = gl.createBuffer();
         gl.bindVertexArray(vao);
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
@@ -104,7 +104,7 @@ class TextureToGlobeProgram {
             1, 1,
             0, 1
         ]), gl.STATIC_DRAW);
-        const a_position =- gl.getAttribLocation(program, 'a_position');
+        const a_position = - gl.getAttribLocation(program, 'a_position');
         gl.enableVertexAttribArray(a_position);
         gl.vertexAttribPointer(a_position, 2, gl.FLOAT, false, 0, 0);
         gl.bindVertexArray(null);
@@ -123,8 +123,8 @@ class TextureToGlobeProgram {
         };
     }
 
-    draw( modelViewMatrix, projectionMatrix, transPos, texture) {
-        console.log('draw')
+    draw(modelViewMatrix, projectionMatrix, transPos, texture) {
+        // console.log('draw')
         const { gl, _programWrapper, _is3D } = this;
         gl.useProgram(_programWrapper.program);
         gl.bindVertexArray(_programWrapper.vao);
@@ -138,12 +138,12 @@ class TextureToGlobeProgram {
             const mapWH = this.globe.api_GetCurrentWorldWH();
             gl.uniform2f(_programWrapper.u_mapWH, mapWH.width, mapWH.height);
         }
-    
+
         gl.drawArrays(gl.TRIANGLE_FAN, 0, 4);
         gl.drawArrays(gl.POINTS, 0, 4);
     }
-    
-    setBBox( minx, maxx, miny, maxy) {
+
+    setBBox(minx, maxx, miny, maxy) {
         const { gl, _programWrapper } = this;
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(_programWrapper.program);
@@ -155,7 +155,7 @@ class TextureToGlobeProgram {
         gl.useProgram(currentProgram);
     }
 
-    setLatLongBBox(minx, maxx, miny, maxy){
+    setLatLongBBox(minx, maxx, miny, maxy) {
         const bboxMatrix = latLongBboxtoPixelXYBbox(minx, miny, maxx, maxy);
         const { gl, _programWrapper } = this;
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
@@ -165,7 +165,7 @@ class TextureToGlobeProgram {
     }
 
 
-    setScreenWH(){
+    setScreenWH() {
         const { gl, _programWrapper, globe } = this;
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(_programWrapper.program);
@@ -179,7 +179,7 @@ class TextureToGlobeProgram {
         this.setScreenWH();
     }
 
-    setGeometry( ){
+    setGeometry() {
         const { gl, globe, _programWrapper } = this;
         this._is3D = globe.api_GetCurrentGeometry() === 0;
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
@@ -189,15 +189,15 @@ class TextureToGlobeProgram {
         this.resize();
     }
 
-    free(){
+    free() {
         window.removeEventListener('resize',
-        this._resizeHandler, true);
+            this._resizeHandler, true);
     }
 
-    _resizeEventHandler(){
+    _resizeEventHandler() {
         this.resize();
     }
 
 }
 
-export {TextureToGlobeProgram};
+export { TextureToGlobeProgram };

package/util/shaderfunctions/geometrytransformations.js

@@ -112,7 +112,7 @@ vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float
 
 export const circleLimpFromLongLatRadCenterMercatorRealDistance = PI + `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle){
-    float ang = angle + PI / 2.0; // this is there because rest of the program is in angle 0 is +x axis orientatation
+    float ang = angle + PI / 2.0; // this is there because the other methods are implemented in, angle 0 is +x axis orientatation
     float r =  radius / R;
     float sin_lat =  sin( center.y) * cos(r) + cos(center.y)*sin(r)* cos(ang);
     float lat = asin(sin_lat);

package/write-text/context-text.js

@@ -22,6 +22,7 @@ export class ContextTextWriter {
         this.doDraw = doDraw;
     }
 
+
     setDoDraw(bool) {
         this.doDraw = bool;
     }
@@ -42,8 +43,9 @@ export class ContextTextWriter {
     draw() {
         if (!this.doDraw) return;
         const { globe, style, itemMap } = this;
-        const { textFont, opacity } = style;
-        for (const [key, { lat, long, text }] of itemMap) {
+        const { textFont, opacity: opacity_ } = style;
+
+        for (const [key, { lat, long, text, opacity = null }] of itemMap) {
             const { x, y } = globe.api_GetScreenPointFromGeo(
                 {
                     long: long,
@@ -52,17 +54,30 @@ export class ContextTextWriter {
                 },
                 style.zMode === CSZMode.Z_MSL,
             );
-
-            globe.api_DrawContextTextMultiLine(text, textFont, opacity, { x, y });
+            const o = opacity === null ? opacity_ : opacity * opacity_;
+            globe.api_DrawContextTextMultiLine(text, textFont, o, { x, y });
         }
     }
 
 
-    insertText(key, lat, long, text) {
+    insertText(key, lat, long, text,) { // TODO: Make it more generic
         this.itemMap.set(key, { lat, long, text });
     }
 
 
+    updateOpacityOfItem(key, opacity) {
+        this.itemMap.get(key).opacity = opacity;
+    }
+
+    updateOpacityBulk(items, keyAdaptor, valueAdaptor) {
+        for (const item of items) {
+            const key = keyAdaptor(item);
+            const opacity = valueAdaptor(item);
+            const data = this.itemMap.get(key)
+            data.opacity = opacity;
+        }
+    }
+
     updateText(key, text) {
         const item = this.itemMap.get(key);
         item.text = text;
@@ -94,7 +109,11 @@ export class ContextTextWriter {
         }
     }
 
+
+
     clear() {
         this.itemMap.clear();
     }
-}
+}
+
+