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

package/dist/xeokit-sdk.cjs.js

@@ -17997,7 +17997,7 @@ const Renderer$1 = function (scene, options) {
                         selectedFillOpaqueBin[selectedFillOpaqueBinLen++] = drawable;
                     }
 
-                    if (edgesEnabled) {
+                    if (drawable.edges && edgesEnabled) {
                         if (renderFlags.edgesOpaque) {
                             normalEdgesOpaqueBin[normalEdgesOpaqueBinLen++] = drawable;
                         }
@@ -18005,29 +18005,30 @@ const Renderer$1 = 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.highlightedEdgesTransparent) {
+                            highlightedEdgesTransparentBin[highlightedEdgesTransparentBinLen++] = drawable;
+                        }
 
-                    if (renderFlags.highlightedEdgesOpaque) {
-                        highlightedEdgesOpaqueBin[highlightedEdgesOpaqueBinLen++] = drawable;
+                        if (renderFlags.highlightedEdgesOpaque) {
+                            highlightedEdgesOpaqueBin[highlightedEdgesOpaqueBinLen++] = drawable;
+                        }
                     }
                 }
             }
@@ -49105,9 +49106,10 @@ class VBORenderer {
 /**
  * @private
  */
-class VBOBatchingTrianglesRenderer extends VBORenderer {
-    constructor(scene, withSAO, {instancing = false, edges = false} = {}) {
-        super(scene, withSAO, {instancing, edges});
+class TrianglesBatchingRenderer extends VBORenderer {
+
+    constructor(scene, withSAO, {edges = false} = {}) {
+        super(scene, withSAO, {instancing: false, edges});
     }
 
     _draw(drawCfg) {
@@ -49137,7 +49139,7 @@ class VBOBatchingTrianglesRenderer extends VBORenderer {
 /**
  * @private
  */
-class VBOBatchingTrianglesColorRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesColorRenderer$1 extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -49374,7 +49376,7 @@ class VBOBatchingTrianglesColorRenderer extends VBOBatchingTrianglesRenderer {
 /**
  * @private
  */
-class VBOBatchingTrianglesFlatColorRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesFlatColorRenderer$1 extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -49608,7 +49610,7 @@ class VBOBatchingTrianglesFlatColorRenderer extends VBOBatchingTrianglesRenderer
 /**
  * @private
  */
-class VBOBatchingTrianglesSilhouetteRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesSilhouetteRenderer$1 extends TrianglesBatchingRenderer {
 
     drawLayer(frameCtx, batchingLayer, renderPass) {
         super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: true });
@@ -49672,7 +49674,7 @@ class VBOBatchingTrianglesSilhouetteRenderer extends VBOBatchingTrianglesRendere
             src.push("vWorldPosition = worldPosition;");
             src.push("vFlags = flags;");
         }
-        src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, float(color.a) / 255.0));");
+        src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, color.a ));");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
@@ -49742,7 +49744,18 @@ class VBOBatchingTrianglesSilhouetteRenderer extends VBOBatchingTrianglesRendere
 /**
  * @private
  */
-class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRenderer {
+
+
+class EdgesRenderer$1 extends TrianglesBatchingRenderer {
+    constructor(scene) {
+        super(scene, false, {instancing: false, edges: true});
+    }
+}
+
+/**
+ * @private
+ */
+class EdgesEmphasisRenderer$1 extends EdgesRenderer$1 {
 
     drawLayer(frameCtx, batchingLayer, renderPass) {
         super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: true });
@@ -49755,7 +49768,7 @@ class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRenderer {
         const src = [];
 
         src.push("#version 300 es");
-        src.push("// VBOBatchingTrianglesEdgesRenderer vertex shader");
+        src.push("// EdgesEmphasisRenderer vertex shader");
 
         src.push("uniform int renderPass;");
         src.push("uniform vec4 color;");
@@ -49783,6 +49796,7 @@ class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRenderer {
         }
 
         src.push("out vec4 vColor;");
+
         src.push("void main(void) {");
 
         // edgeFlag = NOT_RENDERED | EDGES_COLOR_OPAQUE | EDGES_COLOR_TRANSPARENT | EDGES_HIGHLIGHTED | EDGES_XRAYED | EDGES_SELECTED
@@ -49823,7 +49837,7 @@ class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRenderer {
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// VBOBatchingTrianglesEdgesRenderer fragment shader");
+        src.push("// EdgesEmphasisRenderer fragment shader");
         
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
@@ -49873,18 +49887,11 @@ class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRenderer {
 /**
  * @private
  */
+class EdgesColorRenderer$1 extends EdgesRenderer$1 {
 
-
-class VBOSceneModelTriangleBatchingEdgesRenderer extends VBOBatchingTrianglesRenderer {
-    constructor(scene, withSAO) {
-        super(scene, withSAO, {instancing: false, edges: true});
+    drawLayer(frameCtx, batchingLayer, renderPass) {
+        super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: false });
     }
-}
-
-/**
- * @private
- */
-class VBOBatchingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleBatchingEdgesRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50010,7 +50017,7 @@ class VBOBatchingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleBatchi
 /**
  * @private
  */
-class VBOBatchingTrianglesPickMeshRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesPickMeshRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50139,7 +50146,7 @@ class VBOBatchingTrianglesPickMeshRenderer extends VBOBatchingTrianglesRenderer
 /**
  * @private
  */
-class VBOBatchingTrianglesPickDepthRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesPickDepthRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
 
@@ -50282,7 +50289,7 @@ class VBOBatchingTrianglesPickDepthRenderer extends VBOBatchingTrianglesRenderer
 /**
  * @private
  */
-class VBOBatchingTrianglesPickNormalsRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesPickNormalsRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50410,7 +50417,7 @@ class VBOBatchingTrianglesPickNormalsRenderer extends VBOBatchingTrianglesRender
 /**
  * @private
  */
-class VBOBatchingTrianglesOcclusionRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesOcclusionRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50507,7 +50514,7 @@ class VBOBatchingTrianglesOcclusionRenderer extends VBOBatchingTrianglesRenderer
 /**
  * @private
  */
-class VBOBatchingTrianglesDepthRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesDepthRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50633,7 +50640,7 @@ class VBOBatchingTrianglesDepthRenderer extends VBOBatchingTrianglesRenderer {
  */
 
 
-class VBOBatchingTrianglesNormalsRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesNormalsRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50770,7 +50777,7 @@ class VBOBatchingTrianglesNormalsRenderer extends VBOBatchingTrianglesRenderer {
  *
  * @private
  */
-class VBOBatchingTrianglesShadowRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesShadowRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -50877,7 +50884,7 @@ class VBOBatchingTrianglesShadowRenderer extends VBOBatchingTrianglesRenderer {
 /**
  * @private
  */
-class VBOBatchingTrianglesPBRRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesPBRRenderer$1 extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -51433,7 +51440,7 @@ class VBOBatchingTrianglesPBRRenderer extends VBOBatchingTrianglesRenderer {
 /**
  * @private
  */
-class VBOBatchingTrianglesPickNormalsFlatRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesPickNormalsFlatRenderer$1 extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -51551,7 +51558,7 @@ class VBOBatchingTrianglesPickNormalsFlatRenderer extends VBOBatchingTrianglesRe
 /**
  * @private
  */
-class VBOBatchingTrianglesColorTextureRenderer extends VBOBatchingTrianglesRenderer {
+class TrianglesColorTextureRenderer$1 extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -51825,7 +51832,7 @@ const tempMat4a$q = math.mat4();
 /**
  * @private
  */
-class VBOBatchingTrianglesSnapInitRenderer extends VBORenderer {
+class TrianglesSnapInitRenderer$1 extends VBORenderer {
 
     drawLayer(frameCtx, batchingLayer, renderPass) {
 
@@ -52131,7 +52138,7 @@ const tempMat4a$p = math.mat4();
 /**
  * @private
  */
-class VBOBatchingTrianglesSnapRenderer extends VBORenderer{
+class TrianglesSnapRenderer$1 extends VBORenderer{
     _getHash() {
         return this._scene._sectionPlanesState.getHash() + (this._scene.pointsMaterial.hash);
     }
@@ -52428,7 +52435,7 @@ class VBOBatchingTrianglesSnapRenderer extends VBORenderer{
 /**
  * @private
  */
-class VBOBatchingTrianglesRenderers {
+class Renderers$1 {
 
     constructor(scene) {
         this._scene = scene;
@@ -52528,165 +52535,165 @@ class VBOBatchingTrianglesRenderers {
         // when user first begins interacting with the viewer.
 
         if (!this._silhouetteRenderer) { // Used for highlighting and selection
-            this._silhouetteRenderer = new VBOBatchingTrianglesSilhouetteRenderer(this._scene);
+            this._silhouetteRenderer = new TrianglesSilhouetteRenderer$1(this._scene);
         }
         if (!this._pickMeshRenderer) {
-            this._pickMeshRenderer = new VBOBatchingTrianglesPickMeshRenderer(this._scene);
+            this._pickMeshRenderer = new TrianglesPickMeshRenderer$1(this._scene);
         }
         if (!this._pickDepthRenderer) {
-            this._pickDepthRenderer = new VBOBatchingTrianglesPickDepthRenderer(this._scene);
+            this._pickDepthRenderer = new TrianglesPickDepthRenderer$1(this._scene);
         }
         if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new VBOBatchingTrianglesSnapInitRenderer(this._scene, false);
+            this._snapInitRenderer = new TrianglesSnapInitRenderer$1(this._scene, false);
         }
         if (!this._snapRenderer) {
-            this._snapRenderer = new VBOBatchingTrianglesSnapRenderer(this._scene);
+            this._snapRenderer = new TrianglesSnapRenderer$1(this._scene);
         }
     }
 
     get colorRenderer() {
         if (!this._colorRenderer) {
-            this._colorRenderer = new VBOBatchingTrianglesColorRenderer(this._scene, false);
+            this._colorRenderer = new TrianglesColorRenderer$1(this._scene, false);
         }
         return this._colorRenderer;
     }
 
     get colorRendererWithSAO() {
         if (!this._colorRendererWithSAO) {
-            this._colorRendererWithSAO = new VBOBatchingTrianglesColorRenderer(this._scene, true);
+            this._colorRendererWithSAO = new TrianglesColorRenderer$1(this._scene, true);
         }
         return this._colorRendererWithSAO;
     }
 
     get flatColorRenderer() {
         if (!this._flatColorRenderer) {
-            this._flatColorRenderer = new VBOBatchingTrianglesFlatColorRenderer(this._scene, false);
+            this._flatColorRenderer = new TrianglesFlatColorRenderer$1(this._scene, false);
         }
         return this._flatColorRenderer;
     }
 
     get flatColorRendererWithSAO() {
         if (!this._flatColorRendererWithSAO) {
-            this._flatColorRendererWithSAO = new VBOBatchingTrianglesFlatColorRenderer(this._scene, true);
+            this._flatColorRendererWithSAO = new TrianglesFlatColorRenderer$1(this._scene, true);
         }
         return this._flatColorRendererWithSAO;
     }
 
     get colorTextureRenderer() {
         if (!this._colorTextureRenderer) {
-            this._colorTextureRenderer = new VBOBatchingTrianglesColorTextureRenderer(this._scene, false);
+            this._colorTextureRenderer = new TrianglesColorTextureRenderer$1(this._scene, false);
         }
         return this._colorTextureRenderer;
     }
 
     get colorTextureRendererWithSAO() {
         if (!this._colorTextureRendererWithSAO) {
-            this._colorTextureRendererWithSAO = new VBOBatchingTrianglesColorTextureRenderer(this._scene, true);
+            this._colorTextureRendererWithSAO = new TrianglesColorTextureRenderer$1(this._scene, true);
         }
         return this._colorTextureRendererWithSAO;
     }
 
     get pbrRenderer() {
         if (!this._pbrRenderer) {
-            this._pbrRenderer = new VBOBatchingTrianglesPBRRenderer(this._scene, false);
+            this._pbrRenderer = new TrianglesPBRRenderer$1(this._scene, false);
         }
         return this._pbrRenderer;
     }
 
     get pbrRendererWithSAO() {
         if (!this._pbrRendererWithSAO) {
-            this._pbrRendererWithSAO = new VBOBatchingTrianglesPBRRenderer(this._scene, true);
+            this._pbrRendererWithSAO = new TrianglesPBRRenderer$1(this._scene, true);
         }
         return this._pbrRendererWithSAO;
     }
 
     get silhouetteRenderer() {
         if (!this._silhouetteRenderer) {
-            this._silhouetteRenderer = new VBOBatchingTrianglesSilhouetteRenderer(this._scene);
+            this._silhouetteRenderer = new TrianglesSilhouetteRenderer$1(this._scene);
         }
         return this._silhouetteRenderer;
     }
 
     get depthRenderer() {
         if (!this._depthRenderer) {
-            this._depthRenderer = new VBOBatchingTrianglesDepthRenderer(this._scene);
+            this._depthRenderer = new TrianglesDepthRenderer$1(this._scene);
         }
         return this._depthRenderer;
     }
 
     get normalsRenderer() {
         if (!this._normalsRenderer) {
-            this._normalsRenderer = new VBOBatchingTrianglesNormalsRenderer(this._scene);
+            this._normalsRenderer = new TrianglesNormalsRenderer$1(this._scene);
         }
         return this._normalsRenderer;
     }
 
     get edgesRenderer() {
         if (!this._edgesRenderer) {
-            this._edgesRenderer = new VBOBatchingTrianglesEdgesRenderer(this._scene);
+            this._edgesRenderer = new EdgesEmphasisRenderer$1(this._scene);
         }
         return this._edgesRenderer;
     }
 
     get edgesColorRenderer() {
         if (!this._edgesColorRenderer) {
-            this._edgesColorRenderer = new VBOBatchingTrianglesEdgesColorRenderer(this._scene);
+            this._edgesColorRenderer = new EdgesColorRenderer$1(this._scene);
         }
         return this._edgesColorRenderer;
     }
 
     get pickMeshRenderer() {
         if (!this._pickMeshRenderer) {
-            this._pickMeshRenderer = new VBOBatchingTrianglesPickMeshRenderer(this._scene);
+            this._pickMeshRenderer = new TrianglesPickMeshRenderer$1(this._scene);
         }
         return this._pickMeshRenderer;
     }
 
     get pickNormalsRenderer() {
         if (!this._pickNormalsRenderer) {
-            this._pickNormalsRenderer = new VBOBatchingTrianglesPickNormalsRenderer(this._scene);
+            this._pickNormalsRenderer = new TrianglesPickNormalsRenderer$1(this._scene);
         }
         return this._pickNormalsRenderer;
     }
 
     get pickNormalsFlatRenderer() {
         if (!this._pickNormalsFlatRenderer) {
-            this._pickNormalsFlatRenderer = new VBOBatchingTrianglesPickNormalsFlatRenderer(this._scene);
+            this._pickNormalsFlatRenderer = new TrianglesPickNormalsFlatRenderer$1(this._scene);
         }
         return this._pickNormalsFlatRenderer;
     }
 
     get pickDepthRenderer() {
         if (!this._pickDepthRenderer) {
-            this._pickDepthRenderer = new VBOBatchingTrianglesPickDepthRenderer(this._scene);
+            this._pickDepthRenderer = new TrianglesPickDepthRenderer$1(this._scene);
         }
         return this._pickDepthRenderer;
     }
 
     get occlusionRenderer() {
         if (!this._occlusionRenderer) {
-            this._occlusionRenderer = new VBOBatchingTrianglesOcclusionRenderer(this._scene);
+            this._occlusionRenderer = new TrianglesOcclusionRenderer$1(this._scene);
         }
         return this._occlusionRenderer;
     }
 
     get shadowRenderer() {
         if (!this._shadowRenderer) {
-            this._shadowRenderer = new VBOBatchingTrianglesShadowRenderer(this._scene);
+            this._shadowRenderer = new TrianglesShadowRenderer$1(this._scene);
         }
         return this._shadowRenderer;
     }
 
     get snapRenderer() {
         if (!this._snapRenderer) {
-            this._snapRenderer = new VBOBatchingTrianglesSnapRenderer(this._scene);
+            this._snapRenderer = new TrianglesSnapRenderer$1(this._scene);
         }
         return this._snapRenderer;
     }
 
     get snapInitRenderer() {
         if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new VBOBatchingTrianglesSnapInitRenderer(this._scene);
+            this._snapInitRenderer = new TrianglesSnapInitRenderer$1(this._scene);
         }
         return this._snapInitRenderer;
     }
@@ -52767,7 +52774,7 @@ function getRenderers$7(scene) {
     const sceneId = scene.id;
     let batchingRenderers = cachdRenderers$1[sceneId];
     if (!batchingRenderers) {
-        batchingRenderers = new VBOBatchingTrianglesRenderers(scene);
+        batchingRenderers = new Renderers$1(scene);
         cachdRenderers$1[sceneId] = batchingRenderers;
         batchingRenderers._compile();
         batchingRenderers.eagerCreateRenders();
@@ -54329,7 +54336,7 @@ class VBOBatchingTrianglesLayer {
 /**
  * @private
  */
-class VBOSceneModelTriangleInstancingRenderer extends VBORenderer {
+class TrianglesInstancingRenderer extends VBORenderer {
     constructor(scene, withSAO, {edges = false} = {}) {
         super(scene, withSAO, {instancing: true, edges});
     }
@@ -54357,7 +54364,7 @@ class VBOSceneModelTriangleInstancingRenderer extends VBORenderer {
 /**
  * @private
  */
-class VBOInstancingTrianglesColorRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesColorRenderer extends TrianglesInstancingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -54609,7 +54616,7 @@ class VBOInstancingTrianglesColorRenderer extends VBOSceneModelTriangleInstancin
  */
 
 
-class VBOInstancingTrianglesFlatColorRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesFlatColorRenderer extends TrianglesInstancingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -54850,7 +54857,7 @@ class VBOInstancingTrianglesFlatColorRenderer extends VBOSceneModelTriangleInsta
 /**
  * @private
  */
-class VBOInstancingTrianglesSilhouetteRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
 
     drawLayer(frameCtx, instancingLayer, renderPass) {
         // TODO color uniform true ???
@@ -54990,7 +54997,7 @@ class VBOInstancingTrianglesSilhouetteRenderer extends VBOSceneModelTriangleInst
  */
 
 
-class VBOSceneModelTriangleInstancingEdgesRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class EdgesRenderer extends TrianglesInstancingRenderer {
     constructor(scene, withSAO) {
         super(scene, withSAO, {instancing: true, edges: true});
     }
@@ -55001,7 +55008,7 @@ class VBOSceneModelTriangleInstancingEdgesRenderer extends VBOSceneModelTriangle
  */
 
 
-class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleInstancingEdgesRenderer {
+class EdgesEmphasisRenderer extends EdgesRenderer {
 
     drawLayer(frameCtx, instancingLayer, renderPass) {
         super.drawLayer(frameCtx, instancingLayer, renderPass, {colorUniform: true});
@@ -55013,10 +55020,11 @@ class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleInstancin
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// VBOInstancingTrianglesEdgesRenderer vertex shader");
+        src.push("// EdgesEmphasisRenderer vertex shader");
 
         src.push("uniform int renderPass;");
         src.push("uniform vec4 color;");
+
         src.push("in vec3 position;");
         if (scene.entityOffsetsEnabled) {
             src.push("in vec3 offset;");
@@ -55054,7 +55062,9 @@ class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleInstancin
         src.push("   gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
 
         src.push("} else {");
-        src.push("vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
+
+        src.push("vec4 worldPosition = worldMatrix * positionsDecodeMatrix * vec4(position, 1.0); ");
+
         src.push("worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
         if (scene.entityOffsetsEnabled) {
             src.push("      worldPosition.xyz = worldPosition.xyz + offset;");
@@ -55082,7 +55092,7 @@ class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleInstancin
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// VBOInstancingTrianglesEdgesRenderer fragment shader");
+        src.push("// EdgesEmphasisRenderer fragment shader");
 
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
@@ -55134,7 +55144,11 @@ class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleInstancin
  */
 
 
-class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleInstancingEdgesRenderer {
+class EdgesColorRenderer extends EdgesRenderer {
+
+    drawLayer(frameCtx, batchingLayer, renderPass) {
+        super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: false });
+    }
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -55142,7 +55156,7 @@ class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleInst
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// VBOInstancingTrianglesEdgesColorRenderer vertex shader");
+        src.push("// EdgesColorRenderer vertex shader");
 
         src.push("uniform int renderPass;");
         src.push("in vec3 position;");
@@ -55212,7 +55226,7 @@ class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleInst
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// VBOInstancingTrianglesEdgesColorRenderer fragment shader");
+        src.push("// EdgesColorRenderer fragment shader");
 
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
@@ -55262,7 +55276,7 @@ class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleInst
 /**
  * @private
  */
-class VBOInstancingTrianglesPickMeshRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesPickMeshRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -55396,7 +55410,7 @@ class VBOInstancingTrianglesPickMeshRenderer extends VBOSceneModelTriangleInstan
 /**
  * @private
  */
-class VBOInstancingTrianglesPickDepthRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesPickDepthRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -55544,7 +55558,7 @@ class VBOInstancingTrianglesPickDepthRenderer extends VBOSceneModelTriangleInsta
 /**
  * @private
  */
-class VBOInstancingTrianglesPickNormalsRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesPickNormalsRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -55687,7 +55701,7 @@ class VBOInstancingTrianglesPickNormalsRenderer extends VBOSceneModelTriangleIns
 /**
  * @private
  */
-class VBOInstancingTrianglesOcclusionRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesOcclusionRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -55789,7 +55803,7 @@ class VBOInstancingTrianglesOcclusionRenderer extends VBOSceneModelTriangleInsta
  */
 
 
-class VBOInstancingTrianglesDepthRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesDepthRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -55911,7 +55925,7 @@ class VBOInstancingTrianglesDepthRenderer extends VBOSceneModelTriangleInstancin
 /**
  * @private
  */
-class VBOInstancingTrianglesNormalsRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesNormalsRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -56050,7 +56064,7 @@ class VBOInstancingTrianglesNormalsRenderer extends VBOSceneModelTriangleInstanc
  *
  * @private
  */
-class VBOInstancingTrianglesShadowRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesShadowRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -56163,7 +56177,7 @@ TEXTURE_DECODE_FUNCS[sRGBEncoding] = "sRGBToLinear";
 /**
  * @private
  */
-class VBOInstancingTrianglesPBRRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesPBRRenderer extends TrianglesInstancingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -56718,7 +56732,7 @@ class VBOInstancingTrianglesPBRRenderer extends VBOSceneModelTriangleInstancingR
 /**
  * @private
  */
-class VBOInstancingTrianglesPickNormalsFlatRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesPickNormalsFlatRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -56848,7 +56862,7 @@ class VBOInstancingTrianglesPickNormalsFlatRenderer extends VBOSceneModelTriangl
  */
 
 
-class VBOInstancingTrianglesColorTextureRenderer extends VBOSceneModelTriangleInstancingRenderer {
+class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
@@ -57129,7 +57143,7 @@ const tempMat4a$o = math.mat4();
 /**
  * @private
  */
-class VBOInstancingTrianglesSnapInitRenderer extends VBORenderer {
+class TrianglesSnapInitRenderer extends VBORenderer {
 
     constructor(scene) {
         super(scene, false, { instancing: true });
@@ -57465,7 +57479,7 @@ const tempMat4a$n = math.mat4();
 /**
  * @private
  */
-class VBOInstancingTrianglesSnapRenderer extends VBORenderer {
+class TrianglesSnapRenderer extends VBORenderer {
 
     constructor(scene) {
         super(scene, false, { instancing: true });
@@ -57779,7 +57793,7 @@ class VBOInstancingTrianglesSnapRenderer extends VBORenderer {
 /**
  * @private
  */
-class VBOInstancingTrianglesRenderers {
+class Renderers {
 
     constructor(scene) {
         this._scene = scene;
@@ -57879,165 +57893,165 @@ class VBOInstancingTrianglesRenderers {
         // when user first begins interacting with the viewer.
 
         if (!this._silhouetteRenderer) { // Used for highlighting and selection
-            this._silhouetteRenderer = new VBOInstancingTrianglesSilhouetteRenderer(this._scene);
+            this._silhouetteRenderer = new TrianglesSilhouetteRenderer(this._scene);
         }
         if (!this._pickMeshRenderer) {
-            this._pickMeshRenderer = new VBOInstancingTrianglesPickMeshRenderer(this._scene);
+            this._pickMeshRenderer = new TrianglesPickMeshRenderer(this._scene);
         }
         if (!this._pickDepthRenderer) {
-            this._pickDepthRenderer = new VBOInstancingTrianglesPickDepthRenderer(this._scene);
+            this._pickDepthRenderer = new TrianglesPickDepthRenderer(this._scene);
         }
         if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new VBOInstancingTrianglesSnapInitRenderer(this._scene, false);
+            this._snapInitRenderer = new TrianglesSnapInitRenderer(this._scene, false);
         }
         if (!this._snapRenderer) {
-            this._snapRenderer = new VBOInstancingTrianglesSnapRenderer(this._scene);
+            this._snapRenderer = new TrianglesSnapRenderer(this._scene);
         }
     }
 
     get colorRenderer() {
         if (!this._colorRenderer) {
-            this._colorRenderer = new VBOInstancingTrianglesColorRenderer(this._scene, false);
+            this._colorRenderer = new TrianglesColorRenderer(this._scene, false);
         }
         return this._colorRenderer;
     }
 
     get colorRendererWithSAO() {
         if (!this._colorRendererWithSAO) {
-            this._colorRendererWithSAO = new VBOInstancingTrianglesColorRenderer(this._scene, true);
+            this._colorRendererWithSAO = new TrianglesColorRenderer(this._scene, true);
         }
         return this._colorRendererWithSAO;
     }
 
     get flatColorRenderer() {
         if (!this._flatColorRenderer) {
-            this._flatColorRenderer = new VBOInstancingTrianglesFlatColorRenderer(this._scene, false);
+            this._flatColorRenderer = new TrianglesFlatColorRenderer(this._scene, false);
         }
         return this._flatColorRenderer;
     }
 
     get flatColorRendererWithSAO() {
         if (!this._flatColorRendererWithSAO) {
-            this._flatColorRendererWithSAO = new VBOInstancingTrianglesFlatColorRenderer(this._scene, true);
+            this._flatColorRendererWithSAO = new TrianglesFlatColorRenderer(this._scene, true);
         }
         return this._flatColorRendererWithSAO;
     }
 
     get pbrRenderer() {
         if (!this._pbrRenderer) {
-            this._pbrRenderer = new VBOInstancingTrianglesPBRRenderer(this._scene, false);
+            this._pbrRenderer = new TrianglesPBRRenderer(this._scene, false);
         }
         return this._pbrRenderer;
     }
 
     get pbrRendererWithSAO() {
         if (!this._pbrRendererWithSAO) {
-            this._pbrRendererWithSAO = new VBOInstancingTrianglesPBRRenderer(this._scene, true);
+            this._pbrRendererWithSAO = new TrianglesPBRRenderer(this._scene, true);
         }
         return this._pbrRendererWithSAO;
     }
 
     get colorTextureRenderer() {
         if (!this._colorTextureRenderer) {
-            this._colorTextureRenderer = new VBOInstancingTrianglesColorTextureRenderer(this._scene, false);
+            this._colorTextureRenderer = new TrianglesColorTextureRenderer(this._scene, false);
         }
         return this._colorTextureRenderer;
     }
 
     get colorTextureRendererWithSAO() {
         if (!this._colorTextureRendererWithSAO) {
-            this._colorTextureRendererWithSAO = new VBOInstancingTrianglesColorTextureRenderer(this._scene, true);
+            this._colorTextureRendererWithSAO = new TrianglesColorTextureRenderer(this._scene, true);
         }
         return this._colorTextureRendererWithSAO;
     }
 
     get silhouetteRenderer() {
         if (!this._silhouetteRenderer) {
-            this._silhouetteRenderer = new VBOInstancingTrianglesSilhouetteRenderer(this._scene);
+            this._silhouetteRenderer = new TrianglesSilhouetteRenderer(this._scene);
         }
         return this._silhouetteRenderer;
     }
 
     get depthRenderer() {
         if (!this._depthRenderer) {
-            this._depthRenderer = new VBOInstancingTrianglesDepthRenderer(this._scene);
+            this._depthRenderer = new TrianglesDepthRenderer(this._scene);
         }
         return this._depthRenderer;
     }
 
     get normalsRenderer() {
         if (!this._normalsRenderer) {
-            this._normalsRenderer = new VBOInstancingTrianglesNormalsRenderer(this._scene);
+            this._normalsRenderer = new TrianglesNormalsRenderer(this._scene);
         }
         return this._normalsRenderer;
     }
 
     get edgesRenderer() {
         if (!this._edgesRenderer) {
-            this._edgesRenderer = new VBOInstancingTrianglesEdgesRenderer(this._scene);
+            this._edgesRenderer = new EdgesEmphasisRenderer(this._scene);
         }
         return this._edgesRenderer;
     }
 
     get edgesColorRenderer() {
         if (!this._edgesColorRenderer) {
-            this._edgesColorRenderer = new VBOInstancingTrianglesEdgesColorRenderer(this._scene);
+            this._edgesColorRenderer = new EdgesColorRenderer(this._scene);
         }
         return this._edgesColorRenderer;
     }
 
     get pickMeshRenderer() {
         if (!this._pickMeshRenderer) {
-            this._pickMeshRenderer = new VBOInstancingTrianglesPickMeshRenderer(this._scene);
+            this._pickMeshRenderer = new TrianglesPickMeshRenderer(this._scene);
         }
         return this._pickMeshRenderer;
     }
 
     get pickNormalsRenderer() {
         if (!this._pickNormalsRenderer) {
-            this._pickNormalsRenderer = new VBOInstancingTrianglesPickNormalsRenderer(this._scene);
+            this._pickNormalsRenderer = new TrianglesPickNormalsRenderer(this._scene);
         }
         return this._pickNormalsRenderer;
     }
 
     get pickNormalsFlatRenderer() {
         if (!this._pickNormalsFlatRenderer) {
-            this._pickNormalsFlatRenderer = new VBOInstancingTrianglesPickNormalsFlatRenderer(this._scene);
+            this._pickNormalsFlatRenderer = new TrianglesPickNormalsFlatRenderer(this._scene);
         }
         return this._pickNormalsFlatRenderer;
     }
 
     get pickDepthRenderer() {
         if (!this._pickDepthRenderer) {
-            this._pickDepthRenderer = new VBOInstancingTrianglesPickDepthRenderer(this._scene);
+            this._pickDepthRenderer = new TrianglesPickDepthRenderer(this._scene);
         }
         return this._pickDepthRenderer;
     }
 
     get occlusionRenderer() {
         if (!this._occlusionRenderer) {
-            this._occlusionRenderer = new VBOInstancingTrianglesOcclusionRenderer(this._scene);
+            this._occlusionRenderer = new TrianglesOcclusionRenderer(this._scene);
         }
         return this._occlusionRenderer;
     }
 
     get shadowRenderer() {
         if (!this._shadowRenderer) {
-            this._shadowRenderer = new VBOInstancingTrianglesShadowRenderer(this._scene);
+            this._shadowRenderer = new TrianglesShadowRenderer(this._scene);
         }
         return this._shadowRenderer;
     }
 
     get snapInitRenderer() {
         if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new VBOInstancingTrianglesSnapInitRenderer(this._scene, false);
+            this._snapInitRenderer = new TrianglesSnapInitRenderer(this._scene, false);
         }
         return this._snapInitRenderer;
     }
 
     get snapRenderer() {
         if (!this._snapRenderer) {
-            this._snapRenderer = new VBOInstancingTrianglesSnapRenderer(this._scene);
+            this._snapRenderer = new TrianglesSnapRenderer(this._scene);
         }
         return this._snapRenderer;
     }
@@ -58118,7 +58132,7 @@ function getRenderers$6(scene) {
     const sceneId = scene.id;
     let instancingRenderers = cachedRenderers$5[sceneId];
     if (!instancingRenderers) {
-        instancingRenderers = new VBOInstancingTrianglesRenderers(scene);
+        instancingRenderers = new Renderers(scene);
         cachedRenderers$5[sceneId] = instancingRenderers;
         instancingRenderers._compile();
         instancingRenderers.eagerCreateRenders();
@@ -82878,7 +82892,7 @@ 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 */
@@ -96819,6 +96833,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 = {};
@@ -97142,15 +97171,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;
                 }
             }
         }
@@ -97201,6 +97221,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);
     }