@xeokit/xeokit-sdk 2.6.69 → 2.6.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.69",
+  "version": "2.6.71",
   "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",
@@ -53,6 +53,7 @@
   },
   "homepage": "https://xeokit.io",
   "dependencies": {
+    "@creooxag/cx-converter": "^0.0.12-alpha",
     "@loaders.gl/core": "^4.3.3",
     "@loaders.gl/gltf": "^4.3.3",
     "@loaders.gl/las": "^4.3.3",
@@ -76,6 +77,7 @@
     "eslint": "^8.13.0",
     "parse5": "^7.0.0",
     "rollup": "^2.70.2",
+    "rollup-plugin-banner": "^0.2.1",
     "rollup-plugin-terser": "^7.0.2",
     "typedoc": "^0.22.15"
   },

package/src/plugins/CxConverterIFCLoaderPlugin/CxConverterIFCLoaderPlugin.js

@@ -0,0 +1,86 @@
+import { Plugin } from "../../viewer/Plugin.js";
+import { GLTFLoaderPlugin } from "../GLTFLoaderPlugin/GLTFLoaderPlugin.js";
+import { ifc2gltf } from "@creooxag/cx-converter";
+
+/**
+ * Fetches a file from the given URL and returns its contents as text.
+ *
+ * @param {string} url - The URL to fetch the file from.
+ * @returns {Promise<string>} A promise that resolves to the file contents.
+ * @private
+ */
+async function fetchFile(url) {
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`HTTP error! Status: ${response.status}`);
+        }
+        return response.text();
+    } catch (error) {
+        console.error('Error fetching file:', error);
+    }
+}
+
+/**
+ * {@link Viewer} plugin that uses [CxConverter](https://github.com/Creoox/cxconverter) to load BIM models directly from IFC files, using its WebAssembly buid from [npm package](https://www.npmjs.com/package/@creooxag/cx-converter).
+ *
+ * ## Overview
+ * The WebAssembly build of CxConverter is still in alfa stage, so it may not work as expected. This documentation will be updated as the library and the plugin evolve. The example below shows how to use the plugin:
+ * ````javascript
+ * import { CxConverterIFCLoaderPlugin, Viewer } from "../../dist/xeokit-sdk.es.js";
+ * const cxConverterIFCLoaderPlugin = new CxConverterIFCLoaderPlugin(viewer);
+ * 
+ * const sceneModel = await cxConverterIFCLoaderPlugin.load({
+ *        src: "../../assets/models/ifc/Duplex.ifc"
+ * }); 
+ * ````
+    See the code in action [here](https://xeokit.github.io/xeokit-sdk/examples/buildings/#cxConverterIFC_vbo_Duplex).
+ */
+
+class CxConverterIFCLoaderPlugin extends Plugin {
+    /**
+     * @constructor
+     * @param {Viewer} viewer The Viewer.
+     * @param {Object} [cfg={}] Plugin configuration.
+     */
+    constructor(viewer, cfg = {}) {
+        super("ifcLoader", viewer, cfg);
+
+        /**
+         * The GLTFLoaderPlugin used internally to load the converted GLTF.
+         * @type {GLTFLoaderPlugin}
+         */
+        this.gltfLoader = new GLTFLoaderPlugin(this.viewer);
+    }
+
+    /**
+     * Loads an IFC model from the given source.
+     *
+     * @param {Object} [params={}] Loading parameters.
+     * @param {string} params.src Path to an IFC file.
+     * @param {Function} [params.progressCallback] Callback to track loading progress.
+     * @param {Function} [params.progressTextCallback] Callback to track loading progress with text updates.
+     * @returns {Promise<SceneModel>} A promise that resolves to the loaded SceneModel.
+     */
+    async load(params = {}) {
+        if (!params.src) {
+            this.error("load() param expected: src");
+        }
+        const data = await fetchFile(params.src);
+        const { gltf, metaData } = await ifc2gltf(
+            data,
+            {
+                remote: true,
+                progressCallback: params.progressCallback,
+                progressTextCallback: params.progressTextCallback
+            }
+        );
+        const sceneModel = this.gltfLoader.load({
+            id: "myModel",
+            gltf: gltf,
+            metaModelJSON: metaData
+        });
+        return sceneModel;
+    }
+}
+export { CxConverterIFCLoaderPlugin };

