@pirireis/webglobeplugins 1.2.19 → 1.2.20

package/package.json

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

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

@@ -298,6 +298,8 @@ export class TerrainPolygonSemiPlugin {
         if (this._options.pickable === false) {
             throw new Error("TerrainPolygonSemiPlugin is not pickable. Set pickable option to true on construction to enable picking.");
         }
+        if (!this._useDepth())
+            return null;
         return this._lastPickedPolygon;
     }
     getPolygon(key) {
@@ -396,11 +398,22 @@ export class TerrainPolygonSemiPlugin {
             this._pickerDisplayer?.resize();
         }
     }
-    draw3D() {
-        const gl = this.globe.gl;
+    _useDepth() {
         const { Tilt } = this.globe.api_GetCurrentLookInfo();
         const useDepth = Tilt > DEPTH_START_ANGLE;
-        gl.disable(gl.DEPTH_TEST);
+        if (this._lastPickedPolygon !== null && useDepth) {
+            this._lastPickedPolygon = null;
+            this.globe.DrawRender();
+            this._uboHandler.updateSingle("private_pickedIndex", new Float32Array([IndexAttributeEscapeValue]));
+        }
+        return useDepth;
+    }
+    getDepthStartAngle() {
+        return DEPTH_START_ANGLE;
+    }
+    draw3D() {
+        const gl = this.globe.gl;
+        const useDepth = this._useDepth();
         gl.enable(gl.BLEND);
         defaultblendfunction(gl);
         // Use LEQUAL. Since Poly didn't write depth, lines test against Terrain.
@@ -434,6 +447,9 @@ export class TerrainPolygonSemiPlugin {
             prevDepthMask = gl.getParameter(gl.DEPTH_WRITEMASK);
             gl.depthMask(false);
         }
+        else {
+            gl.disable(gl.DEPTH_TEST);
+        }
         this._program.draw(this._attributeLoader, this._drawRangeIndexParams, this._uboHandler);
         // Restore states
         // --- FIX END ---
@@ -500,26 +516,6 @@ function inputCheck(input) {
     }
     return true;
 }
-function getGlStates(gl) {
-    return {
-        depthTest: gl.isEnabled(gl.DEPTH_TEST),
-        cullFace: gl.isEnabled(gl.CULL_FACE),
-        blend: gl.isEnabled(gl.BLEND),
-        scissorTest: gl.isEnabled(gl.SCISSOR_TEST),
-        depthMask: gl.getParameter(gl.DEPTH_WRITEMASK),
-        colorMask: gl.getParameter(gl.COLOR_WRITEMASK),
-        frontFace: gl.getParameter(gl.FRONT_FACE),
-        viewport: gl.getParameter(gl.VIEWPORT),
-        scissorBox: gl.getParameter(gl.SCISSOR_BOX),
-        currentProgram: gl.getParameter(gl.CURRENT_PROGRAM),
-        vao: gl.getParameter(gl.VERTEX_ARRAY_BINDING),
-        arrayBuffer: gl.getParameter(gl.ARRAY_BUFFER_BINDING),
-        elementArrayBuffer: gl.getParameter(gl.ELEMENT_ARRAY_BUFFER_BINDING),
-        framebuffer: gl.getParameter(gl.FRAMEBUFFER_BINDING),
-        activeTexture: gl.getParameter(gl.ACTIVE_TEXTURE),
-        texture2DArray: gl.getParameter(gl.TEXTURE_BINDING_2D_ARRAY),
-    };
-}
 function roundTo6(n) {
     // Keep at most 6 digits after the decimal (degrees), then quantize to float32
     // to match GPU attribute precision and make identity comparisons stable.

package/util/picking/picker-displayer.js

@@ -1,8 +1,3 @@
-/**
- * add implicit texture display program for color
- * add fence on query return and return id.
- * support R32I, R32F, R16UI, R32UI
- */
 import { textureOnCanvasProgramCache } from "../programs/draw-texture-on-canvas";
 import { fence } from "./fence";
 const ESCAPE_VALUE = -1;