@xeokit/xeokit-sdk 2.4.0-alpha-89 → 2.4.0-alpha-90

package/dist/xeokit-sdk.es.js

@@ -23996,6 +23996,16 @@ function buildVertex$3(mesh) {
         src.push("   mat[2][2] =1.0;");
         src.push("}");
     }
+
+    src.push("uniform vec2 pickClipPos;");
+
+    src.push("vec4 remapClipPos(vec4 clipPos) {");
+    src.push("    clipPos.xy /= clipPos.w;");
+    src.push("    clipPos.xy -= pickClipPos;");
+    src.push("    clipPos.xy *= clipPos.w;");
+    src.push("    return clipPos;");
+    src.push("}");
+
     src.push("void main(void) {");
     src.push("vec4 localPosition = vec4(position, 1.0); ");
     if (quantizedGeometry) {
@@ -24022,7 +24032,7 @@ function buildVertex$3(mesh) {
         src.push("vFragDepth = 1.0 + clipPos.w;");
         src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
-    src.push("gl_Position = clipPos;");
+    src.push("gl_Position = remapClipPos(clipPos);");
     src.push("}");
     return src;
 }
@@ -24225,6 +24235,8 @@ PickMeshRenderer.prototype.drawMesh = function (frameCtx, mesh) {
     const r = pickID & 0xFF;
     gl.uniform4f(this._uPickColor, r / 255, g / 255, b / 255, a / 255);
 
+    gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
+
     if (geometryState.indicesBuf) {
         gl.drawElements(geometryState.primitive, geometryState.indicesBuf.numItems, geometryState.indicesBuf.itemType, 0);
         frameCtx.drawElements++;
@@ -24258,6 +24270,7 @@ PickMeshRenderer.prototype._allocate = function (mesh) {
     this._aPosition = program.getAttribute("position");
     this._uClippable = program.getLocation("clippable");
     this._uPickColor = program.getLocation("pickColor");
+    this._uPickClipPos = program.getLocation("pickClipPos");
     this._uOffset = program.getLocation("offset");
     if (scene.logarithmicDepthBufferEnabled ) {
         this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
@@ -24295,8 +24308,6 @@ function buildVertex$2(mesh) {
     const scene = mesh.scene;
     const clipping = scene._sectionPlanesState.sectionPlanes.length > 0;
     const quantizedGeometry = !!mesh._geometry._state.compressGeometry;
-    mesh._state.billboard;
-    mesh._state.stationary;
     const src = [];
     src.push('#version 300 es');
     src.push("// Surface picking vertex shader");
@@ -24318,6 +24329,16 @@ function buildVertex$2(mesh) {
         src.push("}");
         src.push("out float isPerspective;");
     }
+
+    src.push("uniform vec2 pickClipPos;");
+
+    src.push("vec4 remapClipPos(vec4 clipPos) {");
+    src.push("    clipPos.xy /= clipPos.w;");
+    src.push("    clipPos.xy -= pickClipPos;");
+    src.push("    clipPos.xy *= clipPos.w;");
+    src.push("    return clipPos;");
+    src.push("}");
+
     src.push("out vec4 vColor;");
     if (quantizedGeometry) {
         src.push("uniform mat4 positionsDecodeMatrix;");
@@ -24339,7 +24360,7 @@ function buildVertex$2(mesh) {
         src.push("vFragDepth = 1.0 + clipPos.w;");
         src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
-    src.push("gl_Position = clipPos;");
+    src.push("gl_Position = remapClipPos(clipPos);");
     src.push("}");
     return src;
 }
@@ -24532,6 +24553,9 @@ PickTriangleRenderer.prototype.drawMesh = function (frameCtx, mesh) {
     } else {
         this._aPosition.bindArrayBuffer(positionsBuf);
     }
+
+    gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
+
     pickColorsBuf.bind();
     gl.enableVertexAttribArray(this._aColor.location);
     gl.vertexAttribPointer(this._aColor.location, pickColorsBuf.itemSize, pickColorsBuf.itemType, true, 0, 0); // Normalize
@@ -24563,6 +24587,7 @@ PickTriangleRenderer.prototype._allocate = function (mesh) {
     }
     this._aPosition = program.getAttribute("position");
     this._aColor = program.getAttribute("color");
+    this._uPickClipPos = program.getLocation("pickClipPos");
     this._uClippable = program.getLocation("clippable");
     this._uOffset = program.getLocation("offset");
     if (scene.logarithmicDepthBufferEnabled ) {
@@ -34353,7 +34378,7 @@ class RenderBuffer {
 
     read(pickX, pickY, glFormat = null, glType = null, arrayType = Uint8Array, arrayMultiplier = 4) {
         const x = pickX;
-        const y = (this.buffer.height || this.gl.drawingBufferHeight) - pickY;
+        const y = this.buffer.height ? (this.buffer.height - pickY - 1) : (this.gl.drawingBufferHeight - pickY);
         const pix = new arrayType(arrayMultiplier);
         const gl = this.gl;
         gl.readPixels(x, y, 1, 1, glFormat || gl.RGBA, glType || gl.UNSIGNED_BYTE, pix, 0);
@@ -37541,7 +37566,6 @@ const edgesDefaultColor = new Float32Array([0, 0, 0, 1]);
 
 const tempVec4 = math.vec4();
 const tempVec3a$w = math.vec3();
-math.vec3();
 const tempVec3c$n = math.vec3();
 const tempMat4a$f = math.mat4();
 
@@ -37614,6 +37638,18 @@ class VBOSceneModelRenderer {
         return src;
     }
 
+    _addRemapClipPosLines(src) {
+        src.push("uniform vec2 pickClipPos;");
+
+        src.push("vec4 remapClipPos(vec4 clipPos) {");
+        src.push("    clipPos.xy /= clipPos.w;");
+        src.push("    clipPos.xy -= pickClipPos;");
+        src.push("    clipPos.xy *= clipPos.w;");
+        src.push("    return clipPos;");
+        src.push("}");
+        return src;
+    }
+
     getValid() {
         return this._hash === this._getHash();
     }
@@ -37747,6 +37783,7 @@ class VBOSceneModelRenderer {
         this._aPickColor = program.getAttribute("pickColor");
         this._uPickZNear = program.getLocation("pickZNear");
         this._uPickZFar = program.getLocation("pickZFar");
+        this._uPickClipPos = program.getLocation("pickClipPos");
 
         this._uColorMap = "uColorMap";
         this._uMetallicRoughMap = "uMetallicRoughMap";
@@ -37787,7 +37824,6 @@ class VBOSceneModelRenderer {
         const program = this._program;
         const lightsState = scene._lightsState;
         const lights = lightsState.lights;
-        const project = scene.camera.project;
 
         program.bind();
 
@@ -37814,43 +37850,6 @@ class VBOSceneModelRenderer {
                 gl.uniform3fv(this._uLightDir[i], light.dir);
             }
         }
-
-        if (this._withSAO) {
-            const sao = scene.sao;
-            const saoEnabled = sao.possible;
-            if (saoEnabled) {
-                const viewportWidth = gl.drawingBufferWidth;
-                const viewportHeight = gl.drawingBufferHeight;
-                tempVec4[0] = viewportWidth;
-                tempVec4[1] = viewportHeight;
-                tempVec4[2] = sao.blendCutoff;
-                tempVec4[3] = sao.blendFactor;
-                gl.uniform4fv(this._uSAOParams, tempVec4);
-                this._program.bindTexture(this._uOcclusionTexture, frameCtx.occlusionTexture, 0);
-            }
-        }
-
-        if (scene.logarithmicDepthBufferEnabled) {
-            const logDepthBufFC = 2.0 / (Math.log(project.far + 1.0) / Math.LN2);
-            gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
-        }
-
-        if (this._uGammaFactor) {
-            gl.uniform1f(this._uGammaFactor, scene.gammaFactor);
-        }
-
-        if (this._uPickInvisible) {
-            gl.uniform1i(this._uPickInvisible, frameCtx.pickInvisible);
-        }
-
-
-        if (this._uShadowViewMatrix) {
-            gl.uniformMatrix4fv(this._uShadowViewMatrix, false, frameCtx.shadowViewMatrix);
-        }
-
-        if (this._uShadowProjMatrix) {
-            gl.uniformMatrix4fv(this._uShadowProjMatrix, false, frameCtx.shadowProjMatrix);
-        }
     }
 
     _makeVAO(state) {
@@ -38047,6 +38046,10 @@ class VBOSceneModelRenderer {
             gl.uniform1f(this._uPickZFar, frameCtx.pickZFar);
         }
 
+        if (this._uPickClipPos) {
+            gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
+        }
+
         if (this._uPositionsDecodeMatrix) {
             gl.uniformMatrix4fv(this._uPositionsDecodeMatrix, false, state.positionsDecodeMatrix);
         }
@@ -39226,6 +39229,8 @@ class TrianglesBatchingPickMeshRenderer extends VBOSceneModelTriangleBatchingRen
             src.push("out float vFlags;");
         }
 
+        this._addRemapClipPosLines(src);
+
         src.push("out vec4 vPickColor;");
 
         src.push("void main(void) {");
@@ -39253,7 +39258,7 @@ class TrianglesBatchingPickMeshRenderer extends VBOSceneModelTriangleBatchingRen
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -39352,6 +39357,9 @@ class TrianglesBatchingPickDepthRenderer extends VBOSceneModelTriangleBatchingRe
             src.push("out vec4 vWorldPosition;");
             src.push("out float vFlags;");
         }
+
+        this._addRemapClipPosLines(src);
+
         src.push("out vec4 vViewPosition;");
         src.push("void main(void) {");
 
@@ -39377,7 +39385,7 @@ class TrianglesBatchingPickDepthRenderer extends VBOSceneModelTriangleBatchingRe
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -39475,6 +39483,8 @@ class TrianglesBatchingPickNormalsRenderer extends VBOSceneModelTriangleBatching
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -39519,7 +39529,7 @@ class TrianglesBatchingPickNormalsRenderer extends VBOSceneModelTriangleBatching
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -40622,6 +40632,8 @@ class TrianglesBatchingPickNormalsFlatRenderer extends VBOSceneModelTriangleBatc
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -40655,7 +40667,7 @@ class TrianglesBatchingPickNormalsFlatRenderer extends VBOSceneModelTriangleBatc
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -44351,6 +44363,8 @@ class TrianglesInstancingPickMeshRenderer extends VBOSceneModelTriangleInstancin
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -44395,7 +44409,7 @@ class TrianglesInstancingPickMeshRenderer extends VBOSceneModelTriangleInstancin
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("}");
         src.push("}");
         return src;
@@ -44485,6 +44499,8 @@ class TrianglesInstancingPickDepthRenderer extends VBOSceneModelTriangleInstanci
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -44527,7 +44543,7 @@ class TrianglesInstancingPickDepthRenderer extends VBOSceneModelTriangleInstanci
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("}");
         src.push("}");
         return src;
@@ -44630,6 +44646,8 @@ class TrianglesInstancingPickNormalsRenderer extends VBOSceneModelTriangleInstan
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -44678,7 +44696,7 @@ class TrianglesInstancingPickNormalsRenderer extends VBOSceneModelTriangleInstan
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("}");
         src.push("}");
         return src;
@@ -45796,6 +45814,8 @@ class TrianglesInstancingPickNormalsFlatRenderer extends VBOSceneModelTriangleIn
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -45834,7 +45854,7 @@ class TrianglesInstancingPickNormalsFlatRenderer extends VBOSceneModelTriangleIn
             src.push("vFlags = flags;");
         }
 
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("}");
         src.push("}");
         return src;
@@ -50718,6 +50738,8 @@ class PointsBatchingPickMeshRenderer extends VBOSceneModelPointBatchingRenderer
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         src.push("uniform float pointSize;");
         if (pointsMaterial.perspectivePoints) {
             src.push("uniform float nearPlaneHeight;");
@@ -50759,7 +50781,7 @@ class PointsBatchingPickMeshRenderer extends VBOSceneModelPointBatchingRenderer
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         if (pointsMaterial.perspectivePoints) {
             src.push("gl_PointSize = (nearPlaneHeight * pointSize) / clipPos.w;");
             src.push("gl_PointSize = max(gl_PointSize, " + Math.floor(pointsMaterial.minPerspectivePointSize) + ".0);");
@@ -50858,6 +50880,8 @@ class PointsBatchingPickDepthRenderer extends VBOSceneModelPointBatchingRenderer
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         src.push("uniform float pointSize;");
         if (pointsMaterial.perspectivePoints) {
             src.push("uniform float nearPlaneHeight;");
@@ -50896,7 +50920,7 @@ class PointsBatchingPickDepthRenderer extends VBOSceneModelPointBatchingRenderer
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         if (pointsMaterial.perspectivePoints) {
             src.push("gl_PointSize = (nearPlaneHeight * pointSize) / clipPos.w;");
             src.push("gl_PointSize = max(gl_PointSize, " + Math.floor(pointsMaterial.minPerspectivePointSize) + ".0);");
@@ -52341,6 +52365,8 @@ class PointsInstancingPickMeshRenderer extends VBOSceneModelPointInstancingRende
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         src.push("uniform float pointSize;");
         if (pointsMaterial.perspectivePoints) {
             src.push("uniform float nearPlaneHeight;");
@@ -52382,6 +52408,7 @@ class PointsInstancingPickMeshRenderer extends VBOSceneModelPointInstancingRende
             src.push("  vFlags = flags;");
         }
         src.push("vec4 clipPos = projMatrix * viewPosition;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
         }
@@ -52492,6 +52519,8 @@ class PointsInstancingPickDepthRenderer extends VBOSceneModelPointInstancingRend
 
         this._addMatricesUniformBlockLines(src);
 
+        this._addRemapClipPosLines(src);
+
         src.push("uniform float pointSize;");
         if (pointsMaterial.perspectivePoints) {
             src.push("uniform float nearPlaneHeight;");
@@ -52531,10 +52560,11 @@ class PointsInstancingPickDepthRenderer extends VBOSceneModelPointInstancingRend
         }
         src.push("  vViewPosition = viewPosition;");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         if (pointsMaterial.perspectivePoints) {
             src.push("gl_PointSize = (nearPlaneHeight * pointSize) / clipPos.w;");
             src.push("gl_PointSize = max(gl_PointSize, " + Math.floor(pointsMaterial.minPerspectivePointSize) + ".0);");
@@ -57325,7 +57355,7 @@ class TrianglesDataTexturePickMeshRenderer {
 
     getValid() {
         return this._hash === this._getHash();
-    };
+    }
 
     _getHash() {
         return this._scene._sectionPlanesState.getHash();
@@ -57386,6 +57416,7 @@ class TrianglesDataTexturePickMeshRenderer {
             rtcViewMatrix = camera.viewMatrix;
             rtcCameraEye = camera.eye;
         }
+        gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
         gl.uniformMatrix4fv(this._uSceneModelWorldMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
@@ -57459,6 +57490,7 @@ class TrianglesDataTexturePickMeshRenderer {
         const program = this._program;
         this._uRenderPass = program.getLocation("renderPass");
         this._uPickInvisible = program.getLocation("pickInvisible");
+        this._uPickClipPos = program.getLocation("pickClipPos");
         this._uSceneModelWorldMatrix = program.getLocation("sceneModelWorldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
         this._uProjMatrix = program.getLocation("projMatrix");
@@ -57556,6 +57588,15 @@ class TrianglesDataTexturePickMeshRenderer {
             src.push("out float isPerspective;");
         }
 
+        src.push("uniform vec2 pickClipPos;");
+
+        src.push("vec4 remapClipPos(vec4 clipPos) {");
+        src.push("    clipPos.xy /= clipPos.w;");
+        src.push("    clipPos.xy -= pickClipPos;");
+        src.push("    clipPos.xy *= clipPos.w;");
+        src.push("    return clipPos;");
+        src.push("}");
+
         src.push("bool isPerspectiveMatrix(mat4 m) {");
         src.push("    return (m[2][3] == - 1.0);");
         src.push("}");
@@ -57666,7 +57707,7 @@ class TrianglesDataTexturePickMeshRenderer {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -57755,7 +57796,7 @@ class TrianglesDataTexturePickDepthRenderer {
 
     getValid() {
         return this._hash === this._getHash();
-    };
+    }
 
     _getHash() {
         return this._scene._sectionPlanesState.getHash();
@@ -57829,6 +57870,7 @@ class TrianglesDataTexturePickDepthRenderer {
         gl.uniform3fv(this._uCameraEyeRtc, rtcCameraEye);
         gl.uniform1i(this._uRenderPass, renderPass);
         gl.uniform1i(this._uPickInvisible, frameCtx.pickInvisible);
+        gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
         gl.uniform1f(this._uPickZNear, frameCtx.pickZNear);
         gl.uniform1f(this._uPickZFar, frameCtx.pickZFar);
         gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrixConjugate);
@@ -57903,6 +57945,7 @@ class TrianglesDataTexturePickDepthRenderer {
         const program = this._program;
         this._uRenderPass = program.getLocation("renderPass");
         this._uPickInvisible = program.getLocation("pickInvisible");
+        this._uPickClipPos = program.getLocation("pickClipPos");
         this._uWorldMatrix = program.getLocation("worldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
         this._uProjMatrix = program.getLocation("projMatrix");
@@ -57992,6 +58035,15 @@ class TrianglesDataTexturePickDepthRenderer {
             src.push("out float isPerspective;");
         }
 
+        src.push("uniform vec2 pickClipPos;");
+
+        src.push("vec4 remapClipPos(vec4 clipPos) {");
+        src.push("    clipPos.xy /= clipPos.w;");
+        src.push("    clipPos.xy -= pickClipPos;");
+        src.push("    clipPos.xy *= clipPos.w;");
+        src.push("    return clipPos;");
+        src.push("}");
+
         src.push("bool isPerspectiveMatrix(mat4 m) {");
         src.push("    return (m[2][3] == - 1.0);");
         src.push("}");
@@ -58098,7 +58150,7 @@ class TrianglesDataTexturePickDepthRenderer {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -59059,7 +59111,7 @@ class TrianglesDataTexturePickNormalsRenderer {
 
     getValid() {
         return this._hash === this._getHash();
-    };
+    }
 
     _getHash() {
         return this._scene._sectionPlanesState.getHash();
@@ -59117,6 +59169,7 @@ class TrianglesDataTexturePickNormalsRenderer {
         gl.uniform3fv(this._uCameraEyeRtc, originCameraEye);
 
         gl.uniform1i(this._uPickInvisible, frameCtx.pickInvisible);
+        gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
 
         if (scene.logarithmicDepthBufferEnabled) {
             const logDepthBufFC = 2.0 / (Math.log(camera.project.far + 1.0) / Math.LN2);  // TODO: Far should be from projection matrix?
@@ -59199,6 +59252,7 @@ class TrianglesDataTexturePickNormalsRenderer {
 
         this._uRenderPass = program.getLocation("renderPass");
         this._uPickInvisible = program.getLocation("pickInvisible");
+        this._uPickClipPos = program.getLocation("pickClipPos");
 
         this._uSectionPlanes = [];
 
@@ -59283,6 +59337,15 @@ class TrianglesDataTexturePickNormalsRenderer {
             src.push("out float isPerspective;");
         }
 
+        src.push("uniform vec2 pickClipPos;");
+
+        src.push("vec4 remapClipPos(vec4 clipPos) {");
+        src.push("    clipPos.xy /= clipPos.w;");
+        src.push("    clipPos.xy -= pickClipPos;");
+        src.push("    clipPos.xy *= clipPos.w;");
+        src.push("    return clipPos;");
+        src.push("}");
+
         src.push("bool isPerspectiveMatrix(mat4 m) {");
         src.push("    return (m[2][3] == - 1.0);");
         src.push("}");
@@ -59397,7 +59460,7 @@ class TrianglesDataTexturePickNormalsRenderer {
             src.push("      vWorldPosition = worldPosition;");
             src.push("      vFlags2 = flags2.w;");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("}");
 
         src.push("}");
@@ -60692,7 +60755,7 @@ class TrianglesDataTexturePickNormalsFlatRenderer {
 
     getValid() {
         return this._hash === this._getHash();
-    };
+    }
 
     _getHash() {
         return this._scene._sectionPlanesState.getHash();
@@ -60765,6 +60828,7 @@ class TrianglesDataTexturePickNormalsFlatRenderer {
 
         gl.uniform1i(this._uRenderPass, renderPass);
         gl.uniform1i(this._uPickInvisible, frameCtx.pickInvisible);
+        gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
 
         gl.uniformMatrix4fv(this._uWorldMatrix, false, model.worldMatrix);
 
@@ -60933,6 +60997,7 @@ class TrianglesDataTexturePickNormalsFlatRenderer {
 
         this._uRenderPass = program.getLocation("renderPass");
         this._uPickInvisible = program.getLocation("pickInvisible");
+        this._uPickClipPos = program.getLocation("pickClipPos");
         this._uPositionsDecodeMatrix = program.getLocation("positionsDecodeMatrix");
         this._uWorldMatrix = program.getLocation("worldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
@@ -61022,6 +61087,16 @@ class TrianglesDataTexturePickNormalsFlatRenderer {
             src.push("}");
             src.push("out float isPerspective;");
         }
+
+        src.push("uniform vec2 pickClipPos;");
+
+        src.push("vec4 remapClipPos(vec4 clipPos) {");
+        src.push("    clipPos.xy /= clipPos.w;");
+        src.push("    clipPos.xy -= pickClipPos;");
+        src.push("    clipPos.xy *= clipPos.w;");
+        src.push("    return clipPos;");
+        src.push("}");
+
         src.push("out vec4 vWorldPosition;");
         if (clipping) {
             src.push("out int vFlags2;");
@@ -61100,7 +61175,7 @@ class TrianglesDataTexturePickNormalsFlatRenderer {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
-        src.push("gl_Position = clipPos;");
+        src.push("gl_Position = remapClipPos(clipPos);");
         src.push("  }");
         src.push("}");
         return src;
@@ -73626,10 +73701,10 @@ const Renderer$1 = function (scene, options) {
      * Picks an Entity.
      * @private
      */
-    this.pick = (function () {
+     this.pick = (function () {
 
         const tempVec3a = math.vec3();
-        const tempMat4a = math.mat4();
+        math.mat4();
         const tempMat4b = math.mat4();
 
         const randomVec3 = math.vec3();
@@ -73671,13 +73746,11 @@ const Renderer$1 = function (scene, options) {
 
                 // Picking with arbitrary World-space ray
                 // Align camera along ray and fire ray through center of canvas
-
-                const pickFrustumMatrix = math.frustumMat4(-1, 1, -1, 1, 0.01, scene.camera.project.far, tempMat4a);
-
+                
                 if (params.matrix) {
 
                     pickViewMatrix = params.matrix;
-                    pickProjMatrix = pickFrustumMatrix;
+                    pickProjMatrix = scene.camera.projMatrix;
 
                 } else {
 
@@ -73694,7 +73767,7 @@ const Renderer$1 = function (scene, options) {
                     math.cross3Vec3(worldRayDir, randomVec3, up);
 
                     pickViewMatrix = math.lookAtMat4v(worldRayOrigin, look, up, tempMat4b);
-                    pickProjMatrix = pickFrustumMatrix;
+                    pickProjMatrix = scene.camera.projMatrix;
 
                     pickResult.origin = worldRayOrigin;
                     pickResult.direction = worldRayDir;
@@ -73716,7 +73789,7 @@ const Renderer$1 = function (scene, options) {
                 }
             }
 
-            const pickBuffer = renderBufferManager.getRenderBuffer("pick");
+            const pickBuffer = renderBufferManager.getRenderBuffer("pick", { size: [1, 1] });
 
             pickBuffer.bind();
 
@@ -73778,10 +73851,12 @@ const Renderer$1 = function (scene, options) {
         frameCtx.pickViewMatrix = pickViewMatrix;
         frameCtx.pickProjMatrix = pickProjMatrix;
         frameCtx.pickInvisible = !!params.pickInvisible;
+        frameCtx.pickClipPos = [
+            getClipPosX(canvasPos[0], gl.drawingBufferWidth),
+            getClipPosY(canvasPos[1], gl.drawingBufferHeight),
+        ];
 
-        gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
-
-        gl.clearColor(0, 0, 0, 0);
+        gl.viewport(0, 0, 1, 1);
         gl.depthMask(true);
         gl.enable(gl.DEPTH_TEST);
         gl.disable(gl.CULL_FACE);
@@ -73815,8 +73890,7 @@ const Renderer$1 = function (scene, options) {
                 }
             }
         }
-        const resolutionScale = scene.canvas.resolutionScale;
-        const pix = pickBuffer.read(Math.round(canvasPos[0] * resolutionScale), Math.round(canvasPos[1] * resolutionScale));
+        const pix = pickBuffer.read(0, 0);
         let pickID = pix[0] + (pix[1] * 256) + (pix[2] * 256 * 256) + (pix[3] * 256 * 256 * 256);
 
         if (pickID < 0) {
@@ -73841,8 +73915,12 @@ const Renderer$1 = function (scene, options) {
         frameCtx.pickViewMatrix = pickViewMatrix; // Can be null
         frameCtx.pickProjMatrix = pickProjMatrix; // Can be null
         // frameCtx.pickInvisible = !!params.pickInvisible;
+        frameCtx.pickClipPos = [
+            getClipPosX(canvasPos[0], gl.drawingBufferWidth),
+            getClipPosY(canvasPos[1], gl.drawingBufferHeight),
+        ];
 
-        gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
+        gl.viewport(0, 0, 1, 1);
 
         gl.clearColor(0, 0, 0, 0);
         gl.enable(gl.DEPTH_TEST);
@@ -73852,8 +73930,7 @@ const Renderer$1 = function (scene, options) {
 
         pickable.drawPickTriangles(frameCtx);
 
-        const resolutionScale = scene.canvas.resolutionScale;
-        const pix = pickBuffer.read(Math.round(canvasPos[0] * resolutionScale), Math.round(canvasPos[1] * resolutionScale));
+        const pix = pickBuffer.read(0, 0);
 
         let primIndex = pix[0] + (pix[1] * 256) + (pix[2] * 256 * 256) + (pix[3] * 256 * 256 * 256);
 
@@ -73885,8 +73962,12 @@ const Renderer$1 = function (scene, options) {
             frameCtx.pickZFar = nearAndFar[1];
             frameCtx.pickElementsCount = pickable.pickElementsCount;
             frameCtx.pickElementsOffset = pickable.pickElementsOffset;
-
-            gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
+            frameCtx.pickClipPos = [
+                getClipPosX(canvasPos[0], gl.drawingBufferWidth),
+                getClipPosY(canvasPos[1], gl.drawingBufferHeight),
+            ];
+    
+            gl.viewport(0, 0, 1, 1);
 
             gl.clearColor(0, 0, 0, 0);
             gl.depthMask(true);
@@ -73897,8 +73978,7 @@ const Renderer$1 = function (scene, options) {
 
             pickable.drawPickDepths(frameCtx); // Draw color-encoded fragment screen-space depths
 
-            const resolutionScale = scene.canvas.resolutionScale;
-            const pix = pickBuffer.read(Math.round(canvasPos[0] * resolutionScale), Math.round(canvasPos[1] * resolutionScale));
+            const pix = pickBuffer.read(0, 0);
 
             const screenZ = unpackDepth(pix); // Get screen-space Z at the given canvas coords
 
@@ -74199,12 +74279,12 @@ const Renderer$1 = function (scene, options) {
         frameCtx.pickOrigin = pickResult.origin;
         frameCtx.pickViewMatrix = pickViewMatrix;
         frameCtx.pickProjMatrix = pickProjMatrix;
+        frameCtx.pickClipPos = [
+            getClipPosX(canvasPos[0], gl.drawingBufferWidth),
+            getClipPosY(canvasPos[1], gl.drawingBufferHeight),
+        ];
 
-        const pickNormalBuffer = renderBufferManager.getRenderBuffer("pick-normal");
-
-        pickNormalBuffer.bind(gl.RGBA32I);
-
-        gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
+        gl.viewport(0, 0, 1, 1);
 
         gl.enable(gl.DEPTH_TEST);
         gl.disable(gl.CULL_FACE);
@@ -74214,10 +74294,7 @@ const Renderer$1 = function (scene, options) {
 
         pickable.drawPickNormals(frameCtx); // Draw color-encoded fragment World-space normals
 
-        const resolutionScale = scene.canvas.resolutionScale;
-        const pix = pickNormalBuffer.read(Math.round(canvasPos[0] * resolutionScale), Math.round(canvasPos[1] * resolutionScale), gl.RGBA_INTEGER, gl.INT, Int32Array, 4);
-
-        pickNormalBuffer.unbind();
+        const pix = pickBuffer.read(0, 0);
 
         const worldNormal = [
             pix[0] / math.MAX_INT,