@xeokit/xeokit-sdk 2.6.43 → 2.6.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.43",
+  "version": "2.6.46",
   "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/extras/ContextMenu/ContextMenu.js

@@ -461,6 +461,7 @@ class ContextMenu {
         this._updateItemsTitles();
         this._updateItemsEnabledStatus();
         this._showMenu(this._rootMenu.id, pageX, pageY);
+        this._updateSubMenuInfo();
         this._shown = true;
         this.fire("shown", {});
     }
@@ -869,6 +870,29 @@ class ContextMenu {
         }
     }
 
+    _updateSubMenuInfo() {
+        if (!this._context) return;
+        let itemElement, itemRect, subMenuElement, initialStyles, showOnLeft, subMenuWidth;
+        this._itemList.forEach((item) => {
+            if (item.subMenu) {
+                itemElement = item.itemElement;
+                itemRect = itemElement.getBoundingClientRect();
+                subMenuElement = item.subMenu.menuElement;
+                initialStyles = {
+                    visibility: subMenuElement.style.visibility,
+                    display: subMenuElement.style.display,
+                }
+                subMenuElement.style.display = "block";
+                subMenuElement.style.visibility = "hidden";
+                subMenuWidth = item.subMenu.menuElement.getBoundingClientRect().width;
+                subMenuElement.style.visibility = initialStyles.visibility;
+                subMenuElement.style.display = initialStyles.display;
+                showOnLeft = ((itemRect.right + subMenuWidth) > window.innerWidth);
+                itemElement.setAttribute("data-submenuposition", showOnLeft ? "left" : "right");
+            }
+        })
+    }
+
     _showMenu(menuId, pageX, pageY) { // Shows the given menu, at the specified page coordinates
         const menu = this._menuMap[menuId];
         if (!menu) {

package/src/plugins/DotBIMLoaderPlugin/DotBIMLoaderPlugin.js

@@ -554,7 +554,8 @@ export class DotBIMLoaderPlugin extends Plugin {
                 }
                 metaModelData.propertySets.push({
                     id: objectId,
-                    properties
+                    name: "Properties",
+                    properties: properties
                 });
 
                 metaModelData.metaObjects.push({

package/src/plugins/GLTFLoaderPlugin/GLTFLoaderPlugin.js

@@ -322,6 +322,7 @@ class GLTFLoaderPlugin extends Plugin {
      * to non-textured triangle meshes, and that VBOs are always used for meshes that have textures, line segments, or point
      * primitives. Only works while {@link DTX#enabled} is also ````true````.
      * @param {Boolean} [params.autoMetaModel] When supplied, creates a default MetaModel with a single MetaObject.
+     * @param {Boolean} [params.globalizeObjectIds=false] Indicates whether to globalize each {@link Entity#id} and {@link MetaObject#id}, in case you need to prevent ID clashes with other models.
      * @returns {Entity} Entity representing the model, which will have {@link Entity#isModel} set ````true```` and will be registered by {@link Entity#id} in {@link Scene#models}
      */
     load(params = {}) {

package/src/plugins/GLTFLoaderPlugin/GLTFSceneModelLoader.js

@@ -109,6 +109,7 @@ function parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok) {
             entityId: options.entityId,
             metaModelJSON,
             autoMetaModel: options.autoMetaModel,
+            globalizeObjectIds: options.globalizeObjectIds,
             metaObjects: [],
             loadBuffer: options.loadBuffer,
             basePath: options.basePath,
@@ -444,16 +445,17 @@ function loadDefaultScene(ctx) {
 
             if (entityId) {
                 if (meshIds.length > 0) {
+                    const globalId = ctx.globalizeObjectIds ? math.globalizeObjectId(ctx.sceneModel.id, entityId) : entityId;
                     ctx.sceneModel.createEntity({
-                        id: entityId,
+                        id: globalId,
                         meshIds: meshIds,
                         isObject: true
                     });
                     if (ctx.autoMetaModel) {
                         ctx.metaObjects.push({
-                            id: entityId,
+                            id: globalId,
                             type: "Default",
-                            name: entityId,
+                            name: globalId,
                             parent: ctx.sceneModel.id
                         });
                     }

package/src/plugins/LASLoaderPlugin/LASLoaderPlugin.js

@@ -212,6 +212,10 @@ class LASLoaderPlugin extends Plugin {
      * @param {Number} [cfg.skip=1] Configures LASLoaderPlugin to load every **n** points.
      * @param {Number} [cfg.fp64=false] Configures if LASLoaderPlugin assumes that LAS positions are stored in 64-bit floats instead of 32-bit.
      * @param {Number} [cfg.colorDepth=8] Configures whether LASLoaderPlugin assumes that LAS colors are encoded using 8 or 16 bits. Accepted values are 8, 16 an "auto".
+     * @param {Boolean} [cfg.center=false] Whether to center the LAS points.  Applied before "rotateX", "rotate" and "transform".
+     * @param {Boolean} [cfg.rotateX=false] Whether to rotate the LAS point positions 90 degrees. Applied after "center".
+     * @param {Number[]} [cfg.rotate=[0,0,0]] Rotations to immediately apply to the LAS points, given as Euler angles in degrees, for each of the X, Y and Z axis. Rotation is applied after "center" and "rotateX".
+     * @param {Number[]} [cfg.transform] 4x4 transform matrix to immediately apply to the LAS points. This is applied after "center", "rotateX" and "rotate". Typically used instead of "rotateX" and "rotate".
      */
     constructor(viewer, cfg = {}) {
 
@@ -221,6 +225,10 @@ class LASLoaderPlugin extends Plugin {
         this.skip = cfg.skip;
         this.fp64 = cfg.fp64;
         this.colorDepth = cfg.colorDepth;
+        this.center = cfg.center;
+        this.rotate = cfg.rotate;
+        this.rotateX = cfg.rotateX;
+        this.transform = cfg.transform;
     }
 
     /**
@@ -315,6 +323,106 @@ class LASLoaderPlugin extends Plugin {
         this._colorDepth = value || "auto";
     }
 
+    /**
+     * Gets if LASLoaderPlugin immediately centers LAS positions.
+     *
+     * If this is ````true```` then centering is the first thing that happens to LAS positions as they are loaded.
+     *
+     * Default value is ````false````.
+     *
+     * @returns {Boolean} True if LASLoaderPlugin immediately centers LAS positions.
+     */
+    get center() {
+        return this._center;
+    }
+
+    /**
+     * Configures if LASLoaderPlugin immediately centers LAS positions.
+     *
+     * If this is ````true```` then centering is the first thing that happens to LAS positions as they are loaded.
+     *
+     * Default value is ````false````.
+     *
+     * @param {Boolean} value True if LASLoaderPlugin immediately centers LAS positions.
+     */
+    set center(value) {
+        this._center = !!value;
+    }
+
+    /**
+     * Gets the current transformation to apply to LAS positions as they are loaded.
+     *
+     * If this is ````true````, then LAS positions will be transformed after they are centered and rotated.
+     *
+     * Default value is null.
+     *
+     * @returns {Number[]|null} A 16-element array containing a 4x4 transformation matrix.
+     */
+    get transform() {
+        return this._transform;
+    }
+
+    /**
+     * Sets the current transformation to apply to LAS positions as they are loaded.
+     *
+     * If this is ````true````, then LAS positions will be transformed after they are centered and rotated.
+     *
+     * Default value is null.
+     *
+     * @param {Number[]|null} transform A 16-element array containing a 4x4 transformation matrix.
+     */
+    set transform(transform) {
+        this._transform = transform;
+    }
+
+    /**
+     * Gets the current rotations to apply to LAS positions as they are loaded.
+     *
+     * Rotations are an array of three Euler angles in degrees, for each of the X, Y and Z axis, applied in that order.
+     *
+     * Default value is null.
+     *
+     * @returns {Number[]|null} If defined, an array of three Euler angles in degrees, for each of the X, Y and Z axis. Null if undefined.
+     */
+    get rotate() {
+        return this._rotate;
+    }
+
+    /**
+     * Sets the current rotations to apply to LAS positions as they are loaded.
+     *
+     * Rotations are an array of three Euler angles in degrees, for each of the X, Y and Z axis, applied in that order.
+     *
+     * Default value is null.
+     *
+     * @param {Number[]|null} rotate Array of three Euler angles in degrees, for each of the X, Y and Z axis.
+     */
+    set rotate(rotate) {
+        this._rotate = rotate;
+    }
+
+    /**
+     * Gets if LAS positions are rotated 90 degrees about X as they are loaded.
+     *
+     * Default value is ````false````.
+     *
+     * @returns {*}
+     */
+    get rotateX() {
+        return this._rotateX;
+    }
+
+    /**
+     * Sets if LAS positions are rotated 90 degrees about X as they are loaded.
+     *
+     * Default value is ````false````.
+     *
+     * @param rotateX
+     */
+    set rotateX(rotateX) {
+        this._rotateX = rotateX;
+    }
+
     /**
      * Loads an ````LAS```` model into this LASLoaderPlugin's {@link Viewer}.
      *
@@ -394,9 +502,26 @@ class LASLoaderPlugin extends Plugin {
 
     _parseModel(arrayBuffer, params, options, sceneModel) {
 
-        function readPositions(attributesPosition) {
+        const readPositions = (attributesPosition) => {
             const positionsValue = attributesPosition.value;
-            if (params.rotateX) {
+            if (this._center) {
+                const centerPos = math.vec3();
+                const numPoints = positionsValue.length;
+                for (let i = 0, len = positionsValue.length; i < len; i += 3) {
+                    centerPos[0] += positionsValue[i + 0];
+                    centerPos[1] += positionsValue[i + 1];
+                    centerPos[2] += positionsValue[i + 2];
+                }
+                centerPos[0] /= numPoints;
+                centerPos[1] /= numPoints;
+                centerPos[2] /= numPoints;
+                for (let i = 0, len = positionsValue.length; i < len; i += 3) {
+                    positionsValue[i + 0] -= centerPos[0];
+                    positionsValue[i + 1] -= centerPos[1];
+                    positionsValue[i + 2] -= centerPos[2];
+                }
+            }
+            if (this._rotateX) {
                 if (positionsValue) {
                     for (let i = 0, len = positionsValue.length; i < len; i += 3) {
                         const temp = positionsValue[i + 1];
@@ -405,6 +530,35 @@ class LASLoaderPlugin extends Plugin {
                     }
                 }
             }
+            if (this._rotate) {
+                const quaternion = math.identityQuaternion();
+                const mat = math.mat4();
+                math.eulerToQuaternion(this._rotate, "XYZ", quaternion);
+                math.quaternionToRotationMat4(quaternion, mat);
+                const pos = math.vec3();
+                for (let i = 0, len = positionsValue.length; i < len; i += 3) {
+                    pos[0] = positionsValue[i + 0];
+                    pos[1] = positionsValue[i + 1];
+                    pos[2] = positionsValue[i + 2];
+                    math.transformPoint3(mat, pos, pos);
+                    positionsValue[i + 0] = pos[0];
+                    positionsValue[i + 1] = pos[1];
+                    positionsValue[i + 2] = pos[2];
+                }
+            }
+            if (this._transform) {
+                const mat = math.mat4(this._transform);
+                const pos = math.vec3();
+                for (let i = 0, len = positionsValue.length; i < len; i += 3) {
+                    pos[0] = positionsValue[i + 0];
+                    pos[1] = positionsValue[i + 1];
+                    pos[2] = positionsValue[i + 2];
+                    math.transformPoint3(mat, pos, pos);
+                    positionsValue[i + 0] = pos[0];
+                    positionsValue[i + 1] = pos[1];
+                    positionsValue[i + 2] = pos[2];
+                }
+            }
             return positionsValue;
         }
 

package/src/plugins/TreeViewPlugin/RenderService.js

@@ -143,6 +143,9 @@ export class RenderService {
       }
       if (indeterminate !== checkbox.indeterminate) {
         checkbox.indeterminate = indeterminate;
+        if (indeterminate) {
+          checkbox.checked = false;
+        }
       }
     }
   }

package/src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js

@@ -894,10 +894,8 @@ class XKTLoaderPlugin extends Plugin {
             delete params.id;
         }
 
-        if (!params.src && !params.xkt && !params.manifestSrc && !params.manifest) {
-            this.error("load() param expected: src, xkt, manifestSrc or manifestData");
-            return sceneModel; // Return new empty model
-        }
+        if (!params.src && !params.xkt && !params.manifestSrc && !params.manifest)
+            throw new Error("XKTLoaderPlugin: load() param expected: src, xkt, manifestSrc or manifestData");
 
         const options = {};
         const includeTypes = params.includeTypes || this._includeTypes;
@@ -996,9 +994,9 @@ class XKTLoaderPlugin extends Plugin {
                         globalizeObjectIds: options.globalizeObjectIds
                     });
                     if (params.src) {
-                        this._loadModel(params.src, params, options, sceneModel, null, manifestCtx, finish, error);
+                        this._loadModel(params.src, options, sceneModel, null, manifestCtx, finish, error);
                     } else {
-                        this._parseModel(params.xkt, params, options, sceneModel, null, manifestCtx);
+                        this._parseModel(params.xkt, options, sceneModel, null, manifestCtx);
                         finish();
                     }
                 }, (errMsg) => {
@@ -1012,9 +1010,9 @@ class XKTLoaderPlugin extends Plugin {
                     globalizeObjectIds: options.globalizeObjectIds
                 });
                 if (params.src) {
-                    this._loadModel(params.src, params, options, sceneModel, null, manifestCtx, finish, error);
+                    this._loadModel(params.src, options, sceneModel, null, manifestCtx, finish, error);
                 } else {
-                    this._parseModel(params.xkt, params, options, sceneModel, null, manifestCtx);
+                    this._parseModel(params.xkt, options, sceneModel, null, manifestCtx);
                     finish();
                 }
             }
@@ -1023,9 +1021,9 @@ class XKTLoaderPlugin extends Plugin {
         } else {
 
             if (params.src) {
-                this._loadModel(params.src, params, options, sceneModel, metaModel, manifestCtx, finish, error);
+                this._loadModel(params.src, options, sceneModel, metaModel, manifestCtx, finish, error);
             } else if (params.xkt) {
-                this._parseModel(params.xkt, params, options, sceneModel, metaModel, manifestCtx);
+                this._parseModel(params.xkt, options, sceneModel, metaModel, manifestCtx);
                 finish();
             } else if (params.manifestSrc || params.manifest) {
                 const baseDir = params.manifestSrc ? getBaseDirectory(params.manifestSrc) : "";
@@ -1059,7 +1057,7 @@ class XKTLoaderPlugin extends Plugin {
                             done();
                         } else {
                             this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
-                                this._parseModel(arrayBuffer, params, options, sceneModel, null /* Ignore metamodel in XKT */, manifestCtx);
+                                this._parseModel(arrayBuffer, options, sceneModel, null /* Ignore metamodel in XKT */, manifestCtx);
                                 sceneModel.preFinalize();
                                 i++;
                                 this.scheduleTask(loadNext, 200);
@@ -1077,7 +1075,7 @@ class XKTLoaderPlugin extends Plugin {
                             done();
                         } else {
                             this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
-                                this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
+                                this._parseModel(arrayBuffer, options, sceneModel, metaModel, manifestCtx);
                                 sceneModel.preFinalize();
                                 i++;
                                 this.scheduleTask(loadNext, 200);
@@ -1127,15 +1125,15 @@ class XKTLoaderPlugin extends Plugin {
         return sceneModel;
     }
 
-    _loadModel(src, params, options, sceneModel, metaModel, manifestCtx, done, error) {
-        this._dataSource.getXKT(params.src, (arrayBuffer) => {
-            this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
+    _loadModel(src, options, sceneModel, metaModel, manifestCtx, done, error) {
+        this._dataSource.getXKT(src, (arrayBuffer) => {
+            this._parseModel(arrayBuffer, options, sceneModel, metaModel, manifestCtx);
             sceneModel.preFinalize();
             done();
         }, error);
     }
 
-    async _parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx) {
+    async _parseModel(arrayBuffer, options, sceneModel, metaModel, manifestCtx) {
         if (sceneModel.destroyed) {
             return;
         }

package/src/viewer/Viewer.js

@@ -491,10 +491,14 @@ class Viewer {
 
         for (let i = 0, len = pluginContainerElements.length; i < len; i++) {
             const containerElement = pluginContainerElements[i];
+            //only calculate the scale for first plugin
+            //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;
             await html2canvas(containerElement, {
                 canvas: snapshotCanvas,
                 backgroundColor: null,
-                scale: snapshotCanvas.width / containerElement.clientWidth
+                scale
             });
         }
         if (!params.includeGizmos) {

package/src/viewer/scene/input/Input.js

@@ -1300,15 +1300,11 @@ class Input extends Component {
             this.mouseCanvasPos[1] = event.y;
         } else {
             let element = event.target;
-            let totalOffsetLeft = 0;
-            let totalOffsetTop = 0;
-            while (element.offsetParent) {
-                totalOffsetLeft += element.offsetLeft;
-                totalOffsetTop += element.offsetTop;
-                element = element.offsetParent;
-            }
-            this.mouseCanvasPos[0] = event.pageX - totalOffsetLeft;
-            this.mouseCanvasPos[1] = event.pageY - totalOffsetTop;
+
+            const rect = element.getBoundingClientRect();
+
+            this.mouseCanvasPos[0] = event.clientX - rect.left;
+            this.mouseCanvasPos[1] = event.clientY - rect.top;
         }
     }
 

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

@@ -1,6 +1,7 @@
 import {math} from './math.js';
 
 const tempVec3a = math.vec3();
+const tempVec4  = math.vec4();
 
 /**
  * Given a view matrix and a relative-to-center (RTC) coordinate origin, returns a view matrix
@@ -129,7 +130,10 @@ function rtcToWorldPos(rtcCenter, rtcPos, worldPos) {
  * @param rtcPlanePos
  * @returns {*}
  */
-function getPlaneRTCPos(dist, dir, rtcCenter, rtcPlanePos) {
+function getPlaneRTCPos(dist, dir, rtcOrigin, rtcPlanePos, rotationMatrix) {
+    const rtcCenter = (rotationMatrix
+                       ? (tempVec4.set(rtcOrigin, 0), tempVec4[3] = 1, math.mulMat4v4(rotationMatrix, tempVec4, tempVec4))
+                       : rtcOrigin);
     const rtcCenterToPlaneDist = math.dotVec3(dir, rtcCenter) + dist;
     const dirNormalized = math.normalizeVec3(dir, tempVec3a);
     math.mulVec3Scalar(dirNormalized, -rtcCenterToPlaneDist, rtcPlanePos);

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

@@ -1605,7 +1605,7 @@ export class SceneModel extends Component {
         if (this._matrixDirty) {
             math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrix);
             math.conjugateQuaternion(this._quaternion, this._conjugateQuaternion);
-            math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrixConjugate);
+            math.quaternionToRotationMat4(this._conjugateQuaternion, this._worldRotationMatrixConjugate);
             this._matrix.set(this._worldRotationMatrix);
             math.translateMat4v(this._position, this._matrix);
             this._matrixDirty = false;
@@ -3129,6 +3129,7 @@ export class SceneModel extends Component {
             cfg.meshMatrix = cfg.transform.worldMatrix;
         }
         mesh.portionId = mesh.layer.createPortion(mesh, cfg);
+        mesh.numPrimitives = cfg.numPrimitives;
         this._meshes[cfg.id] = mesh;
         this._unusedMeshes[cfg.id] = mesh;
         this._meshList.push(mesh);
@@ -3492,7 +3493,7 @@ export class SceneModel extends Component {
             flags = flags | ENTITY_FLAGS.SELECTED;
         }
         cfg.flags = flags;
-        this._createEntity(cfg);
+        return this._createEntity(cfg);
     }
 
     _createEntity(cfg) {
@@ -3523,6 +3524,7 @@ export class SceneModel extends Component {
         this._entities[cfg.id] = entity;
         this._entitiesToFinalize.push(entity);
         this.numEntities++;
+        return entity;
     }
 
     /**

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

@@ -375,6 +375,16 @@ export class SceneModelMesh {
      */
     set aabb(aabb) { // Called by SceneModel
         this._aabbLocal = aabb;
+        if (this.origin) {
+            this._aabbLocal = aabb.slice(0);
+            const origin = this.origin;
+            this._aabbLocal[0] += origin[0];
+            this._aabbLocal[1] += origin[1];
+            this._aabbLocal[2] += origin[2];
+            this._aabbLocal[3] += origin[0];
+            this._aabbLocal[4] += origin[1];
+            this._aabbLocal[5] += origin[2];
+        }
     }
 
     /**
@@ -391,15 +401,6 @@ export class SceneModelMesh {
                 math.transformOBB3(this.model.worldMatrix, tempOBB3, tempOBB3b);
                 math.OBB3ToAABB3(tempOBB3b, this._aabbWorld);
             }
-            if (this.origin) {
-                const origin = this.origin;
-                this._aabbWorld[0] += origin[0];
-                this._aabbWorld[1] += origin[1];
-                this._aabbWorld[2] += origin[2];
-                this._aabbWorld[3] += origin[0];
-                this._aabbWorld[4] += origin[1];
-                this._aabbWorld[5] += origin[2];
-            }
             this._aabbWorldDirty = false;
         }
         return this._aabbWorld;

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

@@ -81,7 +81,7 @@ export class DTXLinesColorRenderer {
             rtcViewMatrix = viewMatrix;
         }
 
-        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
         gl.uniform1i(this._uRenderPass, renderPass);
@@ -106,7 +106,7 @@ export class DTXLinesColorRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

package/src/viewer/scene/model/dtx/triangles/DTXTrianglesLayer.js

@@ -1122,8 +1122,8 @@ export class DTXTrianglesLayer {
                 worldPos[2] = positions[i + 2];
                 worldPos[3] = 1.0;
                 math.decompressPosition(worldPos, positionsDecodeMatrix);
-                math.transformPoint4(this.model.worldMatrix, worldPos);
-                math.transformPoint4(this.model.worldMatrix, worldPos);
+                math.transformPoint4(this.model.worldMatrix, worldPos, worldPos);
+                math.transformPoint4(this.model.worldMatrix, worldPos, worldPos);
                 worldPos[0] += offsetX;
                 worldPos[1] += offsetY;
                 worldPos[2] += offsetZ;

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

@@ -93,7 +93,7 @@ export class DTXTrianglesColorRenderer {
             rtcCameraEye = camera.eye;
         }
 
-        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
         gl.uniform3fv(this._uCameraEyeRtc, rtcCameraEye);
@@ -119,7 +119,7 @@ export class DTXTrianglesColorRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -88,7 +88,7 @@ export class DTXTrianglesDepthRenderer {
             rtcCameraEye = camera.eye;
         }
 
-        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
         gl.uniform3fv(this._uCameraEyeRtc, rtcCameraEye);
@@ -114,7 +114,7 @@ export class DTXTrianglesDepthRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -81,7 +81,7 @@ export class DTXTrianglesEdgesColorRenderer {
         }
 
         gl.uniform1i(this._uRenderPass, renderPass);
-        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
 
@@ -100,7 +100,7 @@ export class DTXTrianglesEdgesColorRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -86,7 +86,7 @@ export class DTXTrianglesEdgesRenderer {
         }
 
         gl.uniform1i(this._uRenderPass, renderPass);
-        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uSceneModelMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
 
@@ -127,7 +127,7 @@ export class DTXTrianglesEdgesRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -84,7 +84,7 @@ export class DTXTrianglesNormalsRenderer {
 
         gl.uniform1i(this._uRenderPass, renderPass);
 
-        gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
 
@@ -106,7 +106,7 @@ export class DTXTrianglesNormalsRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);

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

@@ -96,7 +96,7 @@ export class DTXTrianglesOcclusionRenderer {
 
         gl.uniform3fv(this._uCameraEyeRtc, rtcCameraEye);
         gl.uniform1i(this._uRenderPass, renderPass);
-        gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrixConjugate);
+        gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrix);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
 
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
@@ -121,7 +121,7 @@ export class DTXTrianglesOcclusionRenderer {
                         if (active) {
                             const sectionPlane = sectionPlanes[sectionPlaneIndex];
                             if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
+                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a, rotationMatrix);
                                 gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                             } else {
                                 gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);