@pirireis/webglobeplugins 0.8.5 → 0.8.6

package/package.json

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

package/point-tracks/plugin.js

@@ -33,7 +33,7 @@ class PointTracksPlugin {
         this._opacity = opacity;
         this.program = null
         this._lastWH = { w: 0, h: 0 };
-        this._focusParams = { on: false, length: 0, elementBuffer: null };
+        this._focusParams = { on: false, length: 0, elementBuffer: null, trackIDs: [] };
         this.pointSizes = {
             pointSize,
             selectionPointFilling,
@@ -164,6 +164,8 @@ class PointTracksPlugin {
         }
         const { _bufferManagersMap, _bufferOrchestrator } = this;
         _bufferOrchestrator.insertBulk(flattenedPoints, _bufferManagersMap);
+        this._refillFocus();
+
         this.globe?.DrawRender();
 
     }
@@ -173,6 +175,7 @@ class PointTracksPlugin {
         const capacity = 100
         this._bufferOrchestrator?.flush({ capacity });
         this._bufferManagersMap.forEach(({ bufferManager }) => bufferManager.resetWithCapacity(capacity));
+        this._turnOffFocus();
         this._tracksToPointsMap.clear();
         this.globe?.DrawRender();
     }
@@ -190,20 +193,11 @@ class PointTracksPlugin {
         );
         this._tracksToPointsMap.delete(trackID);
         this._redraw = true;
+        this._refillFocus();
+
         this.globe?.DrawRender();
     }
 
-    focusTracks(trackIDs = null) {
-        if (!this.globe) return;
-        if (!trackIDs) {
-            this._focusParams.on = false;
-            this.globe?.DrawRender();
-            return;
-        }
-
-        this._focusParams.on = this._fillElementBuffer(trackIDs);
-        this.globe.DrawRender();
-    }
 
     /**
      * @param {string} trackID
@@ -216,9 +210,25 @@ class PointTracksPlugin {
             _bufferManagersMap
         );
         this._deletePointsFromTracksMap(trackID, pointIDs);
+        this._refillFocus();
         this.globe?.DrawRender();
     }
 
+    focusTracks(trackIDs = null) {
+        if (!this.globe) return;
+        if (!trackIDs) {
+            this._focusParams.on = false;
+            this.globe?.DrawRender();
+            return;
+        }
+        this._focusParams.on = this._fillElementBuffer(trackIDs);
+        if (!this._focusParams.on) {
+            this._turnOffFocus();
+        }
+        this.globe.DrawRender();
+    }
+
+
     // GLOBE API METHODS
 
     free() {
@@ -293,6 +303,11 @@ class PointTracksPlugin {
         }
     }
 
+    _refillFocus() {
+        if (this._focusParams.on) {
+            this.focusTracks(this._focusParams.trackIDs);
+        }
+    }
 
     _deletePointsFromTracksMap(trackID, pointIDs) {
         const trackSet = this._tracksToPointsMap.get(trackID);
@@ -312,15 +327,24 @@ class PointTracksPlugin {
 
     }
 
+    _turnOffFocus() {
+        const { gl } = this;
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._focusParams.elementBuffer);
+        gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, new Uint32Array([]), gl.STATIC_DRAW);
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
+        this._focusParams.length = 0;
+        this._focusParams.on = false;
+    }
 
     _fillElementBuffer(trackIDs) {
 
         let length = 0;
         const indexes = [];
-
+        const foundTracks = []
         for (const trackID of trackIDs) {
             const pointSet = this._tracksToPointsMap.get(trackID);
             if (!pointSet) continue;
+            foundTracks.push(trackID);
             const points = Array.from(pointSet);
             for (const pointID of points) {
                 const key = keyMethod(trackID, pointID);
@@ -329,6 +353,7 @@ class PointTracksPlugin {
                 length++;
             }
         }
+        this._focusParams.trackIDs = foundTracks;
         this._focusParams.length = length;
         if (length === 0) {
             return false;

package/programs/point-on-globe/square-pixel-point.js

@@ -79,6 +79,7 @@ class PointOnGlobeProgram {
             pointSize: gl.getUniformLocation(program, "pointSize"),
         }
 
+        // eslint-disable-next-line
         { // assign opacity
             this._lastOpacity = 1.0;
             this._lastPointSize = 2.0;
@@ -92,13 +93,13 @@ class PointOnGlobeProgram {
             gl.uniform1i(this.uniforms.hovered_vertexID, this._lastHoveredID);
             gl.useProgram(currentProgram);
         }
-
+        // eslint-disable-next-line
         { // assign attribute locations
             gl.bindAttribLocation(program, 0, "pos3D");
             gl.bindAttribLocation(program, 1, "pos2D");
             gl.bindAttribLocation(program, 2, "rgba");
         }
-
+        // eslint-disable-next-line
         { // arrange camera uniform block
             this.cameraBlockBingingPoint = 0;
             this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
@@ -112,17 +113,19 @@ class PointOnGlobeProgram {
         const { gl } = this;
         const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
-
+        // eslint-disable-next-line
         {
             gl.bindBuffer(gl.ARRAY_BUFFER, pos3DBuffer);
             gl.enableVertexAttribArray(0);
             gl.vertexAttribPointer(0, 3, gl.FLOAT, false, 0, 0);
         }
+        // eslint-disable-next-line
         {
             gl.bindBuffer(gl.ARRAY_BUFFER, pos2DBuffer);
             gl.enableVertexAttribArray(1);
             gl.vertexAttribPointer(1, 2, gl.FLOAT, false, 0, 0);
         }
+        // eslint-disable-next-line
         {
             gl.bindBuffer(gl.ARRAY_BUFFER, rgbaBuffer);
             gl.enableVertexAttribArray(2);

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

@@ -35,7 +35,7 @@ export class BufferManager {
 
     deleteBulk(offsets) {
         const { gl, buffer, itemSize } = this;
-        const emptyBlock = new Float32Array(this.itemSize).fill(0)
+        const emptyBlock = new Float32Array(this.itemSize).fill(NaN)
         const offsetMultiplier = itemSize * 4;
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         for (let offset of offsets) {