@xeokit/xeokit-sdk 2.4.2-beta-38 → 2.4.2-beta-40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.2-beta-38",
+  "version": "2.4.2-beta-40",
   "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/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js

@@ -181,7 +181,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const cameraControl = this.angleMeasurementsPlugin.viewer.cameraControl;
         const pointerLens = this.pointerLens;
         let mouseHovering = false;
-        let mouseHoverEntity = false;
+        let hoveredEntity = null;
         let lastMouseCanvasX = 0;
         let lastMouseCanvasY = 0;
         const mouseWorldPos = math.vec3();
@@ -213,7 +213,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                 }
                 const canvasPos = event.snappedCanvasPos || event.canvasPos;
                 mouseHovering = true;
-                mouseHoverEntity = event.entity;
+                hoveredEntity = event.entity;
                 mouseWorldPos.set(event.worldPos);
                 mouseHoverCanvasPos.set(canvasPos);
                 switch (this._mouseState) {
@@ -228,6 +228,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                             this._currentAngleMeasurement.cornerVisible = true;
                             this._currentAngleMeasurement.angleVisible = false;
                             this._currentAngleMeasurement.corner.worldPos = event.worldPos;
+                            this._currentAngleMeasurement.corner.entity = event.entity;
                         }
                         this.markerDiv.style.marginLeft = `-10000px`;
                         this.markerDiv.style.marginTop = `-10000px`;
@@ -239,6 +240,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                             this._currentAngleMeasurement.targetVisible = true;
                             this._currentAngleMeasurement.angleVisible = true;
                             this._currentAngleMeasurement.target.worldPos = event.worldPos;
+                            this._currentAngleMeasurement.target.entity = event.entity;
                         }
                         this.markerDiv.style.marginLeft = `-10000px`;
                         this.markerDiv.style.marginTop = `-10000px`;
@@ -269,15 +271,12 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                         this._currentAngleMeasurement = this.angleMeasurementsPlugin.createMeasurement({
                             id: math.createUUID(),
                             origin: {
-                                entity: mouseHoverEntity,
                                 worldPos: mouseWorldPos
                             },
                             corner: {
-                                entity: mouseHoverEntity,
                                 worldPos: mouseWorldPos
                             },
                             target: {
-                                entity: mouseHoverEntity,
                                 worldPos: mouseWorldPos
                             },
                             approximate: true
@@ -289,6 +288,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                         this._currentAngleMeasurement.targetWireVisible = false;
                         this._currentAngleMeasurement.targetVisible = false;
                         this._currentAngleMeasurement.angleVisible = false;
+                        this._currentAngleMeasurement.origin.entity = hoveredEntity;
                         this._mouseState = MOUSE_FINDING_CORNER;
                         this.angleMeasurementsPlugin.fire("measurementStart", this._currentAngleMeasurement);
                     }
@@ -298,11 +298,13 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                         this._currentAngleMeasurement.targetWireVisible = false;
                         this._currentAngleMeasurement.targetVisible = true;
                         this._currentAngleMeasurement.angleVisible = true;
+                        this._currentAngleMeasurement.corner.entity = hoveredEntity;
                         this._mouseState = MOUSE_FINDING_TARGET;
                     } else {
                         if (this._currentAngleMeasurement) {
                             this._currentAngleMeasurement.destroy();
                             this._currentAngleMeasurement = null;
+                            hoveredEntity = null;
                             this._mouseState = MOUSE_FINDING_ORIGIN
                             this.angleMeasurementsPlugin.fire("measurementCancel", this._currentAngleMeasurement);
                         }
@@ -312,7 +314,9 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                     if (mouseHovering) {
                         this._currentAngleMeasurement.targetVisible = true;
                         this._currentAngleMeasurement.angleVisible = true;
+                        this._currentAngleMeasurement.target.entity = hoveredEntity;
                         this._currentAngleMeasurement.clickable = true;
+                        hoveredEntity = null;
                         this.angleMeasurementsPlugin.fire("measurementEnd", this._currentAngleMeasurement);
                         this._currentAngleMeasurement = null;
                         this._mouseState = MOUSE_FINDING_ORIGIN;
@@ -320,6 +324,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                         if (this._currentAngleMeasurement) {
                             this._currentAngleMeasurement.destroy();
                             this._currentAngleMeasurement = null;
+                            hoveredEntity = null;
                             this._mouseState = MOUSE_FINDING_ORIGIN;
                             this.angleMeasurementsPlugin.fire("measurementCancel", this._currentAngleMeasurement);
                         }

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -191,6 +191,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
         let pointerDownCanvasX;
         let pointerDownCanvasY;
         const clickTolerance = 20;
+        let hoveredEntity = null;
 
         this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
 
@@ -225,6 +226,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                         this._markerDiv.style.background = "pink";
                         this._markerDiv.style.border = "2px solid red";
                     }
+                    hoveredEntity = event.entity;
                 } else {
                     this._markerDiv.style.marginLeft = `-10000px`;
                     this._markerDiv.style.marginTop = `-10000px`;
@@ -263,6 +265,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
             }
             if (this._currentDistanceMeasurement) {
                 if (mouseHovering) {
+                    this._currentDistanceMeasurement.target.entity = hoveredEntity;
+                    hoveredEntity = null;
                     this._currentDistanceMeasurement.clickable = true;
                     this.distanceMeasurementsPlugin.fire("measurementEnd", this._currentDistanceMeasurement);
                     this._currentDistanceMeasurement = null;
@@ -270,6 +274,7 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                     this._currentDistanceMeasurement.destroy();
                     this.distanceMeasurementsPlugin.fire("measurementCancel", this._currentDistanceMeasurement);
                     this._currentDistanceMeasurement = null;
+                    hoveredEntity = null;
                 }
             } else {
                 if (mouseHovering) {
@@ -290,6 +295,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                     this._currentDistanceMeasurementInitState.wireVisible = this._currentDistanceMeasurement.wireVisible;
                     this._currentDistanceMeasurementInitState.targetVisible = this._currentDistanceMeasurement.targetVisible;
                     this._currentDistanceMeasurement.clickable = false;
+                    this._currentDistanceMeasurement.origin.entity = hoveredEntity;
+                    hoveredEntity = null;
                     this.fire("measurementStart", this._currentDistanceMeasurement);
                 }
             }

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

