@xeokit/xeokit-sdk 2.5.2-beta-11 → 2.5.2-beta-16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.5.2-beta-11",
+  "version": "2.5.2-beta-16",
   "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/viewer/metadata/MetaModel.js

@@ -281,6 +281,21 @@ class MetaModel {
             }
         }
 
+        // Relink MetaObjects to their MetaModels
+
+        for (let objectId in metaScene.metaObjects) {
+            const metaObject = metaScene.metaObjects[objectId];
+            metaObject.metaModels = [];
+        }
+
+        for (let modelId in metaScene.metaModels) {
+            const metaModel = metaScene.metaModels[modelId];
+            for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
+                const metaObject = metaModel.metaObjects[i];
+                metaObject.metaModels.push(metaModel);
+            }
+        }
+
         // Rebuild MetaScene's MetaObjects-by-type lookup
 
         metaScene.metaObjectsByType = {};

package/src/viewer/metadata/MetaScene.js

@@ -197,15 +197,6 @@ class MetaScene {
                     if (!metaObject.parent) {
                         delete this.rootMetaObjects[id];
                     }
-                } else {
-                    const newMetaModels = [];
-                    const metaModelId = metaModel.id;
-                    for (let j = 0, lenj = metaObject.metaModels.length; j < lenj; j++) {
-                        if (metaObject.metaModels[j].id !== metaModelId) {
-                            newMetaModels.push(metaObject.metaModels[j]);
-                        }
-                    }
-                    metaObject.metaModels = newMetaModels;
                 }
             }
         }
@@ -256,6 +247,21 @@ class MetaScene {
 
         delete this.metaModels[id];
 
+        // Relink MetaObjects to their MetaModels
+
+        for (let objectId in this.metaObjects) {
+            const metaObject = this.metaObjects[objectId];
+            metaObject.metaModels = [];
+        }
+
+        for (let modelId in this.metaModels) {
+            const metaModel = this.metaModels[modelId];
+            for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
+                const metaObject = metaModel.metaObjects[i];
+                metaObject.metaModels.push(metaModel);
+            }
+        }
+
         this.fire("metaModelDestroyed", id);
     }
 

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

@@ -3653,7 +3653,7 @@ export class SceneModel extends Component {
         for (let i = 0, len = renderFlags.visibleLayers.length; i < len; i++) {
             const layerIndex = renderFlags.visibleLayers[i];
             this.layerList[layerIndex].drawColorOpaque(renderFlags, frameCtx);
-        }
+       }
     }
 
     /** @private */

package/src/viewer/scene/model/vbo/batching/triangles/VBOBatchingTrianglesLayer.js

@@ -5,7 +5,7 @@ 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 {getRenderers} from "./renderers/VBOBatchingTrianglesRenderers.js";
+import {getRenderers} from "./renderers/Renderers.js";
 import {VBOBatchingTrianglesBuffer} from "./VBOBatchingTrianglesBuffer.js";
 import {quantizePositions, transformAndOctEncodeNormals} from "../../../compression.js";
 

package/src/viewer/scene/model/vbo/instancing/triangles/VBOInstancingTrianglesLayer.js

@@ -4,7 +4,7 @@ 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 {getRenderers} from "./renderers/VBOInstancingTrianglesRenderers.js";
+import {getRenderers} from "./renderers/Renderers.js";
 
 const tempUint8Vec4 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);

package/src/viewer/scene/webgl/Renderer.js

@@ -621,7 +621,7 @@ const Renderer = function (scene, options) {
                         selectedFillOpaqueBin[selectedFillOpaqueBinLen++] = drawable;
                     }
 
-                    if (edgesEnabled) {
+                    if (drawable.edges && edgesEnabled) {
                         if (renderFlags.edgesOpaque) {
                             normalEdgesOpaqueBin[normalEdgesOpaqueBinLen++] = drawable;
                         }
@@ -629,29 +629,30 @@ const Renderer = function (scene, options) {
                         if (renderFlags.edgesTransparent) {
                             normalEdgesTransparentBin[normalEdgesTransparentBinLen++] = drawable;
                         }
-                    }
-                    if (renderFlags.selectedEdgesTransparent) {
-                        selectedEdgesTransparentBin[selectedEdgesTransparentBinLen++] = drawable;
-                    }
 
-                    if (renderFlags.selectedEdgesOpaque) {
-                        selectedEdgesOpaqueBin[selectedEdgesOpaqueBinLen++] = drawable;
-                    }
+                        if (renderFlags.selectedEdgesTransparent) {
+                            selectedEdgesTransparentBin[selectedEdgesTransparentBinLen++] = drawable;
+                        }
 
-                    if (renderFlags.xrayedEdgesTransparent) {
-                        xrayEdgesTransparentBin[xrayEdgesTransparentBinLen++] = drawable;
-                    }
+                        if (renderFlags.selectedEdgesOpaque) {
+                            selectedEdgesOpaqueBin[selectedEdgesOpaqueBinLen++] = drawable;
+                        }
 
-                    if (renderFlags.xrayedEdgesOpaque) {
-                        xrayEdgesOpaqueBin[xrayEdgesOpaqueBinLen++] = drawable;
-                    }
+                        if (renderFlags.xrayedEdgesTransparent) {
+                            xrayEdgesTransparentBin[xrayEdgesTransparentBinLen++] = drawable;
+                        }
 
-                    if (renderFlags.highlightedEdgesTransparent) {
-                        highlightedEdgesTransparentBin[highlightedEdgesTransparentBinLen++] = drawable;
-                    }
+                        if (renderFlags.xrayedEdgesOpaque) {
+                            xrayEdgesOpaqueBin[xrayEdgesOpaqueBinLen++] = drawable;
+                        }
 
-                    if (renderFlags.highlightedEdgesOpaque) {
-                        highlightedEdgesOpaqueBin[highlightedEdgesOpaqueBinLen++] = drawable;
+                        if (renderFlags.highlightedEdgesTransparent) {
+                            highlightedEdgesTransparentBin[highlightedEdgesTransparentBinLen++] = drawable;
+                        }
+
+                        if (renderFlags.highlightedEdgesOpaque) {
+                            highlightedEdgesOpaqueBin[highlightedEdgesOpaqueBinLen++] = drawable;
+                        }
                     }
                 }
             }