@pirireis/webglobeplugins 1.2.12 → 1.2.14

package/Math/tessellation/triangle-tessellation.js

@@ -388,13 +388,16 @@ export function partialTessellation(triangleMeta, limits, innerCuts, calculateRe
                 // If this clipped segment is valid, generate points
                 if (segMinLon < segMaxLon - 1e-9) {
                     // Add the exact start and end points of the clipped segment
-                    addPoint(p0.longLat, p0.vec, p0.arcIndex);
-                    addPoint(p1.longLat, p1.vec, p1.arcIndex);
+                    if (inBBOX(p0.longLat, workBBox))
+                        addPoint(p0.longLat, p0.vec, p0.arcIndex);
+                    if (inBBOX(p1.longLat, workBBox))
+                        addPoint(p1.longLat, p1.vec, p1.arcIndex);
                     // Add fill points *between* them
-                    let currentLon = Math.ceil(segMinLon / lonStep) * lonStep;
-                    if (currentLon < segMinLon - 1e-9)
-                        currentLon += lonStep;
+                    let currentLon = Math.max(Math.ceil(segMinLon / lonStep) * lonStep, segMinLon);
+                    // if (currentLon < segMinLon - 1e-9) currentLon += lonStep;
                     while (currentLon < segMaxLon - 1e-9) {
+                        const longLat = [currentLon, lat];
+                        addPoint(longLat, undefined, undefined);
                         addPoint([currentLon, lat], undefined, undefined);
                         currentLon += lonStep;
                     }
@@ -420,7 +423,8 @@ export function partialTessellation(triangleMeta, limits, innerCuts, calculateRe
                 // Check if this point is inside the *workBBox*
                 if (pLongLat[1] >= workBBox.min[1] - 1e-9 &&
                     pLongLat[1] <= workBBox.max[1] + 1e-9) {
-                    addPoint(pLongLat, p.vec, p.arcIndex);
+                    if (inBBOX(pLongLat, workBBox))
+                        addPoint(pLongLat, p.vec, p.arcIndex);
                 }
             }
             currentLon += lonStep;
@@ -484,3 +488,7 @@ function orderIndcecesAlongArc(triangleMeta, edgePointIndexSets, allLongLats) {
     }
     return finalResult;
 }
+function inBBOX(longlat, bbox) {
+    return longlat[0] >= bbox.min[0] && longlat[0] <= bbox.max[0] &&
+        longlat[1] >= bbox.min[1] && longlat[1] <= bbox.max[1];
+}

package/package.json

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

package/programs/totems/attachments/dem-textures-manager.js

@@ -143,7 +143,8 @@ export class DemTextureManager {
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
         // turn off premultiply alpha
         gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
-        for (let i = 0; i < this.mergedData.length; i++) {
+        const length = Math.min(this.mergedData.length, MAXLAYERS);
+        for (let i = 0; i < length; i++) {
             const { mesh, bbox, coverRatio } = this.mergedData[i];
             gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, // mip level
             0, // xoffset

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

@@ -1,11 +1,13 @@
 import { DemTextureManagerCache } from "../../../../programs/totems/attachments/dem-textures-manager";
 import { RADIAN } from "../../../../Math/methods";
 export class WorkerContact {
+    globe;
     _masterWorker;
     _options;
     onResult;
     demTextureManager = null;
     constructor(globe, options, onResult) {
+        this.globe = globe;
         this._options = options;
         this.onResult = onResult;
         // Initialize the Master Worker
@@ -37,6 +39,8 @@ export class WorkerContact {
                 maxY: bbox.ur.y * RADIAN,
             };
         }
+        const { Tilt } = this.globe.api_GetCurrentLookInfo();
+        fineTuneBboxZooms(bboxesData, Tilt);
         // Send BBOX updates to Master Worker
         this._masterWorker.postMessage({
             bboxes: bboxesData
@@ -74,3 +78,25 @@ export class WorkerContact {
         });
     }
 }
+function fineTuneBboxZooms(bboxZooms, tilt) {
+    return;
+    if (bboxZooms.length < 3)
+        return;
+    if (tilt > 45) {
+        bboxZooms[1].zoom = bboxZooms[0].zoom;
+        bboxZooms[2].zoom = bboxZooms[0].zoom;
+        if (tilt > 65 && bboxZooms.length >= 4) {
+            bboxZooms[3].zoom = bboxZooms[0].zoom;
+        }
+    }
+    else if (bboxZooms[0].zoom > 12) {
+        bboxZooms[1].zoom = bboxZooms[0].zoom;
+    }
+    else if (bboxZooms[0].zoom > 8 && bboxZooms[0].zoom <= 12) {
+        bboxZooms[2].zoom = bboxZooms[1].zoom;
+        bboxZooms[0].zoom = bboxZooms[1].zoom;
+    }
+    while (bboxZooms.length > 6) {
+        bboxZooms.pop();
+    }
+}

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

@@ -7,17 +7,6 @@ let _pickableState = false;
 let _arcState = false;
 let _variativeColorsOnState = false;
 let showThreshold = 0;
-function fineTuneBboxZooms(bboxZooms) {
-    if (bboxZooms.length >= 3 && bboxZooms[0].zoom > 12) {
-        const first = bboxZooms.shift();
-        bboxZooms[0].zoom = first.zoom;
-        bboxZooms[0].minX = Math.min(first.minX, bboxZooms[0].minX);
-        bboxZooms[0].minY = Math.min(first.minY, bboxZooms[0].minY);
-        bboxZooms[0].maxX = Math.max(first.maxX, bboxZooms[0].maxX);
-        bboxZooms[0].maxY = Math.max(first.maxY, bboxZooms[0].maxY);
-    }
-    return bboxZooms;
-}
 const NO_COLOR_ALPHA = 255;
 const MAX_ALPHA_VALUE = 254;
 function clamp01(value) {
@@ -64,10 +53,9 @@ self.onmessage = (event) => {
         }
         // Update bboxes if provided
         if (bboxes) {
-            const fineTunedBboxes = fineTuneBboxZooms(bboxes);
-            cache.setBBOXes(fineTunedBboxes);
-            if (fineTunedBboxes.length > 0) {
-                showThreshold = zoomLevelShowThreshold(fineTunedBboxes[0].zoom, 0.05);
+            cache.setBBOXes(bboxes);
+            if (bboxes.length > 0) {
+                showThreshold = zoomLevelShowThreshold(bboxes[0].zoom, 0.05);
             }
         }
         const trianglesInView = cache.search();