package/src/plugins/CxConverterIFCLoaderPlugin/index.js

@@ -0,0 +1 @@
+export * from "./CxConverterIFCLoaderPlugin.js";

package/src/plugins/LASLoaderPlugin/LASDefaultDataSource.js

@@ -1,3 +1,5 @@
+import {utils} from "../../viewer/scene/utils.js";
+
 /**
  * Default data access strategy for {@link LASLoaderPlugin}.
  */
@@ -60,13 +62,23 @@ class LASDefaultDataSource {
                     if (request.status === 200) {
                         ok(request.response);
                     } else {
-                        error('getXKT error : ' + request.response);
+                        error('getLAS error : ' + request.response);
                     }
                 }
             };
             request.send(null);
         }
     }
+
+    getManifest(manifestSrc, ok, error) {
+        utils.loadJSON(this._cacheBusterURL(manifestSrc),
+            (json) => {
+                ok(json);
+            },
+            function (errMsg) {
+                error(errMsg);
+            });
+    }
 }
 
 export {LASDefaultDataSource};

package/src/plugins/LASLoaderPlugin/LASLoaderPlugin.js

@@ -430,6 +430,8 @@ class LASLoaderPlugin extends Plugin {
      * @param {String} [params.id] ID to assign to the root {@link Entity#id}, unique among all components in the Viewer's {@link Scene}, generated automatically by default.
      * @param {String} [params.src] Path to a LAS file, as an alternative to the ````las```` parameter.
      * @param {ArrayBuffer} [params.las] The LAS file data, as an alternative to the ````src```` parameter.
+     *  @param {String} [params.manifestSrc] Path or URL to a JSON manifest file that provides paths to ````.laz```` || ````.las```` files to load as parts of the model. Use this option to load models that have been split into
+     * @param {Object} [params.manifest] A JSON manifest object (as an alternative to a path or URL) that provides paths to ````.laz```` || ````.las```` files to load as parts of the model. Use this option to load models that have been split into
      * @param {Boolean} [params.loadMetadata=true] Whether to load metadata for the LAS model.
      * @param {Number[]} [params.origin=[0,0,0]] The model's World-space double-precision 3D origin. Use this to position the model within xeokit's World coordinate system, using double-precision coordinates.
      * @param {Number[]} [params.position=[0,0,0]] The model single-precision 3D position, relative to the ````origin```` parameter.
@@ -451,7 +453,7 @@ class LASLoaderPlugin extends Plugin {
             isModel: true
         }));
 
-        if (!params.src && !params.las) {
+        if (!params.src && !params.las && !params.manifest && !params.manifestSrc) {
             this.error("load() param expected: src or las");
             return sceneModel; // Return new empty model
         }
@@ -464,18 +466,77 @@ class LASLoaderPlugin extends Plugin {
             }
         };
 