@@ -3072,7 +3072,7 @@ export class SceneModel extends Component {
         if (cfg.transform) {
             cfg.meshMatrix = cfg.transform.worldMatrix;
         }
-        mesh.portionId = mesh.layer.createPortion(cfg);
+        mesh.portionId = mesh.layer.createPortion(mesh, cfg);
         this._meshes[cfg.id] = mesh;
         this._meshList.push(mesh);
         return mesh;

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

@@ -120,6 +120,7 @@ export class SceneModelMesh {
 
     _sceneModelDirty() {
         this._aabbWorldDirty = true;
+        this.layer.aabbDirty = true;
     }
 
     _transformDirty() {
@@ -129,6 +130,7 @@ export class SceneModelMesh {
             this._matrixUpdateScheduled = true;
         }
         this._aabbWorldDirty = true;
+        this.layer.aabbDirty = true;
         if (this.entity) {
             this.entity._transformDirty();
         }

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

@@ -2,7 +2,6 @@ import {ENTITY_FLAGS} from '../../ENTITY_FLAGS.js';
 import {RENDER_PASSES} from '../../RENDER_PASSES.js';
 import {math} from "../../../math/math.js";
 import {RenderState} from "../../../webgl/RenderState.js";
-import {geometryCompressionUtils} from "../../../math/geometryCompressionUtils.js";
 import {getDataTextureRenderers} from "./TrianglesDataTextureRenderers.js";
 import {TrianglesDataTextureBuffer} from "./TrianglesDataTextureBuffer.js";
 import {DataTextureState} from "./DataTextureState.js"
@@ -110,10 +109,13 @@ export class TrianglesDataTextureLayer {
 
         this._bucketGeometries = {};
 
+        this._meshes = [];
+
         /**
          * The axis-aligned World-space boundary of this TrianglesDataTextureLayer's positions.
          */
-        this.aabb = math.collapseAABB3();
+        this._aabb = math.collapseAABB3();
+        this.aabbDirty = true;
 
         /**
          * The number of updates in the current frame;
@@ -123,6 +125,17 @@ export class TrianglesDataTextureLayer {
         this._finalized = false;
     }
 
+    get aabb() {
+        if (this.aabbDirty) {
+            math.collapseAABB3(this._aabb);
+            for (let i = 0, len = this._meshes.length; i < len; i++) {
+                math.expandAABB3(this._aabb, this._meshes[i].aabb);
+            }
+            this.aabbDirty = false;
+        }
+        return this._aabb;
+    }
+
     /**
      * Returns whether the ```TrianglesDataTextureLayer``` has room for more portions.
      *
@@ -167,6 +180,7 @@ export class TrianglesDataTextureLayer {
      *
      * Gives the portion the specified geometry, color and matrix.
      *
+     * @param mesh The SceneModelMesh that owns the portion
      * @param portionCfg.positionsCompressed Flat float Local-space positionsCompressed array.
      * @param [portionCfg.normals] Flat float normals array.
      * @param [portionCfg.colors] Flat float colors array.
@@ -181,12 +195,12 @@ export class TrianglesDataTextureLayer {
      * @param portionCfg.pickColor Quantized pick color
      * @returns {number} Portion ID
      */
-    createPortion(portionCfg) {
+    createPortion(mesh, portionCfg) {
         if (this._finalized) {
             throw "Already finalized";
         }
         const subPortionIds = [];
-     //   const portionAABB = portionCfg.worldAABB;
+        //   const portionAABB = portionCfg.worldAABB;
         portionCfg.buckets.forEach((bucket, bucketIndex) => {
             const bucketGeometryId = portionCfg.geometryId !== undefined && portionCfg.geometryId !== null
                 ? `${portionCfg.geometryId}#${bucketIndex}`
@@ -196,7 +210,7 @@ export class TrianglesDataTextureLayer {
                 bucketGeometry = this._createBucketGeometry(portionCfg, bucket);
                 this._bucketGeometries[bucketGeometryId] = bucketGeometry;
             }
-          //  const subPortionAABB = math.collapseAABB3(tempAABB3b);
+            //  const subPortionAABB = math.collapseAABB3(tempAABB3b);
             const subPortionId = this._createSubPortion(portionCfg, bucketGeometry, bucket);
             //math.expandAABB3(portionAABB, subPortionAABB);
             subPortionIds.push(subPortionId);
@@ -214,6 +228,7 @@ export class TrianglesDataTextureLayer {
         const portionId = this._portionToSubPortionsMap.length;
         this._portionToSubPortionsMap.push(subPortionIds);
         this.model.numPortions++;
+        this._meshes.push(mesh);
         return portionId;
     }
 
@@ -318,7 +333,7 @@ export class TrianglesDataTextureLayer {
             numEdges,
             indicesBase,
             edgeIndicesBase,
-           // aabb,
+            // aabb,
             obb: null // Lazy-created in _createSubPortion if needed
         };
 
@@ -498,7 +513,7 @@ export class TrianglesDataTextureLayer {
         textureState.texturePerVertexIdCoordinates = this._dataTextureGenerator.generateTextureForPositions(
             gl,
             buffer.positionsCompressed,
-            buffer.lenPositionsCompressed );
+            buffer.lenPositionsCompressed);
 
         textureState.texturePerPolygonIdPortionIds8Bits = this._dataTextureGenerator.generateTextureForPackedPortionIds(
             gl,
@@ -1079,7 +1094,7 @@ export class TrianglesDataTextureLayer {
         const textureState = this._dataTextureState;
         const gl = this.model.scene.canvas.gl;
         tempMat4a.set(matrix);
-        textureState.texturePerObjectInstanceMatrices._textureData.set(tempMat4a, subPortionId*16);
+        textureState.texturePerObjectInstanceMatrices._textureData.set(tempMat4a, subPortionId * 16);
         if (this._deferredSetFlagsActive) {
             this._deferredSetFlagsDirty = true;
             return;
@@ -1102,7 +1117,7 @@ export class TrianglesDataTextureLayer {
         );
         // gl.bindTexture (gl.TEXTURE_2D, null);
     }
-    
+
     // ---------------------- COLOR RENDERING -----------------------------------
 
     drawColorOpaque(renderFlags, frameCtx) {

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

@@ -48,7 +48,7 @@ export class TrianglesDataTextureSnapDepthBufInitRenderer {
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
-        const aabb = model.aabb;
+        const aabb = dataTextureLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         const coordinateScaler = tempVec3a;

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

@@ -52,7 +52,7 @@ export class TrianglesDataTextureSnapDepthRenderer {
         const textureState = state.textureState;
         const origin = dataTextureLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
-        const aabb = model.aabb;
+        const aabb = dataTextureLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         const coordinateScaler = tempVec3a;

package/src/viewer/scene/model/vbo/linesBatching/LinesBatchingLayer.js

@@ -4,7 +4,6 @@ import {RENDER_PASSES} from '../../RENDER_PASSES.js';
 import {math} from "../../../math/math.js";
 import {RenderState} from "../../../webgl/RenderState.js";
 import {ArrayBuf} from "../../../webgl/ArrayBuf.js";
-import {geometryCompressionUtils} from "../../../math/geometryCompressionUtils.js";
 import {getBatchingRenderers} from "./LinesBatchingRenderers.js";
 import {LinesBatchingBuffer} from "./LinesBatchingBuffer.js";
 import {quantizePositions} from "../../compression.js";
@@ -65,9 +64,12 @@ class LinesBatchingLayer {
 
         this._modelAABB = math.collapseAABB3(); // Model-space AABB
         this._portions = [];
-
+        this._meshes = [];
         this._numVerts = 0;
 
+        this._aabb = math.collapseAABB3();
+        this.aabbDirty = true;
+
         this._finalized = false;
 
         if (cfg.positionsDecodeMatrix) {
@@ -88,6 +90,17 @@ class LinesBatchingLayer {
         this.aabb = math.collapseAABB3();
     }
 
+    get aabb() {
+        if (this.aabbDirty) {
+            math.collapseAABB3(this._aabb);
+            for (let i = 0, len = this._meshes.length; i < len; i++) {
+                math.expandAABB3(this._aabb, this._meshes[i].aabb);
+            }
+            this.aabbDirty = false;
+        }
+        return this._aabb;
+    }
+
     /**
      * Tests if there is room for another portion in this LinesBatchingLayer.
      *
@@ -107,6 +120,7 @@ class LinesBatchingLayer {
      *
      * Gives the portion the specified geometry, color and matrix.
      *
+     * @param mesh The SceneModelMesh that owns the portion
      * @param cfg.positions Flat float Local-space positions array.
      * @param cfg.positionsCompressed Flat quantized positions array - decompressed with TrianglesBatchingLayer positionsDecodeMatrix
      * @param cfg.indices  Flat int indices array.
@@ -117,7 +131,7 @@ class LinesBatchingLayer {
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID
      */
-    createPortion(cfg) {
+    createPortion(mesh, cfg) {
 
         if (this._finalized) {
             throw "Already finalized";
@@ -194,6 +208,8 @@ class LinesBatchingLayer {
 
         this._numVerts += numVerts;
 
+        this._meshes.push(mesh);
+
         return portionId;
     }
 

package/src/viewer/scene/model/vbo/linesInstancing/LinesInstancingLayer.js

@@ -100,6 +100,10 @@ class LinesInstancingLayer {
         this._modelMatrixCol2 = [];
 
         this._portions = [];
+        this._meshes = [];
+
+        this._aabb = math.collapseAABB3();
+        this.aabbDirty = true;
 
         if (cfg.origin) {
             this._state.origin = math.vec3(cfg.origin);
@@ -108,6 +112,17 @@ class LinesInstancingLayer {
         this._finalized = false;
     }
 
+    get aabb() {
+        if (this.aabbDirty) {
+            math.collapseAABB3(this._aabb);
+            for (let i = 0, len = this._meshes.length; i < len; i++) {
+                math.expandAABB3(this._aabb, this._meshes[i].aabb);
+            }
+            this.aabbDirty = false;
+        }
+        return this._aabb;
+    }
+
     /**
      * Creates a new portion within this InstancingLayer, returns the new portion ID.
      *
@@ -115,13 +130,14 @@ class LinesInstancingLayer {
      *
      * Gives the portion the specified color and matrix.
      *
+     * @param mesh The SceneModelMesh that owns the portion
      * @param cfg Portion params
      * @param cfg.color Color [0..255,0..255,0..255]
      * @param cfg.opacity Opacity [0..255].
      * @param cfg.meshMatrix Flat float 4x4 matrix.
      * @returns {number} Portion ID.
      */
-    createPortion(cfg) {
+    createPortion(mesh, cfg) {
 
         const color = cfg.color;
         const opacity = cfg.opacity;
@@ -170,6 +186,8 @@ class LinesInstancingLayer {
         this._numPortions++;
         this.model.numPortions++;
 
+        this._meshes.push(mesh);
+
         return portionId;
     }
 

package/src/viewer/scene/model/vbo/pointsBatching/PointsBatchingLayer.js

@@ -4,7 +4,6 @@ import {RENDER_PASSES} from '../../RENDER_PASSES.js';
 import {math} from "../../../math/math.js";
 import {RenderState} from "../../../webgl/RenderState.js";
 import {ArrayBuf} from "../../../webgl/ArrayBuf.js";
-import {geometryCompressionUtils} from "../../../math/geometryCompressionUtils.js";
 import {getPointsBatchingRenderers} from "./PointsBatchingRenderers.js";
 import {PointsBatchingBuffer} from "./PointsBatchingBuffer.js";
 import {quantizePositions} from "../../compression.js";
@@ -77,6 +76,10 @@ class PointsBatchingLayer {
 
         this._modelAABB = math.collapseAABB3(); // Model-space AABB
         this._portions = [];
+        this._meshes = [];
+
+        this._aabb = math.collapseAABB3();
+        this.aabbDirty = true;
 
         this._finalized = false;
 
@@ -98,6 +101,17 @@ class PointsBatchingLayer {
         this.aabb = math.collapseAABB3();
     }
 
+    get aabb() {
+        if (this.aabbDirty) {
+            math.collapseAABB3(this._aabb);
+            for (let i = 0, len = this._meshes.length; i < len; i++) {
+                math.expandAABB3(this._aabb, this._meshes[i].aabb);
+            }
+            this.aabbDirty = false;
+        }
+        return this._aabb;
+    }
+
     /**
      * Tests if there is room for another portion in this PointsBatchingLayer.
      *
@@ -116,6 +130,7 @@ class PointsBatchingLayer {
      *
      * Gives the portion the specified geometry, color and matrix.
      *
+     * @param mesh The SceneModelMesh that owns the portion
      * @param cfg.positions Flat float Local-space positions array.
      * @param cfg.positionsCompressed Flat quantized positions array - decompressed with PointsBatchingLayer positionsDecodeMatrix
      * @param [cfg.colorsCompressed] Quantized RGB colors [0..255,0..255,0..255,0..255]
@@ -126,7 +141,7 @@ class PointsBatchingLayer {
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID
      */
-    createPortion(cfg) {
+    createPortion(mesh, cfg) {
 
         if (this._finalized) {
             throw "Already finalized";
@@ -137,7 +152,7 @@ class PointsBatchingLayer {
         const color = cfg.color;
         const colorsCompressed = cfg.colorsCompressed;
         const colors = cfg.colors;
-         const pickColor = cfg.pickColor;
+        const pickColor = cfg.pickColor;
 
         const buffer = this._buffer;
         const positionsIndex = buffer.positions.length;
@@ -226,7 +241,7 @@ class PointsBatchingLayer {
 
         this._numPortions++;
         this.model.numPortions++;
-
+        this._meshes.push(mesh);
         return portionId;
     }
 
@@ -490,7 +505,7 @@ class PointsBatchingLayer {
         let colorFlag;
         if (!visible || culled || xrayed
             || (highlighted && !this.model.scene.highlightMaterial.glowThrough)
-            || (selected && !this.model.scene.selectedMaterial.glowThrough) ) {
+            || (selected && !this.model.scene.selectedMaterial.glowThrough)) {
             colorFlag = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (transparent) {
@@ -524,7 +539,7 @@ class PointsBatchingLayer {
             // no edges
             vertFlag |= pickFlag << 12;
             vertFlag |= clippableFlag << 16;
-    
+
             tempArray[i] = vertFlag;
         }
 

package/src/viewer/scene/model/vbo/pointsInstancing/PointsInstancingLayer.js

@@ -97,10 +97,24 @@ class PointsInstancingLayer {
         this._modelMatrixCol2 = [];
 
         this._portions = [];
+        this._meshes = [];
+        this._aabb = math.collapseAABB3();
+        this.aabbDirty = true;
 
         this._finalized = false;
     }
 
+    get aabb() {
+        if (this.aabbDirty) {
+            math.collapseAABB3(this._aabb);
+            for (let i = 0, len = this._meshes.length; i < len; i++) {
+                math.expandAABB3(this._aabb, this._meshes[i].aabb);
+            }
+            this.aabbDirty = false;
+        }
+        return this._aabb;
+    }
+
     /**
      * Creates a new portion within this InstancingLayer, returns the new portion ID.
      *
@@ -108,13 +122,14 @@ class PointsInstancingLayer {
      *
      * Gives the portion the specified color and matrix.
      *
+     * @param mesh The SceneModelMesh that owns the portion
      * @param cfg Portion params
      * @param cfg.meshMatrix Flat float 4x4 matrix.
      * @param [cfg.worldMatrix] Flat float 4x4 matrix.
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID.
      */
-    createPortion(cfg) {
+    createPortion(mesh, cfg) {
 
         const meshMatrix = cfg.meshMatrix;
         const pickColor = cfg.pickColor;
@@ -158,7 +173,7 @@ class PointsInstancingLayer {
 
         this._numPortions++;
         this.model.numPortions++;
-
+        this._meshes.push(mesh);
         return portionId;
     }
 

package/src/viewer/scene/model/vbo/snapBatching/SnapBatchingDepthBufInitRenderer.js

@@ -35,7 +35,7 @@ export class SnapBatchingDepthBufInitRenderer extends VBOSceneModelRenderer {
         const state = batchingLayer._state;
         const origin = batchingLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
-        const aabb = model.aabb;
+        const aabb = batchingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         if (this._vaoCache.has(batchingLayer)) {

package/src/viewer/scene/model/vbo/snapBatching/SnapBatchingDepthRenderer.js

@@ -39,7 +39,7 @@ export class SnapBatchingDepthRenderer extends VBOSceneModelRenderer{
         const state = batchingLayer._state;
         const origin = batchingLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
-        const aabb = model.aabb;
+        const aabb = batchingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         if (this._vaoCache.has(batchingLayer)) {

package/src/viewer/scene/model/vbo/snapInstancing/SnapInstancingDepthBufInitRenderer.js

@@ -40,7 +40,7 @@ class SnapInstancingDepthBufInitRenderer extends VBOSceneModelRenderer {
         const state = instancingLayer._state;
         const origin = instancingLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
-        const aabb = model.aabb;
+        const aabb = instancingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         if (this._vaoCache.has(instancingLayer)) {

package/src/viewer/scene/model/vbo/snapInstancing/SnapInstancingDepthRenderer.js

@@ -40,7 +40,7 @@ class SnapInstancingDepthRenderer extends VBOSceneModelRenderer {
         const state = instancingLayer._state;
         const origin = instancingLayer._state.origin;
         const {position, rotationMatrix, rotationMatrixConjugate} = model;
-        const aabb = model.aabb;
+        const aabb = instancingLayer.aabb; // Per-layer AABB for best RTC accuracy
         const viewMatrix = frameCtx.pickViewMatrix || camera.viewMatrix;
 
         if (this._vaoCache.has(instancingLayer)) {

package/src/viewer/scene/model/vbo/trianglesBatching/TrianglesBatchingLayer.js

@@ -106,9 +106,12 @@ class TrianglesBatchingLayer {
 
         this._modelAABB = math.collapseAABB3(); // Model-space AABB
         this._portions = [];
-
+        this._meshes = [];
         this._numVerts = 0;
 
+        this._aabb = math.collapseAABB3();
+        this.aabbDirty = true;
+
         this._finalized = false;
 
         if (cfg.positionsDecodeMatrix) {
@@ -139,6 +142,16 @@ class TrianglesBatchingLayer {
         this.solid = !!cfg.solid;
     }
 
+    get aabb() {
+        if (this.aabbDirty) {
+            math.collapseAABB3(this._aabb);
+            for (let i = 0, len = this._meshes.length; i < len; i++) {
+                math.expandAABB3(this._aabb, this._meshes[i].aabb);
+            }
+            this.aabbDirty = false;
+        }
+    }
+
     /**
      * Tests if there is room for another portion in this TrianglesBatchingLayer.
      *
@@ -158,6 +171,7 @@ class TrianglesBatchingLayer {
      *
      * Gives the portion the specified geometry, color and matrix.
      *
+     * @param mesh The SceneModelMesh that owns the portion
      * @param cfg.positions Flat float Local-space positions array.
      * @param cfg.positionsCompressed Flat quantized positions array - decompressed with TrianglesBatchingLayer positionsDecodeMatrix
      * @param [cfg.normals] Flat float normals array.
@@ -176,7 +190,7 @@ class TrianglesBatchingLayer {
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID
      */
-    createPortion(cfg) {
+    createPortion(mesh, cfg) {
 
         if (this._finalized) {
             throw "Already finalized";
@@ -215,8 +229,7 @@ class TrianglesBatchingLayer {
             for (let i = 0, len = positionsCompressed.length; i < len; i++) {
                 buffer.positions.push(positionsCompressed[i]);
             }
-        }
-        else {
+        } else {
             if (!positions) {
                 throw "positions expected";
             }
@@ -333,13 +346,10 @@ class TrianglesBatchingLayer {
         }
 
         this._portions.push(portion);
-
         this._numPortions++;
-
         this.model.numPortions++;
-
         this._numVerts += portion.numVerts;
-
+        this._meshes.push(mesh);
         return portionId;
     }