@xeokit/xeokit-sdk 2.6.100 → 2.6.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.100",
+  "version": "2.6.101",
   "description": "3D BIM IFC Viewer SDK for AEC engineering applications. Open Source JavaScript Toolkit based on pure WebGL for top performance, real-world coordinates and full double precision",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

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

@@ -37,9 +37,9 @@ const createPositionsDecodeMatrix = (function () {
         const xmin = aabb[0];
         const ymin = aabb[1];
         const zmin = aabb[2];
-        const xwid = aabb[3] - xmin;
-        const ywid = aabb[4] - ymin;
-        const zwid = aabb[5] - zmin;
+        const xwid = (aabb[3] - xmin) || 1;
+        const ywid = (aabb[4] - ymin) || 1;
+        const zwid = (aabb[5] - zmin) || 1;
         const maxInt = 65535;
         math.identityMat4(translate);
         math.translationMat4v(aabb, translate);
@@ -362,4 +362,4 @@ const geometryCompressionUtils = {
     decompressNormal: decompressNormal
 };
 
-export {geometryCompressionUtils};
+export {geometryCompressionUtils};

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

@@ -549,6 +549,25 @@ const math = {
         return dest;
     },
 
+    /**
+     * Multiplies one three-element vector by another.
+     * @method mulVec3
+     * @static
+     * @param {Array(Number)} u First vector
+     * @param {Array(Number)} v Second vector
+     * @param  {Array(Number)} [dest] Destination vector
+     * @return {Array(Number)} dest if specified, u otherwise
+     */
+    mulVec3(u, v, dest) {
+        if (!dest) {
+            dest = u;
+        }
+        dest[0] = u[0] * v[0];
+        dest[1] = u[1] * v[1];
+        dest[2] = u[2] * v[2];
+        return dest;
+    },
+
     /**
      * Multiplies one four-element vector by another.
      * @method mulVec4

package/src/viewer/scene/model/layer/DTXLayer.js

@@ -208,7 +208,9 @@ export class DTXLayer extends Layer {
                             }
                         }
                     };
-                }
+                },
+
+                _clearToOptimizeGC: () => { indicesBuffer.length = edgeIndicesBuffer.length = 0; }
             };
         };
 
@@ -509,7 +511,14 @@ export class DTXLayer extends Layer {
         const draw16 = buffer.geometry16Bits.createDrawers(createTextureForSingleItems, gl.UNSIGNED_SHORT);
         const draw32 = buffer.geometry32Bits.createDrawers(createTextureForSingleItems, gl.UNSIGNED_INT);
 
-        // Free up memory
+        // Optimization to free up memory (XCD-408 and XCD-424).
+        // The following lines were added to assist GC in cleaning up some of the data. See also the `texArray = null`.
+        // A Chrome test with Lyon[1-9].xkt models loaded simultaneously showed a decrease of 596MB to 158MB.
+        this._bucketGeometries = null;
+        this._buffer.geometry8Bits._clearToOptimizeGC();
+        this._buffer.geometry16Bits._clearToOptimizeGC();
+        this._buffer.geometry32Bits._clearToOptimizeGC();
+        Object.keys(this._buffer).forEach(k => this._buffer[k] = null);
         this._buffer = null;
 
         let deferredSetFlagsActive = false;
@@ -720,7 +729,7 @@ const createBindableDataTexture = function(gl, entitiesCnt, entitySize, type, en
     if (textureHeight === 0) {
         throw "texture height===0";
     }
-    const texArray = new arrayType(textureWidth * textureHeight * pixelWidth);
+    let texArray = new arrayType(textureWidth * textureHeight * pixelWidth);
     dataTextureRamStats[statsProp] += texArray.byteLength;
     dataTextureRamStats.numberOfTextures++;
 
@@ -736,6 +745,10 @@ const createBindableDataTexture = function(gl, entitiesCnt, entitySize, type, en
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
     gl.bindTexture(gl.TEXTURE_2D, null);
 
+    if (! exposeData) {
+        texArray = null; // See the comment related to XCD-408 and XCD-424 above.
+    }
+
     return {
         // called by createSampler::bindTexture
         bind(unit) {

package/src/viewer/scene/model/layer/VBOLayer.js

@@ -150,7 +150,8 @@ export class VBOLayer extends Layer {
                     });
 
                     return buf;
-                }
+                },
+                _clearToOptimizeGC: () => { portions.length = 0; }
             };
         };
 
@@ -477,12 +478,13 @@ export class VBOLayer extends Layer {
                               : (quantizePositions(buffer.positions.compileBuffer(Float64Array), modelAABB, positionsDecodeMatrix = math.mat4()))));
         const positionsBuf = positions && maybeCreateBuffer(positions, 3, gl.STATIC_DRAW);
         if (! instancing) {
-            portions.forEach(portion => {
-                if (portion.retainedGeometry) {
+            for (let i = 0; i < portions.length; ++i) { // WARNING: Replacing this for-loop by forEach increases memory consumption
+                const portion = portions[i];            // by not GCing `positions` arr, even if portion.retainedGeometry is false.
+                if (portion.retainedGeometry) {         // See the comment related to XCD-408 and XCD-424 below.
                     const start = 3 * portion.portionBase;
                     portion.retainedGeometry.quantizedPositions = positions.subarray(start, start + 3 * portion.portionSize);
                 }
-            });
+            }
         }
 
         const modelMatrixColBufs = instancing && buffer.modelMatrixCol.map(b => maybeCreateBuffer(b.compileBuffer(Float32Array), 4, gl.STATIC_DRAW, true));
@@ -521,6 +523,10 @@ export class VBOLayer extends Layer {
                          })());
 
         // Free up memory
+        // Optimization to free up memory (XCD-408 and XCD-424)
+        // The following line was added to assist GC in cleaning up some of the data. See also the `portions` loop above.
+        // A Chrome test with Lyon[1-9].xkt models loaded simultaneously showed a decrease of 538MB to 143MB.
+        Object.values(this._buffer).forEach(a => a._clearToOptimizeGC ? a._clearToOptimizeGC() : a.forEach(a => a._clearToOptimizeGC()));
         this._buffer = null;
 
         scratchMemory.acquire();