+        const spinner = this.viewer.scene.canvas.spinner;
+        const done = () => {
+            sceneModel.scene.once("tick", () => {
+                if (sceneModel.destroyed) {
+                    return;
+                }
+                sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
+                sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
+            });
+            spinner.processes--;
+        }
+        const error = (errMsg) => {
+            spinner.processes--;
+            this.error(errMsg);
+            sceneModel.fire("error", errMsg);
+        }
+
         if (params.src) {
             this._loadModel(params.src, params, options, sceneModel);
-        } else {
-            const spinner = this.viewer.scene.canvas.spinner;
+        } else if(params.las) {
             spinner.processes++;
-            this._parseModel(params.las, params, options, sceneModel).then(() => {
-                spinner.processes--;
-            }, (errMsg) => {
-                spinner.processes--;
-                this.error(errMsg);
-                sceneModel.fire("error", errMsg);
-            });
+            this._parseModel(params.las, params, options, sceneModel).then(done, error);
+        } else if (params.manifest || params.manifestSrc) {
+            const baseDir = params.manifestSrc ? getBaseDirectory(params.manifestSrc) : "";
+            const loadAllFiles = (lasFiles) => { 
+                let i = 0;
+                const modelsLoaded = new Array(lasFiles.length);
+                const loadNext = () => {
+                    if (sceneModel.destroyed) {
+                        done();
+                    } else if (i >= lasFiles.length) {
+                        return
+                    } else {
+                        modelsLoaded[i] = false;
+                        this._dataSource.getLAS(`${baseDir}${lasFiles[i]}`, (arrayBuffer) => {
+                            const modelParams = utils.apply(params, {isManifest: true, index: i});
+                            this._parseModel(arrayBuffer, modelParams, options, sceneModel).then(() => {
+                                modelsLoaded[modelParams.index] = true;
+                                let allLoaded = true;
+                                modelsLoaded.forEach((loaded) => {
+                                    if(!loaded) allLoaded = false;
+                                })
+                                if(allLoaded) done();
+                            });
+                            i++;
+                            this.scheduleTask(loadNext, 200);
+                        }, error);
+                    }
+                }
+                loadNext();
+            };
+            const loadManifestData = (manifestData) => {
+                if(sceneModel.destroyed) return;
+                const files = manifestData.lasFiles || manifestData.lazFiles;
+                if(!files || files.length <= 0) {
+                    this.error(`load(): Failed to load model manifest - manifest not valid`);
+                    return;
+                }
+                loadAllFiles(files);
+            }
+            if(params.manifestSrc) {
+                this._dataSource.getManifest(params.manifestSrc, (manifestData) => {
+                    loadManifestData(manifestData);
+                }, (errMsg) => {
+                    this.error(errMsg);
+                    sceneModel.fire("error", errMsg);
+                })
+            } else {
+                const manifestData = params.manifest;
+                loadManifestData(manifestData);
+            }
         }
 
         return sceneModel;
