@pirireis/webglobeplugins 1.2.2 → 1.2.4

package/Math/tessellation/triangle-tessellation.js

@@ -260,6 +260,14 @@ function filterEdgePointTriangles(indeces, edgePointIndices) {
     }
     return new Uint32Array(result);
 }
+function roundTo7(n) {
+    // Keep at most 7 digits after the decimal (degrees), then quantize to float32
+    // to match GPU attribute precision and make identity comparisons stable.
+    const rounded = Math.round(n * 1e7) / 1e7;
+    return rounded;
+    // return Math.round(rounded);
+    // return Math.fround(n);
+}
 // function createArcPointHarvestingMeta(): ArcPointHarvestingMeta {
 //     return {
 //         parallelCutIndices: [],
@@ -288,17 +296,17 @@ export function partialTessellation(triangleMeta, limits, innerCuts, calculateRe
      */
     const _f32 = /*@__PURE__*/ new Float32Array(1);
     const _u32 = /*@__PURE__*/ new Uint32Array(_f32.buffer);
-    // const float32Bits = (n: number): number => {
-    //     _f32[0] = n;
-    //     return _u32[0];
-    // };
+    const float32Bits = (n) => {
+        _f32[0] = n;
+        return _u32[0];
+    };
     const addPoint = (longLat, vec3, edgeIndex) => {
-        const xy = radianToMercatorXY(longLat);
-        const x = Math.fround(xy[0]);
-        const y = Math.fround(xy[1]);
-        // Use float32 bit patterns for an exact, stable key.
-        const key = `${xy[0].toFixed(8)},${xy[1].toFixed(8)}`;
-        // const key = `${float32Bits(x)},${float32Bits(y)}`;
+        // Triangulate and render in Mercator XY (unscaled) space.
+        // De-dupe using float32 bit patterns to exactly match GPU attribute precision.
+        const merc = radianToMercatorXY(longLat);
+        const x = Math.fround(merc[0]);
+        const y = Math.fround(merc[1]);
+        const key = `${float32Bits(x)},${float32Bits(y)}`;
         let index = pointMap.get(key);
         if (index !== undefined) {
             if (edgeIndex !== undefined) {

package/package.json

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

package/programs/polygon-on-globe/texture-dem-triangles.js

@@ -25,6 +25,7 @@ const styleBlockManager = new UniformBlockManager('Style', [
     { name: "private_isPickedOn", type: "bool", value: new Float32Array([0]) },
     { name: "useDefaultColor", type: "bool", value: new Float32Array([0]) },
     { name: "private_changeHoverColor", type: "bool", value: new Float32Array([1]) },
+    { name: "useTiltOpacity", type: "bool", value: new Float32Array([1.0]) },
 ], uniformBindingPoints.style);
 const vertexShaderSource = `#version 300 es
 #pragma vscode_glsllint_stage : vert
@@ -99,7 +100,7 @@ void main() {
     }
 
     
-    v_color.a *= opacity; 
+    v_color.a *= opacity * (useTiltOpacity ? tilt_opacity : 1.0); 
     gl_PointSize = u_pointSize;
 }
 `;

package/programs/totems/camerauniformblock.js

@@ -15,12 +15,18 @@ layout(std140) uniform CameraUniformBlock {
     float world_tilt; // 4 bytes             168
     float world_north_angle; // 4 bytes      172
     vec2 world_center_radian; // 8 bytes     176
-    float NaN; // padding to 16 bytes         184
+    float tilt_opacity; // padding to 16 bytes         184
 };  // 188 bytes total
 `;
 // TODO: Remove NaN
 const Radian = Math.PI / 180.0;
 const _0vec3 = [0, 0, 0];
+function tiltOpacity(tiltAngle) {
+    const tilt = tiltAngle / 72 * 87;
+    // const tiltFactor = Math.min(1, Math.sqrt(1 / Math.tan(Radian * tilt)));
+    const tiltFactor = Math.sqrt(Math.cos(Radian * tilt));
+    return tiltFactor; // Ensure opacity is not less than 0.1
+}
 export class CameraUniformBlockTotem {
     id;
     description;
@@ -124,6 +130,8 @@ The following is the glsl uniform block: ${CameraUniformBlockString}`;
             Radian * CenterLat,
         ]));
         // this._frustumPlanes = getFrustumPlanes(projection, translate);
+        const tilt_opacity = tiltOpacity(Tilt);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 184, new Float32Array([tilt_opacity]));
         gl.bindBuffer(gl.UNIFORM_BUFFER, null);
         // isMoved
         const currentLOD = globe.api_GetCurrentLODWithDecimal();

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

@@ -19,6 +19,7 @@ export class TerrainPolygonSemiPlugin {
             hoverColor: [1, 0, 0, 1],
             opacity: 1.0,
             useDefaultColor: false,
+            useTiltOpacity: true,
         },
         edgeStyle: {
             defaultColor: [1, 1, 0, 1],
@@ -26,6 +27,7 @@ export class TerrainPolygonSemiPlugin {
             changeColorOnHover: true,
             opacity: 1.0,
             useDefaultColor: true,
+            useTiltOpacity: true,
         },
         // Global opacity multiplier applied on top of style opacities
         opacity: 1.0,
@@ -115,6 +117,7 @@ export class TerrainPolygonSemiPlugin {
             this._uboHandler.updateSingle("private_isPickedOn", new Float32Array([1.0]));
             this._uboHandler.updateSingle("hoverColor", new Float32Array(this._options.polygonStyle.hoverColor));
             this._uboHandler.updateSingle("private_changeHoverColor", new Float32Array([this._options.polygonStyle.changeColorOnHover ? 1 : 0]));
+            this._uboHandler.updateSingle("useTiltOpacity", new Float32Array([this._options.polygonStyle.useTiltOpacity ? 1 : 0]));
         }
         else {
             this._uboHandler.updateSingle("private_isPickedOn", new Float32Array([0.0]));
@@ -126,6 +129,8 @@ export class TerrainPolygonSemiPlugin {
             this._uboForRealEdgeArcs.updateSingle("opacity", this._effectiveOpacity("edgeArc"));
             this._uboForRealEdgeArcs.updateSingle("private_isPickedOn", new Float32Array([0.0]));
             this._uboForRealEdgeArcs.updateSingle("private_changeHoverColor", new Float32Array([this._options.edgeStyle.changeColorOnHover ? 1 : 0]));
+            this._uboForRealEdgeArcs.updateSingle("hoverColor", new Float32Array(this._options.edgeStyle.hoverColor));
+            this._uboForRealEdgeArcs.updateSingle("useTiltOpacity", new Float32Array([this._options.edgeStyle.useTiltOpacity ? 1 : 0]));
             this._drawRealEdgeArcs.elementBuffer = gl.createBuffer();
         }
         if (this._options.variativeColorsOn) {
@@ -484,6 +489,7 @@ function roundTo7(n) {
     // Keep at most 7 digits after the decimal (degrees), then quantize to float32
     // to match GPU attribute precision and make identity comparisons stable.
     const rounded = Math.round(n * 1e7) / 1e7;
-    return Math.fround(rounded);
+    return rounded;
+    // return Math.round(rounded);
     // return Math.fround(n);
 }