@xeokit/xeokit-sdk 2.6.34 → 2.6.36

package/src/plugins/ZonesPlugin/ZonesPlugin.js

@@ -343,7 +343,7 @@ const mousePointSelector = function(viewer, ray2WorldPos) {
         const copyCanvasPos = (event, vec2) => {
             vec2[0] = event.clientX;
             vec2[1] = event.clientY;
-            transformToNode(canvas.ownerDocument.body, canvas, vec2);
+            transformToNode(canvas.ownerDocument.documentElement, canvas, vec2);
             return vec2;
         };
 
@@ -418,7 +418,7 @@ const touchPointSelector = function(viewer, pointerCircle, ray2WorldPos) {
         const copyCanvasPos = (event, vec2) => {
             vec2[0] = event.clientX;
             vec2[1] = event.clientY;
-            transformToNode(canvas.ownerDocument.body, canvas, vec2);
+            transformToNode(canvas.ownerDocument.documentElement, canvas, vec2);
             return vec2;
         };
 
@@ -1735,7 +1735,7 @@ export class ZoneTranslateControl extends Component {
         const copyCanvasPos = (event, vec2) => {
             vec2[0] = event.clientX;
             vec2[1] = event.clientY;
-            transformToNode(canvas.ownerDocument.body, canvas, vec2);
+            transformToNode(canvas.ownerDocument.documentElement, canvas, vec2);
             return vec2;
         };
 

package/src/plugins/lib/ui/index.js

@@ -117,7 +117,7 @@ export function activateDraggableDot(dot, cfg) {
 
     const onChange = event => {
         const canvasPos = math.vec2([ event.clientX, event.clientY ]);
-        transformToNode(canvas.ownerDocument.body, canvas, canvasPos);
+        transformToNode(canvas.ownerDocument.documentElement, canvas, canvasPos);
         onMove(canvasPos, pickWorldPos(canvasPos));
     };
 

package/src/viewer/Viewer.js

@@ -377,6 +377,9 @@ class Viewer {
             }
         }
 
+        // firing "rendering" is necessary to trigger DTX{Lines,Triangles}Layer::_uploadDeferredFlags
+        this.scene.fire("rendering", { }, true);
+
         this.scene._renderer.renderSnapshot();
 
         const imageDataURI = this.scene._renderer.readSnapshot(params);

package/src/viewer/scene/CameraControl/CameraControl.js

@@ -644,7 +644,8 @@ class CameraControl extends Component {
             constrainVertical: false,
             smartPivot: false,
             doubleClickTimeFrame: 250,
-            
+            zoomOnMouseWheel: true,
+
             snapToVertex: DEFAULT_SNAP_VERTEX,
             snapToEdge: DEFAULT_SNAP_EDGE,
             snapRadius: DEFAULT_SNAP_PICK_RADIUS,
@@ -1735,6 +1736,26 @@ class CameraControl extends Component {
         return this._configs.doubleClickTimeFrame;
     }
 
+    /**
+     * Sets whether to zoom the camera on mouse wheel
+     *
+     * Default is ````true````
+     *
+     * @param {Boolean} enabled
+     */
+    set zoomOnMouseWheel(enabled) {
+        this._configs.zoomOnMouseWheel = !!enabled;
+    }
+
+    /**
+     * Gets whether to zoom the camera on mouse wheel
+     *
+     * @returns {Boolean}
+     */
+    get zoomOnMouseWheel() {
+        return this._configs.zoomOnMouseWheel;
+    }
+
     /**
      * Destroys this ````CameraControl````.
      * @private

package/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js

@@ -296,7 +296,7 @@ class MousePanRotateDollyHandler {
         let secsNowLast = null;
 
         canvas.addEventListener("wheel", this._mouseWheelHandler = (e) => {
-            if (!(configs.active && configs.pointerEnabled)) {
+            if (!(configs.active && configs.pointerEnabled && configs.zoomOnMouseWheel)) {
                 return;
             }
             const secsNow = performance.now() / 1000.0;

package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickDepthRenderer.js

@@ -37,7 +37,11 @@ export class DTXTrianglesPickDepthRenderer {
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
+
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
+        const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
+        const eye = frameCtx.pickOrigin || camera.eye;
+        const far = frameCtx.pickProjMatrix ? frameCtx.pickZFar : camera.project.far;
 
         if (!this._program) {
             this._allocate();
@@ -77,15 +81,15 @@ export class DTXTrianglesPickDepthRenderer {
             rtcOrigin[2] += position[2];
             rtcViewMatrix = createRTCViewMat(viewMatrix, rtcOrigin, tempMat4a);
             rtcCameraEye = tempVec3c;
-            rtcCameraEye[0] = camera.eye[0] - rtcOrigin[0];
-            rtcCameraEye[1] = camera.eye[1] - rtcOrigin[1];
-            rtcCameraEye[2] = camera.eye[2] - rtcOrigin[2];
+            rtcCameraEye[0] = eye[0] - rtcOrigin[0];
+            rtcCameraEye[1] = eye[1] - rtcOrigin[1];
+            rtcCameraEye[2] = eye[2] - rtcOrigin[2];
             frameCtx.snapPickOrigin[0] = rtcOrigin[0];
             frameCtx.snapPickOrigin[1] = rtcOrigin[1];
             frameCtx.snapPickOrigin[2] = rtcOrigin[2];
         } else {
             rtcViewMatrix = viewMatrix;
-            rtcCameraEye = camera.eye;
+            rtcCameraEye = eye;
             frameCtx.snapPickOrigin[0] = 0;
             frameCtx.snapPickOrigin[1] = 0;
             frameCtx.snapPickOrigin[2] = 0;
@@ -100,9 +104,9 @@ export class DTXTrianglesPickDepthRenderer {
         gl.uniform1f(this._uPickZFar, frameCtx.pickZFar);
         gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
-        gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
+        gl.uniformMatrix4fv(this._uProjMatrix, false, projMatrix);
         if (scene.logarithmicDepthBufferEnabled) {
-            const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2); // TODO: Far from pick project matrix?
+            const logDepthBufFC = 2.0 / (Math.log(far + 1.0) / Math.LN2);
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
 

package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickMeshRenderer.js

@@ -45,6 +45,12 @@ export class DTXTrianglesPickMeshRenderer {
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
+
+        const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
+        const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
+        const eye = frameCtx.pickOrigin || camera.eye;
+        const far = frameCtx.pickProjMatrix ? frameCtx.pickZFar : camera.project.far;
+
         textureState.bindCommonTextures(
             this._program,
             this.uTexturePerObjectPositionsDecodeMatrix,
@@ -71,24 +77,24 @@ export class DTXTrianglesPickMeshRenderer {
             rtcOrigin[0] += position[0];
             rtcOrigin[1] += position[1];
             rtcOrigin[2] += position[2];
-            rtcViewMatrix = createRTCViewMat(camera.viewMatrix, rtcOrigin, tempMat4a);
+            rtcViewMatrix = createRTCViewMat(viewMatrix, rtcOrigin, tempMat4a);
             rtcCameraEye = tempVec3c;
-            rtcCameraEye[0] = camera.eye[0] - rtcOrigin[0];
-            rtcCameraEye[1] = camera.eye[1] - rtcOrigin[1];
-            rtcCameraEye[2] = camera.eye[2] - rtcOrigin[2];
+            rtcCameraEye[0] = eye[0] - rtcOrigin[0];
+            rtcCameraEye[1] = eye[1] - rtcOrigin[1];
+            rtcCameraEye[2] = eye[2] - rtcOrigin[2];
         } else {
-            rtcViewMatrix = camera.viewMatrix;
-            rtcCameraEye = camera.eye;
+            rtcViewMatrix = viewMatrix;
+            rtcCameraEye = eye;
         }
         gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
         gl.uniform2f(this._uDrawingBufferSize, gl.drawingBufferWidth, gl.drawingBufferHeight);
         gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
-        gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
+        gl.uniformMatrix4fv(this._uProjMatrix, false, projMatrix);
         gl.uniform3fv(this._uCameraEyeRtc, rtcCameraEye);
         gl.uniform1i(this._uRenderPass, renderPass);
         if (scene.logarithmicDepthBufferEnabled) {
-            const logDepthBufFC = 2.0 / (Math.log(camera.project.far + 1.0) / Math.LN2); // TODO: Far from pick project matrix?
+            const logDepthBufFC = 2.0 / (Math.log(far + 1.0) / Math.LN2);
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
         const numAllocatedSectionPlanes = scene._sectionPlanesState.getNumAllocatedSectionPlanes();

package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickNormalsFlatRenderer.js

@@ -55,6 +55,11 @@ export class DTXTrianglesPickNormalsFlatRenderer {
             this._bindProgram(frameCtx, state);
         }
 
+        const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
+        const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
+        const eye = frameCtx.pickOrigin || camera.eye;
+        const far = frameCtx.pickProjMatrix ? frameCtx.pickZFar : camera.project.far;
+
         textureState.bindCommonTextures(
             this._program,
             this.uTexturePerObjectPositionsDecodeMatrix,
@@ -83,24 +88,24 @@ export class DTXTrianglesPickNormalsFlatRenderer {
             rtcOrigin[0] += position[0];
             rtcOrigin[1] += position[1];
             rtcOrigin[2] += position[2];
-            rtcViewMatrix = createRTCViewMat(camera.viewMatrix, rtcOrigin, tempMat4a);
+            rtcViewMatrix = createRTCViewMat(viewMatrix, rtcOrigin, tempMat4a);
             rtcCameraEye = tempVec3c;
-            rtcCameraEye[0] = camera.eye[0] - rtcOrigin[0];
-            rtcCameraEye[1] = camera.eye[1] - rtcOrigin[1];
-            rtcCameraEye[2] = camera.eye[2] - rtcOrigin[2];
+            rtcCameraEye[0] = eye[0] - rtcOrigin[0];
+            rtcCameraEye[1] = eye[1] - rtcOrigin[1];
+            rtcCameraEye[2] = eye[2] - rtcOrigin[2];
         } else {
-            rtcViewMatrix = camera.viewMatrix; // TODO: make pickMatrix
-            rtcCameraEye = camera.eye;
+            rtcViewMatrix = viewMatrix;
+            rtcCameraEye = eye;
         }
         gl.uniform2fv(this._uPickClipPos, frameCtx.pickClipPos);
         gl.uniform2f(this._uDrawingBufferSize, gl.drawingBufferWidth, gl.drawingBufferHeight);
         gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
-        gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix); // TODO: pickProjMatrix
+        gl.uniformMatrix4fv(this._uProjMatrix, false, projMatrix);
         gl.uniform3fv(this._uCameraEyeRtc, rtcCameraEye);
         gl.uniform1i(this._uRenderPass, renderPass);
         if (scene.logarithmicDepthBufferEnabled) {
-            const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2);
+            const logDepthBufFC = 2.0 / (Math.log(far + 1.0) / Math.LN2);
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
         const numAllocatedSectionPlanes = scene._sectionPlanesState.getNumAllocatedSectionPlanes();

package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickNormalsRenderer.js

@@ -33,6 +33,11 @@ export class DTXTrianglesPickNormalsRenderer {
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
 
+        const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
+        const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
+        const eye = frameCtx.pickOrigin || camera.eye;
+        const far = frameCtx.pickProjMatrix ? frameCtx.pickZFar : camera.project.far;
+
         if (!this._program) {
             this._allocate(dataTextureLayer);
         }
@@ -50,15 +55,7 @@ export class DTXTrianglesPickNormalsRenderer {
             this._uTexturePerObjectMatrix
         );
 
-        let cameraEye = camera.eye;
-
-        // if (frameCtx.pickViewMatrix) {
-        //     textureState.bindPickCameraTexture(
-        //         this._program,
-        //         this._uTextureCameraMatrices
-        //     );
-        //     cameraEye = frameCtx.pickOrigin || cameraEye;
-        // }
+        let cameraEye = eye;
 
         const originCameraEye = [
             cameraEye[0] - origin[0],
@@ -77,7 +74,7 @@ export class DTXTrianglesPickNormalsRenderer {
         gl.uniform2f(this._uDrawingBufferSize, gl.drawingBufferWidth, gl.drawingBufferHeight);
 
         if (scene.logarithmicDepthBufferEnabled) {
-            const logDepthBufFC = 2.0 / (Math.log(camera.project.far + 1.0) / Math.LN2);  // TODO: Far should be from projection objectInstanceMatrix?
+            const logDepthBufFC = 2.0 / (Math.log(far + 1.0) / Math.LN2);  // TODO: Far should be from projection objectInstanceMatrix?
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
 

package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesDepthRenderer.js

@@ -89,17 +89,6 @@ export class TrianglesDepthRenderer extends TrianglesBatchingRenderer {
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
         }
-        src.push("const float   packUpScale = 256. / 255.;");
-        src.push("const float   unpackDownscale = 255. / 256.;");
-        src.push("const vec3    packFactors = vec3( 256. * 256. * 256., 256. * 256.,  256. );");
-        src.push("const vec4    unpackFactors = unpackDownscale / vec4( packFactors, 1. );");
-        src.push("const float   shiftRight8 = 1.0 / 256.;");
-
-        src.push("vec4 packDepthToRGBA( const in float v ) {");
-        src.push("    vec4 r = vec4( fract( v * packFactors ), v );");
-        src.push("    r.yzw -= r.xyz * shiftRight8;");
-        src.push("    return r * packUpScale;");
-        src.push("}");
         src.push("in vec2 vHighPrecisionZW;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");