@@ -486,6 +547,13 @@ class LASLoaderPlugin extends Plugin {
         spinner.processes++;
         this._dataSource.getLAS(params.src, (arrayBuffer) => {
                 this._parseModel(arrayBuffer, params, options, sceneModel).then(() => {
+                    sceneModel.scene.once("tick", () => {
+                        if (sceneModel.destroyed) {
+                            return;
+                        }
+                        sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
+                        sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
+                    });
                     spinner.processes--;
                 }, (errMsg) => {
                     spinner.processes--;
@@ -668,7 +736,7 @@ class LASLoaderPlugin extends Plugin {
                     const meshIds = [];
 
                     for (let i = 0, len = pointsChunks.length; i < len; i++) {
-                        const meshId = `pointsMesh${i}`;
+                        const meshId = `${params.isManifest ? 'model'+params.index : ''}pointsMesh${i}`;
                         meshIds.push(meshId);
                         sceneModel.createMesh({
                             id: meshId,
@@ -677,30 +745,6 @@ class LASLoaderPlugin extends Plugin {
                             colorsCompressed: (i < colorsChunks.length) ? colorsChunks[i] : null
                         });
                     }
-                    /*
-                                const pointsChunks = chunkArray(positionsValue, MAX_VERTICES * 3);
-                    const colorsChunks = chunkArray(colorsCompressed, MAX_VERTICES * 4);
-                    const meshIds = [];
-
-                    for (let i = 0, len = pointsChunks.length; i < len; i++) {
-
-                        const geometryId = `geometryMesh${i}`;
-                        const meshId = `pointsMesh${i}`;
-                        meshIds.push(meshId);
-
-                        sceneModel.createGeometry({
-                            id: geometryId,
-                            primitive: "points",
-                            positions: pointsChunks[i],
-                            colorsCompressed: (i < colorsChunks.length) ? colorsChunks[i] : null
-                        });
-
-                        sceneModel.createMesh({
-                            id: meshId,
-                            geometryId
-                        });
-                    }
-                     */
 
                     const pointsObjectId = params.entityId || math.createUUID();
 
@@ -743,14 +787,6 @@ class LASLoaderPlugin extends Plugin {
                         this.viewer.metaScene.createMetaModel(metaModelId, metadata, options);
                     }
 
-                    sceneModel.scene.once("tick", () => {
-                        if (sceneModel.destroyed) {
-                            return;
-                        }
-                        sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
-                        sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
-                    });
-
                     resolve();
                 });
             } catch (e) {
@@ -772,4 +808,14 @@ function chunkArray(array, chunkSize) {
     return result;
 }
 
+function getBaseDirectory(filePath) {
+    if (filePath.indexOf('?') > -1) {
+        filePath = filePath.split('?')[0];
+    }
+
+    const pathArray = filePath.split('/');
+    pathArray.pop(); // Remove the file name or the last segment of the path
+    return pathArray.join('/') + '/';
+}
+
 export {LASLoaderPlugin};

package/src/plugins/TreeViewPlugin/TreeViewPlugin.js

@@ -464,7 +464,8 @@ export class TreeViewPlugin extends Plugin {
                 const indeterminate = this._showIndeterminate 
                   && parent.numVisibleEntities > 0 
                   && parent.numVisibleEntities < parent.numEntities;
-                this._renderService.setCheckbox(parent.nodeId, (parent.numVisibleEntities > 0), indeterminate);
+                parent.checked = parent.numVisibleEntities > 0;
+                this._renderService.setCheckbox(parent.nodeId, parent.checked, indeterminate);
 
                 parent = parent.parent;
             }
@@ -539,7 +540,6 @@ export class TreeViewPlugin extends Plugin {
 
             let parent = checkedNode.parent;
             while (parent) {
-                parent.checked = visible;
                 
                 if (visible) {
                     parent.numVisibleEntities += numUpdated;
@@ -549,7 +549,8 @@ export class TreeViewPlugin extends Plugin {
                 const indeterminate = this._showIndeterminate 
                   && parent.numVisibleEntities > 0 
                   && parent.numVisibleEntities < parent.numEntities;
-                this._renderService.setCheckbox(parent.nodeId, (parent.numVisibleEntities > 0), indeterminate);
+                parent.checked = parent.numVisibleEntities > 0;
+                this._renderService.setCheckbox(parent.nodeId, parent.checked, indeterminate);
                 
                 parent = parent.parent;
             }

package/src/plugins/index.js

@@ -17,6 +17,7 @@ export * from "./ViewCullPlugin/index.js";
 export * from "./XKTLoaderPlugin/index.js";
 export * from "./XML3DLoaderPlugin/index.js";
 export * from "./WebIFCLoaderPlugin/index.js";
+export * from "./CxConverterIFCLoaderPlugin/index.js";
 export * from "./LASLoaderPlugin/index.js";
 export * from "./CityJSONLoaderPlugin/index.js";
 export * from "./DotBIMLoaderPlugin/index.js";

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

@@ -158,8 +158,20 @@ const math = {
      * @static
      * @returns {Number[]}
      */
-    mat4ToMat3(mat4, mat3) { // TODO
-        //return new FloatArrayType(values || 9);
+    mat4ToMat3(mat4, mat3 = new FloatArrayType(9)) {
+        mat3[0] = mat4[0];
+        mat3[1] = mat4[1];
+        mat3[2] = mat4[2];
+        
+        mat3[3] = mat4[4];
+        mat3[4] = mat4[5];
+        mat3[5] = mat4[6];
+        
+        mat3[6] = mat4[8];
+        mat3[7] = mat4[9];
+        mat3[8] = mat4[10];
+        
+        return mat3;
     },
 
     /**

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

@@ -127,6 +127,8 @@ export class VBOBatchingLineSnapInitRenderer extends VBORenderer {
         state.indicesBuf.bind();
         gl.drawElements(gl.TRIANGLES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0);
         state.indicesBuf.unbind();
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

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

@@ -126,6 +126,8 @@ export class VBOBatchingLinesSnapInitRenderer extends VBORenderer {
         state.indicesBuf.bind();
         gl.drawElements(gl.LINES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0);
         state.indicesBuf.unbind();
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

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

@@ -135,6 +135,8 @@ export class VBOBatchingLinesSnapRenderer extends VBORenderer{
         } else {
             gl.drawArrays(gl.POINTS, 0, state.positionsBuf.numItems);
         }
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

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

@@ -125,6 +125,8 @@ export class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
         //=============================================================
 
         gl.drawArrays(gl.POINTS, 0, state.positionsBuf.numItems);
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

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

@@ -129,6 +129,8 @@ export class VBOBatchingPointsSnapRenderer extends VBORenderer{
         //=============================================================
 
         gl.drawArrays(gl.POINTS, 0, state.positionsBuf.numItems);
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

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

@@ -126,6 +126,8 @@ export class TrianglesSnapInitRenderer extends VBORenderer {
         state.indicesBuf.bind();
         gl.drawElements(gl.TRIANGLES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0);
         state.indicesBuf.unbind();
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

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

@@ -136,6 +136,8 @@ export class TrianglesSnapRenderer extends VBORenderer{
         } else {
             gl.drawArrays(gl.POINTS, 0, state.positionsBuf.numItems);
         }
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesSnapInitRenderer.js

@@ -117,34 +117,11 @@ export class VBOInstancingLinesSnapInitRenderer extends VBORenderer {
 
         this.setSectionPlanesStateUniforms(instancingLayer);
 
-        this._aModelMatrixCol0.bindArrayBuffer(state.modelMatrixCol0Buf);
-        this._aModelMatrixCol1.bindArrayBuffer(state.modelMatrixCol1Buf);
-        this._aModelMatrixCol2.bindArrayBuffer(state.modelMatrixCol2Buf);
-
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 1);
-
-
-        if (this._aFlags) {
-            this._aFlags.bindArrayBuffer(state.flagsBuf);
-            gl.vertexAttribDivisor(this._aFlags.location, 1);
-        }
-
         state.indicesBuf.bind();
         gl.drawElementsInstanced(gl.LINES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0, state.numInstances);
         state.indicesBuf.unbind();
 
-        // Cleanup
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 0);
-        if (this._aFlags) {
-            gl.vertexAttribDivisor(this._aFlags.location, 0);
-        }
-        if (this._aOffset) {
-            gl.vertexAttribDivisor(this._aOffset.location, 0);
-        }
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesSnapRenderer.js

@@ -116,17 +116,6 @@ export class VBOInstancingLinesSnapRenderer extends VBORenderer {
 
         this.setSectionPlanesStateUniforms(instancingLayer);
 
-
-        this._aModelMatrixCol0.bindArrayBuffer(state.modelMatrixCol0Buf);
-        this._aModelMatrixCol1.bindArrayBuffer(state.modelMatrixCol1Buf);
-        this._aModelMatrixCol2.bindArrayBuffer(state.modelMatrixCol2Buf);
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 1);
-
-        this._aFlags.bindArrayBuffer(state.flagsBuf);
-        gl.vertexAttribDivisor(this._aFlags.location, 1);
-
         if (frameCtx.snapMode === "edge") {
             state.indicesBuf.bind();
             gl.drawElementsInstanced(gl.LINES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0, state.numInstances);
@@ -134,14 +123,8 @@ export class VBOInstancingLinesSnapRenderer extends VBORenderer {
         } else {
             gl.drawArraysInstanced(gl.POINTS, 0, state.positionsBuf.numItems, state.numInstances);
         }
-        // Cleanup
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 0);
-        gl.vertexAttribDivisor(this._aFlags.location, 0);
-        if (this._aOffset) {
-            gl.vertexAttribDivisor(this._aOffset.location, 0);
-        }
+
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsSnapInitRenderer.js

@@ -117,32 +117,9 @@ export class VBOInstancingPointsSnapInitRenderer extends VBORenderer {
 
         this.setSectionPlanesStateUniforms(instancingLayer);
 
-        this._aModelMatrixCol0.bindArrayBuffer(state.modelMatrixCol0Buf);
-        this._aModelMatrixCol1.bindArrayBuffer(state.modelMatrixCol1Buf);
-        this._aModelMatrixCol2.bindArrayBuffer(state.modelMatrixCol2Buf);
-
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 1);
-
-
-        if (this._aFlags) {
-            this._aFlags.bindArrayBuffer(state.flagsBuf);
-            gl.vertexAttribDivisor(this._aFlags.location, 1);
-        }
-
         gl.drawArraysInstanced(gl.POINTS, 0, state.positionsBuf.numItems, state.numInstances);
 
-        // Cleanup
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 0);
-        if (this._aFlags) {
-            gl.vertexAttribDivisor(this._aFlags.location, 0);
-        }
-        if (this._aOffset) {
-            gl.vertexAttribDivisor(this._aOffset.location, 0);
-        }
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsSnapRenderer.js

@@ -116,27 +116,9 @@ export class VBOInstancingPointsSnapRenderer extends VBORenderer {
 
         this.setSectionPlanesStateUniforms(instancingLayer);
 
-
-        this._aModelMatrixCol0.bindArrayBuffer(state.modelMatrixCol0Buf);
-        this._aModelMatrixCol1.bindArrayBuffer(state.modelMatrixCol1Buf);
-        this._aModelMatrixCol2.bindArrayBuffer(state.modelMatrixCol2Buf);
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 1);
-
-        this._aFlags.bindArrayBuffer(state.flagsBuf);
-        gl.vertexAttribDivisor(this._aFlags.location, 1);
-
         gl.drawArraysInstanced(gl.POINTS, 0, state.positionsBuf.numItems, state.numInstances);
 
-        // Cleanup
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 0);
-        gl.vertexAttribDivisor(this._aFlags.location, 0);
-        if (this._aOffset) {
-            gl.vertexAttribDivisor(this._aOffset.location, 0);
-        }
+        gl.bindVertexArray(null);
     }
 
     _allocate() {

package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSnapInitRenderer.js

@@ -123,34 +123,11 @@ export class TrianglesSnapInitRenderer extends VBORenderer {
 
         this.setSectionPlanesStateUniforms(instancingLayer);
 
-        this._aModelMatrixCol0.bindArrayBuffer(state.modelMatrixCol0Buf);
-        this._aModelMatrixCol1.bindArrayBuffer(state.modelMatrixCol1Buf);
-        this._aModelMatrixCol2.bindArrayBuffer(state.modelMatrixCol2Buf);
-
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 1);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 1);
-
-
-        if (this._aFlags) {
-            this._aFlags.bindArrayBuffer(state.flagsBuf);
-            gl.vertexAttribDivisor(this._aFlags.location, 1);
-        }
-
         state.indicesBuf.bind();
         gl.drawElementsInstanced(gl.TRIANGLES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0, state.numInstances);
         state.indicesBuf.unbind();
 
-        // Cleanup
-        gl.vertexAttribDivisor(this._aModelMatrixCol0.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol1.location, 0);
-        gl.vertexAttribDivisor(this._aModelMatrixCol2.location, 0);
-        if (this._aFlags) {
-            gl.vertexAttribDivisor(this._aFlags.location, 0);
-        }
-        if (this._aOffset) {
-            gl.vertexAttribDivisor(this._aOffset.location, 0);
-        }
+        gl.bindVertexArray(null);
     }
 
     _allocate() {