@pirireis/webglobeplugins 1.2.22 → 1.2.24

package/package.json

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

package/semiplugins/shape-on-terrain/terrain-polygon/data/master-worker.js

@@ -178,7 +178,6 @@ function sendToSubWorker(wrapper) {
         wrapper.lastBBOXData === null &&
         !_stateChanged)
         return false;
-    _stateChanged = false;
     wrapper.inProgress = true;
     wrapper.worker.postMessage({
         pickableState: _pickableState,
@@ -195,11 +194,16 @@ function triggerAllWorkers() {
     // If a batch is already running, do not start another one.
     if (_batchInFlight)
         return;
+    const shouldClearStateChanged = _stateChanged;
     let dispatched = 0;
     for (const w of _workers) {
         if (sendToSubWorker(w))
             dispatched++;
     }
+    // Only clear after we've attempted dispatching to all workers,
+    // so every worker can observe the new state.
+    if (shouldClearStateChanged)
+        _stateChanged = false;
     // Start barrier only if we actually dispatched work.
     if (dispatched > 0) {
         _batchInFlight = true;

package/semiplugins/shape-on-terrain/terrain-polygon/data/worker.js

@@ -6,6 +6,9 @@ const cache = new Cache();
 let _pickableState = false;
 let _arcState = false;
 let _variativeColorsOnState = false;
+// Keep the last bboxes so inserts/deletes can tessellate immediately
+// without requiring a new camera move / tile update message.
+let _lastBboxes = null;
 let showThreshold = 0;
 const NO_COLOR_ALPHA = 255;
 const MAX_ALPHA_VALUE = 254;
@@ -54,23 +57,24 @@ self.onmessage = (event) => {
         // Update bboxes if provided
         if (bboxes) {
             cache.setBBOXes(bboxes);
+            _lastBboxes = bboxes;
             if (bboxes.length > 0) {
                 showThreshold = zoomLevelShowThreshold(bboxes[0].zoom, 0.05);
             }
         }
         const trianglesInView = cache.search();
         const results = [];
-        // Convert bbox to BBoxZoom format for partialTessellation
-        // @ts-ignore
-        const bboxZooms = bboxes
-            ? bboxes.map((b) => ({
-                bbox: {
-                    min: [b.minX, b.minY],
-                    max: [b.maxX, b.maxY],
-                },
-                zoom: b.zoom,
-            }))
-            : [];
+        // Convert bbox to BBoxZoom format for partialTessellation.
+        // IMPORTANT: inserts/deletes may arrive without `bboxes`, but we still
+        // want to tessellate against the last-known visible tiles.
+        const bboxesForTessellation = bboxes ?? _lastBboxes ?? [];
+        const bboxZooms = bboxesForTessellation.map((b) => ({
+            bbox: {
+                min: [b.minX, b.minY],
+                max: [b.maxX, b.maxY],
+            },
+            zoom: b.zoom,
+        }));
         let counter = 0;
         let indexCounter = 0;
         let arcCounter = 0;

package/semiplugins/shape-on-terrain/terrain-polygon/terrain-polygon.js

@@ -15,6 +15,7 @@ export class TerrainPolygonSemiPlugin {
         pickable: false,
         pickablePause: false,
         variativeColorsOn: false,
+        useDepthTestOnExceedingTiltThresholdAngle: false,
         polygonStyle: {
             defaultColor: [0.5, 0.5, 1, 1],
             changeColorOnHover: true,
@@ -249,6 +250,13 @@ export class TerrainPolygonSemiPlugin {
         this._uboForRealEdgeArcs?.updateSingle("opacity", this._effectiveOpacity("edgeArc"));
         this.globe.DrawRender();
     }
+    setUseDepthTestOnExceedingTiltThresholdAngle(state) {
+        const oldState = this._options.useDepthTestOnExceedingTiltThresholdAngle;
+        if (oldState === state)
+            return;
+        this._options.useDepthTestOnExceedingTiltThresholdAngle = state;
+        this.globe.DrawRender();
+    }
     setChangeColorOnHoverState(state, target = "polygon") {
         const oldState = this._options[`${target}Style`].changeHoverColor;
         if (oldState === state)
@@ -375,6 +383,9 @@ export class TerrainPolygonSemiPlugin {
         }
     }
     _useDepth() {
+        if (!this._options.useDepthTestOnExceedingTiltThresholdAngle) {
+            return false;
+        }
         const { Tilt } = this.globe.api_GetCurrentLookInfo();
         const useDepth = Tilt > DEPTH_START_ANGLE;
         if (this._lastPickedPolygon !== null && useDepth) {
@@ -384,10 +395,14 @@ export class TerrainPolygonSemiPlugin {
         }
         return useDepth;
     }
-    getDepthStartAngle() {
+    getExceedingTiltThresholdAngle() {
         return DEPTH_START_ANGLE;
     }
     draw3D() {
+        if (!this.globe) {
+            console.warn("TerrainPolygonSemiPlugin.draw3D called before init");
+            return;
+        }
         const gl = this.globe.gl;
         const useDepth = this._useDepth();
         gl.enable(gl.BLEND);
@@ -472,28 +487,6 @@ export class TerrainPolygonSemiPlugin {
         }
         return targetUBO;
     }
-    // setPickableState(state: boolean): void {
-    //     throw new Error("setPickableState is buggy. use setPausePickableState instead.");
-    //     const oldState = this._options.pickable;
-    //     if (oldState === state) return;
-    //     if (oldState === false && state === true) {
-    //         this._pickIndexBuffer = this.globe.gl.createBuffer();
-    //         this._uboHandler.updateSingle("private_isPickedOn", new Float32Array([1.0]));
-    //         this._uboHandler.updateSingle("hoverColor", new Float32Array(this._options.polygonStyle.hoverColor));
-    //         this._pickerDisplayer = new PickerDisplayer(this.globe, "R32I");
-    //     } else if (oldState === true && state === false) {
-    //         this.globe.gl.deleteBuffer(this._pickIndexBuffer!);
-    //         this._pickIndexBuffer = null;
-    //         this._uboHandler.updateSingle("private_isPickedOn", new Float32Array([0.0]));
-    //         this._uboHandler.updateSingle("private_pickedIndex", new Float32Array([-1]));
-    //         this._pickerDisplayer?.free();
-    //         this._pickerDisplayer = null;
-    //         this._lastPickedPolygon = null;
-    //     }
-    //     this._options.pickable = state;
-    //     this._workerContact.setPickableState(state);
-    //     this.globe.DrawRender();
-    // }
     sagUst4W(long, lat, rowSize, colSize, cellWidth = 100, cellHeight = 100, rotationAngle = 0) {
         const globe = this.globe;
         const data = calculateAndSetCoordinates(globe, "sol_ust", rowSize, colSize, 0, 0, 0, 0, cellWidth, cellHeight, [0.75, 0, 0, 1], rotationAngle, { long, lat });