@xeokit/xeokit-sdk 2.6.48 → 2.6.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.48",
+  "version": "2.6.50",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/StoreyViewsPlugin/Storey.js

@@ -41,7 +41,7 @@ class Storey {
         /**
          * Axis-aligned World-space boundary of the {@link Entity}s that represent the IfcBuildingStorey.
          *
-         * The boundary is a six-element Float32Array containing the min/max extents of the
+         * The boundary is a six-element Float64Array containing the min/max extents of the
          * axis-aligned boundary, ie. ````[xmin, ymin, zmin, xmax, ymax, zmax]````
          *
          * @property storeyAABB
@@ -52,7 +52,7 @@ class Storey {
         /**
          * Axis-aligned World-space boundary of the {@link Entity}s that represent the IfcBuildingStorey.
          *
-         * The boundary is a six-element Float32Array containing the min/max extents of the
+         * The boundary is a six-element Float64Array containing the min/max extents of the
          * axis-aligned boundary, ie. ````[xmin, ymin, zmin, xmax, ymax, zmax]````
          *
          * @deprecated
@@ -64,7 +64,7 @@ class Storey {
         /**
          * Axis-aligned World-space boundary of the {@link Entity}s that represent the model.
          *
-         * The boundary is a six-element Float32Array containing the min/max extents of the
+         * The boundary is a six-element Float64Array containing the min/max extents of the
          * axis-aligned boundary, ie. ````[xmin, ymin, zmin, xmax, ymax, zmax]````
          *
          * @property modelAABB

package/src/plugins/StoreyViewsPlugin/StoreyViewsPlugin.js

@@ -258,6 +258,8 @@ class StoreyViewsPlugin extends Plugin {
          */
         this.storeys = {};
 
+        this._storeysList = null;
+
         /**
          * A set of {@link Storey}s for each {@link MetaModel}.
          *
@@ -299,6 +301,7 @@ class StoreyViewsPlugin extends Plugin {
                     this.fire("storeys", this.storeys);
                 });
                 this.storeys[storeyId] = storey;
+                this._storeysList= null;
                 if (!this.modelStoreys[modelId]) {
                     this.modelStoreys[modelId] = {};
                 }
@@ -319,6 +322,7 @@ class StoreyViewsPlugin extends Plugin {
                         model.off(storey._onModelDestroyed);
                     }
                     delete this.storeys[storyObjectId];
+                    this._storeysList= null;
                 }
             }
             delete this.modelStoreys[modelId];
@@ -423,7 +427,7 @@ class StoreyViewsPlugin extends Plugin {
      * @param {String} storeyId ID of the ````IfcBuildingStorey```` object.
      * @param {*} [options] Options for showing the Entitys within the storey.
      * @param {Boolean} [options.hideOthers=false] When ````true````, hide all other {@link Entity}s.
-    */
+     */
     showStoreyObjects(storeyId, options = {}) {
 
         const storey = this.storeys[storeyId];
@@ -448,7 +452,7 @@ class StoreyViewsPlugin extends Plugin {
 
         this.withStoreyObjects(storeyId, (entity, metaObject) => {
             if (entity) {
-                    entity.visible = true;
+                entity.visible = true;
             }
         });
     }
@@ -684,7 +688,7 @@ class StoreyViewsPlugin extends Plugin {
 
     /**
      * Gets the ID of the storey which's bounding box contains the y point of the world position
-     * 
+     *
      * @param {Number[]} worldPos 3D World-space position.
      * @returns {String} ID of the storey containing the position, or null if the position falls outside all the storeys.
      */
@@ -804,6 +808,42 @@ class StoreyViewsPlugin extends Plugin {
         this.viewer.scene.off(this._onModelLoaded);
         super.destroy();
     }
+
+    /**
+     * Gets Storeys in a list, spatially sorted on the vertical World axis, the lowest Storey first.
+     *
+     * @returns {null}
+     */
+    get storeysList() {
+        if (!this._storeysList) {
+            this._storeysList = Object.values(this.storeys);
+            this._storeysList.sort(this._getSpatialSortFunc());
+        }
+        return this._storeysList;
+    }
+
+    _getSpatialSortFunc() {
+        const viewer = this.viewer;
+        const scene = viewer.scene;
+        const camera = scene.camera;
+        return this._spatialSortFunc || (this._spatialSortFunc = (storey1, storey2) => {
+            let idx = 0;
+            if (camera.xUp) {
+                idx = 0;
+            } else if (camera.yUp) {
+                idx = 1;
+            } else {
+                idx = 2;
+            }
+            if (storey1.aabb[idx] > storey2.aabb[idx]) {
+                return -1;
+            }
+            if (storey1.aabb[idx] < storey2.aabb[idx]) {
+                return 1;
+            }
+            return 0;
+        });
+    }
 }
 
 export {StoreyViewsPlugin}

package/src/plugins/TreeViewPlugin/TreeViewPlugin.js

@@ -1204,8 +1204,8 @@ export class TreeViewPlugin extends Plugin {
         if (!children || children.length === 0) {
             return;
         }
-        if (this._hierarchy === "storeys" && node.type === "IfcBuilding") {
-            // Assumes that children of an IfcBuilding will always be IfcBuildingStoreys
+        const firstChild = children[0];
+        if (this._hierarchy === "storeys" && firstChild.type === "IfcBuildingStorey") {
             children.sort(this._getSpatialSortFunc());
         } else {
             children.sort(this._alphaSortFunc);

package/src/viewer/Viewer.js

@@ -4,6 +4,8 @@ import {CameraControl} from "./scene/CameraControl/CameraControl.js";
 import {MetaScene} from "./metadata/MetaScene.js";
 import {LocaleService} from "./localization/LocaleService.js";
 import html2canvas from 'html2canvas/dist/html2canvas.esm.js';
+import {math} from "./scene/math/math.js";
+import {transformToNode} from "../plugins/lib/ui/index.js";
 
 /**
  * The 3D Viewer at the heart of the xeokit SDK.
@@ -495,9 +497,13 @@ class Viewer {
             //for all others keep the scale 1 otherwise it will keep multiplying the scale with the base scale of canvas
             //resulting in increase/decreased size for the the canvas that is being overlapped
             const scale = i == 0 ? snapshotCanvas.width / containerElement.clientWidth : 1;
+            const off = math.vec2([ 0, 0 ]);
+            transformToNode(canvas, containerElement, off);
             await html2canvas(containerElement, {
                 canvas: snapshotCanvas,
                 backgroundColor: null,
+                x: off[0],
+                y: off[1],
                 scale
             });
         }

package/src/viewer/scene/math/rtcCoords.js

@@ -130,9 +130,9 @@ function rtcToWorldPos(rtcCenter, rtcPos, worldPos) {
  * @param rtcPlanePos
  * @returns {*}
  */
-function getPlaneRTCPos(dist, dir, rtcOrigin, rtcPlanePos, rotationMatrix) {
-    const rtcCenter = (rotationMatrix
-                       ? (tempVec4.set(rtcOrigin, 0), tempVec4[3] = 1, math.mulMat4v4(rotationMatrix, tempVec4, tempVec4))
+function getPlaneRTCPos(dist, dir, rtcOrigin, rtcPlanePos, originMatrix) {
+    const rtcCenter = (originMatrix
+                       ? (tempVec4.set(rtcOrigin, 0), tempVec4[3] = 1, math.mulMat4v4(originMatrix, tempVec4, tempVec4))
                        : rtcOrigin);
     const rtcCenterToPlaneDist = math.dotVec3(dir, rtcCenter) + dist;
     const dirNormalized = math.normalizeVec3(dir, tempVec3a);
@@ -140,4 +140,4 @@ function getPlaneRTCPos(dist, dir, rtcOrigin, rtcPlanePos, rotationMatrix) {
     return rtcPlanePos;
 }
 
-export {createRTCViewMat, worldToRTCPos, worldToRTCPositions, rtcToWorldPos, getPlaneRTCPos};
+export {createRTCViewMat, worldToRTCPos, worldToRTCPositions, rtcToWorldPos, getPlaneRTCPos};

package/src/viewer/scene/model/SceneModel.js

@@ -1583,9 +1583,7 @@ export class SceneModel extends Component {
      * @type {Number[]}
      */
     get matrix() {
-        if (this._matrixDirty) {
-            this._rebuildMatrices();
-        }
+        this._rebuildMatrices();
         return this._matrix;
     }
 
@@ -1595,9 +1593,7 @@ export class SceneModel extends Component {
      * @type {Number[]}
      */
     get rotationMatrix() {
-        if (this._matrixDirty) {
-            this._rebuildMatrices();
-        }
+        this._rebuildMatrices();
         return this._worldRotationMatrix;
     }
 
@@ -1606,9 +1602,12 @@ export class SceneModel extends Component {
             math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrix);
             math.conjugateQuaternion(this._quaternion, this._conjugateQuaternion);
             math.quaternionToRotationMat4(this._conjugateQuaternion, this._worldRotationMatrixConjugate);
+            math.scaleMat4v(this._scale, this._worldRotationMatrix);
+            math.scaleMat4v(this._scale, this._worldRotationMatrixConjugate);
             this._matrix.set(this._worldRotationMatrix);
             math.translateMat4v(this._position, this._matrix);
             this._matrixDirty = false;
+            this._viewMatrixDirty = true;
         }
     }
 
@@ -1620,9 +1619,7 @@ export class SceneModel extends Component {
      * @type {Number[]}
      */
     get rotationMatrixConjugate() {
-        if (this._matrixDirty) {
-            this._rebuildMatrices();
-        }
+        this._rebuildMatrices();
         return this._worldRotationMatrixConjugate;
     }
 
@@ -1666,6 +1663,16 @@ export class SceneModel extends Component {
         return this._worldNormalMatrix;
     }
 
+    _rebuildViewMatrices() {
+        this._rebuildMatrices();
+        if (this._viewMatrixDirty) {
+            math.mulMat4(this.scene.camera.viewMatrix, this._matrix, this._viewMatrix);
+            math.inverseMat4(this._viewMatrix, this._viewNormalMatrix);
+            math.transposeMat4(this._viewNormalMatrix);
+            this._viewMatrixDirty = false;
+        }
+    }
+
     /**
      * Called by private renderers in ./lib, returns the view matrix with which to
      * render this SceneModel. The view matrix is the concatenation of the
@@ -1677,16 +1684,7 @@ export class SceneModel extends Component {
         if (!this._viewMatrix) {
             return this.scene.camera.viewMatrix;
         }
-        if (this._matrixDirty) {
-            this._rebuildMatrices();
-            this._viewMatrixDirty = true;
-        }
-        if (this._viewMatrixDirty) {
-            math.mulMat4(this.scene.camera.viewMatrix, this._matrix, this._viewMatrix);
-            math.inverseMat4(this._viewMatrix, this._viewNormalMatrix);
-            math.transposeMat4(this._viewNormalMatrix);
-            this._viewMatrixDirty = false;
-        }
+        this._rebuildViewMatrices();
         return this._viewMatrix;
     }
 
@@ -1699,18 +1697,7 @@ export class SceneModel extends Component {
         if (!this._viewNormalMatrix) {
             return this.scene.camera.viewNormalMatrix;
         }
-        if (this._matrixDirty) {
-            this._rebuildMatrices();
-            this._viewMatrixDirty = true;
-        }
-        if (this._viewMatrixDirty) {
-            math.mulMat4(this.scene.camera.viewMatrix, this._matrix, this._viewMatrix);
-            math.inverseMat4(this._viewMatrix, this._viewNormalMatrix);
-            math.transposeMat4(this._viewNormalMatrix);
-            this._viewMatrixDirty = false;
-        }
-        math.inverseMat4(this._viewMatrix, this._viewNormalMatrix);
-        math.transposeMat4(this._viewNormalMatrix);
+        this._rebuildViewMatrices();
         return this._viewNormalMatrix;
     }
 

package/src/viewer/scene/model/dtx/lines/renderers/DTXLinesColorRenderer.js

@@ -34,7 +34,7 @@ export class DTXLinesColorRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const viewMatrix = camera.viewMatrix;
 
         if (!this._program) {
@@ -106,7 +106,7 @@ export class DTXLinesColorRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -41,7 +41,7 @@ export class DTXTrianglesColorRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
 
         if (!this._program) {
             this._allocate();
@@ -119,7 +119,7 @@ export class DTXTrianglesColorRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -36,7 +36,7 @@ export class DTXTrianglesDepthRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
 
         if (!this._program) {
             this._allocate();
@@ -114,7 +114,7 @@ export class DTXTrianglesDepthRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -33,7 +33,7 @@ export class DTXTrianglesEdgesColorRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const viewMatrix = camera.viewMatrix;
 
         if (!this._program) {
@@ -100,7 +100,7 @@ export class DTXTrianglesEdgesColorRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -38,7 +38,7 @@ export class DTXTrianglesEdgesRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const viewMatrix = camera.viewMatrix;
 
         if (!this._program) {
@@ -127,7 +127,7 @@ export class DTXTrianglesEdgesRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -36,7 +36,7 @@ export class DTXTrianglesNormalsRenderer {
         const gl = scene.canvas.gl;
         const state = dataTextureLayer._state;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const viewMatrix = camera.viewMatrix;
 
         if (!this._program) {
@@ -106,7 +106,7 @@ export class DTXTrianglesNormalsRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -42,7 +42,7 @@ export class DTXTrianglesOcclusionRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         if (!this._program) {
@@ -121,7 +121,7 @@ export class DTXTrianglesOcclusionRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -36,7 +36,7 @@ export class DTXTrianglesPickDepthRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
 
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
         const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
@@ -125,7 +125,7 @@ export class DTXTrianglesPickDepthRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -44,7 +44,7 @@ export class DTXTrianglesPickMeshRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
 
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
         const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
@@ -112,7 +112,7 @@ export class DTXTrianglesPickMeshRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -41,7 +41,7 @@ export class DTXTrianglesPickNormalsFlatRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
 
         if (!this._program) {
             this._allocate();
@@ -123,7 +123,7 @@ export class DTXTrianglesPickNormalsFlatRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -32,7 +32,6 @@ export class DTXTrianglesPickNormalsRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {rotationMatrix} = model;
 
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
         const projMatrix = frameCtx.pickProjMatrix || camera.projMatrix;
@@ -94,7 +93,7 @@ export class DTXTrianglesPickNormalsRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -39,7 +39,7 @@ export class DTXTrianglesSilhouetteRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const viewMatrix = camera.viewMatrix;
 
         if (!this._program) {
@@ -138,7 +138,7 @@ export class DTXTrianglesSilhouetteRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -47,7 +47,7 @@ export class DTXTrianglesSnapInitRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const aabb = dataTextureLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
@@ -132,7 +132,7 @@ export class DTXTrianglesSnapInitRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -51,7 +51,7 @@ export class DTXTrianglesSnapRenderer {
         const state = dataTextureLayer._state;
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const aabb = dataTextureLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
@@ -137,7 +137,7 @@ export class DTXTrianglesSnapRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

package/src/viewer/scene/model/vbo/VBORenderer.js

@@ -132,7 +132,7 @@ export class VBORenderer {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             const origin = layer._state.origin;
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.rotationMatrix);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, model.matrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -439,7 +439,7 @@ export class VBORenderer {
         const {camera} = model.scene;
         const {viewNormalMatrix, project} = camera;
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix
-        const {position, rotationMatrix, rotationMatrixConjugate, worldNormalMatrix} = model;
+        const {position, rotationMatrix, worldNormalMatrix} = model;
 
         if (!this._program) {
             this._allocate();

package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLineSnapInitRenderer.js

@@ -36,7 +36,7 @@ export class VBOBatchingLineSnapInitRenderer extends VBORenderer {
         const gl = scene.canvas.gl;
         const state = batchingLayer._state;
         const origin = batchingLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const aabb = batchingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 

package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesSnapInitRenderer.js

@@ -35,7 +35,7 @@ export class VBOBatchingLinesSnapInitRenderer extends VBORenderer {
         const gl = scene.canvas.gl;
         const state = batchingLayer._state;
         const origin = batchingLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const aabb = batchingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 

package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesSnapRenderer.js

@@ -39,7 +39,7 @@ export class VBOBatchingLinesSnapRenderer extends VBORenderer{
         const gl = scene.canvas.gl;
         const state = batchingLayer._state;
         const origin = batchingLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const aabb = batchingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 

package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsSnapInitRenderer.js

@@ -35,7 +35,7 @@ export class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
         const gl = scene.canvas.gl;
         const state = batchingLayer._state;
         const origin = batchingLayer._state.origin;
-        const {position, rotationMatrix, rotationMatrixConjugate} = model;
+        const {position, rotationMatrix} = model;
         const aabb = batchingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
@@ -96,6 +96,7 @@ export class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
         gl.uniform3fv(this._uCoordinateScaler, coordinateScaler);
         gl.uniform1i(this._uRenderPass, renderPass);
         gl.uniform1i(this._uPickInvisible, frameCtx.pickInvisible);
+        gl.uniform1f(this._uPointSize, 1.0);
 
         let offset = 0;
         const mat4Size = 4 * 4;
@@ -139,6 +140,7 @@ export class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
         this.uInverseVectorAB = program.getLocation("snapInvVectorAB");
         this._uLayerNumber = program.getLocation("layerNumber");
         this._uCoordinateScaler = program.getLocation("coordinateScaler");
+        this._uPointSize = program.getLocation("pointSize");
     }
 
     _bindProgram() {
@@ -179,6 +181,7 @@ export class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
         src.push("uniform vec3 uCameraEyeRtc;");
         src.push("uniform vec2 snapVectorA;");
         src.push("uniform vec2 snapInvVectorAB;");
+        src.push("uniform float pointSize;");
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
@@ -226,6 +229,7 @@ export class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
+        src.push("gl_PointSize = pointSize;");
         src.push("  }");
         src.push("}");
         return src;