@xeokit/xeokit-sdk 2.5.2-beta-10 → 2.5.2-beta-13

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesEdgesColorRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesColorRenderer.js}

@@ -1,9 +1,13 @@
-import {VBOSceneModelTriangleBatchingEdgesRenderer} from "./VBOSceneModelTriangleBatchingEdgesRenderer.js";
+import {EdgesRenderer} from "./EdgesRenderer.js";
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleBatchingEdgesRenderer {
+export class EdgesColorRenderer extends EdgesRenderer {
+
+    drawLayer(frameCtx, batchingLayer, renderPass) {
+        super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: false });
+    }
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesEdgesRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesEmphasisRenderer.js}

@@ -1,10 +1,11 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
+import {EdgesRenderer} from "./EdgesRenderer";
 
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRenderer {
+export class EdgesEmphasisRenderer extends EdgesRenderer {
 
     drawLayer(frameCtx, batchingLayer, renderPass) {
         super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: true });
@@ -17,7 +18,7 @@ export class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRende
         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;");
@@ -45,6 +46,7 @@ export class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRende
         }
 
         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
@@ -85,7 +87,7 @@ export class VBOBatchingTrianglesEdgesRenderer extends VBOBatchingTrianglesRende
         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;");

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

@@ -0,0 +1,12 @@
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
+
+/**
+ * @private
+ */
+
+
+export class EdgesRenderer extends TrianglesBatchingRenderer {
+    constructor(scene) {
+        super(scene, false, {instancing: false, edges: true});
+    }
+}

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesRenderers.js → src/viewer/scene/model/vbo/batching/triangles/renderers/Renderers.js}

@@ -1,25 +1,25 @@
-import {VBOBatchingTrianglesColorRenderer} from "./VBOBatchingTrianglesColorRenderer.js";
-import {VBOBatchingTrianglesFlatColorRenderer} from "./VBOBatchingTrianglesFlatColorRenderer.js";
-import {VBOBatchingTrianglesSilhouetteRenderer} from "./VBOBatchingTrianglesSilhouetteRenderer.js";
-import {VBOBatchingTrianglesEdgesRenderer} from "./VBOBatchingTrianglesEdgesRenderer.js";
-import {VBOBatchingTrianglesEdgesColorRenderer} from "./VBOBatchingTrianglesEdgesColorRenderer.js";
-import {VBOBatchingTrianglesPickMeshRenderer} from "./VBOBatchingTrianglesPickMeshRenderer.js";
-import {VBOBatchingTrianglesPickDepthRenderer} from "./VBOBatchingTrianglesPickDepthRenderer.js";
-import {VBOBatchingTrianglesPickNormalsRenderer} from "./VBOBatchingTrianglesPickNormalsRenderer.js";
-import {VBOBatchingTrianglesOcclusionRenderer} from "./VBOBatchingTrianglesOcclusionRenderer.js";
-import {VBOBatchingTrianglesDepthRenderer} from "./VBOBatchingTrianglesDepthRenderer.js";
-import {VBOBatchingTrianglesNormalsRenderer} from "./VBOBatchingTrianglesNormalsRenderer.js";
-import {VBOBatchingTrianglesShadowRenderer} from "./VBOBatchingTrianglesShadowRenderer.js";
-import {VBOBatchingTrianglesPBRRenderer} from "./VBOBatchingTrianglesPBRRenderer.js";
-import {VBOBatchingTrianglesPickNormalsFlatRenderer} from "./VBOBatchingTrianglesPickNormalsFlatRenderer.js";
-import {VBOBatchingTrianglesColorTextureRenderer} from "./VBOBatchingTrianglesColorTextureRenderer.js";
-import {VBOBatchingTrianglesSnapInitRenderer} from "./VBOBatchingTrianglesSnapInitRenderer.js";
-import {VBOBatchingTrianglesSnapRenderer} from "./VBOBatchingTrianglesSnapRenderer.js";
+import {TrianglesColorRenderer} from "./TrianglesColorRenderer.js";
+import {TrianglesFlatColorRenderer} from "./TrianglesFlatColorRenderer.js";
+import {TrianglesSilhouetteRenderer} from "./TrianglesSilhouetteRenderer.js";
+import {EdgesEmphasisRenderer} from "./EdgesEmphasisRenderer.js";
+import {EdgesColorRenderer} from "./EdgesColorRenderer.js";
+import {TrianglesPickMeshRenderer} from "./TrianglesPickMeshRenderer.js";
+import {TrianglesPickDepthRenderer} from "./TrianglesPickDepthRenderer.js";
+import {TrianglesPickNormalsRenderer} from "./TrianglesPickNormalsRenderer.js";
+import {TrianglesOcclusionRenderer} from "./TrianglesOcclusionRenderer.js";
+import {TrianglesDepthRenderer} from "./TrianglesDepthRenderer.js";
+import {TrianglesNormalsRenderer} from "./TrianglesNormalsRenderer.js";
+import {TrianglesShadowRenderer} from "./TrianglesShadowRenderer.js";
+import {TrianglesPBRRenderer} from "./TrianglesPBRRenderer.js";
+import {TrianglesPickNormalsFlatRenderer} from "./TrianglesPickNormalsFlatRenderer.js";
+import {TrianglesColorTextureRenderer} from "./TrianglesColorTextureRenderer.js";
+import {TrianglesSnapInitRenderer} from "./TrianglesSnapInitRenderer.js";
+import {TrianglesSnapRenderer} from "./TrianglesSnapRenderer.js";
 
 /**
  * @private
  */
-class VBOBatchingTrianglesRenderers {
+class Renderers {
 
     constructor(scene) {
         this._scene = scene;
@@ -119,165 +119,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(this._scene);
         }
         if (!this._pickMeshRenderer) {
-            this._pickMeshRenderer = new VBOBatchingTrianglesPickMeshRenderer(this._scene);
+            this._pickMeshRenderer = new TrianglesPickMeshRenderer(this._scene);
         }
         if (!this._pickDepthRenderer) {
-            this._pickDepthRenderer = new VBOBatchingTrianglesPickDepthRenderer(this._scene);
+            this._pickDepthRenderer = new TrianglesPickDepthRenderer(this._scene);
         }
         if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new VBOBatchingTrianglesSnapInitRenderer(this._scene, false);
+            this._snapInitRenderer = new TrianglesSnapInitRenderer(this._scene, false);
         }
         if (!this._snapRenderer) {
-            this._snapRenderer = new VBOBatchingTrianglesSnapRenderer(this._scene);
+            this._snapRenderer = new TrianglesSnapRenderer(this._scene);
         }
     }
 
     get colorRenderer() {
         if (!this._colorRenderer) {
-            this._colorRenderer = new VBOBatchingTrianglesColorRenderer(this._scene, false);
+            this._colorRenderer = new TrianglesColorRenderer(this._scene, false);
         }
         return this._colorRenderer;
     }
 
     get colorRendererWithSAO() {
         if (!this._colorRendererWithSAO) {
-            this._colorRendererWithSAO = new VBOBatchingTrianglesColorRenderer(this._scene, true);
+            this._colorRendererWithSAO = new TrianglesColorRenderer(this._scene, true);
         }
         return this._colorRendererWithSAO;
     }
 
     get flatColorRenderer() {
         if (!this._flatColorRenderer) {
-            this._flatColorRenderer = new VBOBatchingTrianglesFlatColorRenderer(this._scene, false);
+            this._flatColorRenderer = new TrianglesFlatColorRenderer(this._scene, false);
         }
         return this._flatColorRenderer;
     }
 
     get flatColorRendererWithSAO() {
         if (!this._flatColorRendererWithSAO) {
-            this._flatColorRendererWithSAO = new VBOBatchingTrianglesFlatColorRenderer(this._scene, true);
+            this._flatColorRendererWithSAO = new TrianglesFlatColorRenderer(this._scene, true);
         }
         return this._flatColorRendererWithSAO;
     }
 
     get colorTextureRenderer() {
         if (!this._colorTextureRenderer) {
-            this._colorTextureRenderer = new VBOBatchingTrianglesColorTextureRenderer(this._scene, false);
+            this._colorTextureRenderer = new TrianglesColorTextureRenderer(this._scene, false);
         }
         return this._colorTextureRenderer;
     }
 
     get colorTextureRendererWithSAO() {
         if (!this._colorTextureRendererWithSAO) {
-            this._colorTextureRendererWithSAO = new VBOBatchingTrianglesColorTextureRenderer(this._scene, true);
+            this._colorTextureRendererWithSAO = new TrianglesColorTextureRenderer(this._scene, true);
         }
         return this._colorTextureRendererWithSAO;
     }
 
     get pbrRenderer() {
         if (!this._pbrRenderer) {
-            this._pbrRenderer = new VBOBatchingTrianglesPBRRenderer(this._scene, false);
+            this._pbrRenderer = new TrianglesPBRRenderer(this._scene, false);
         }
         return this._pbrRenderer;
     }
 
     get pbrRendererWithSAO() {
         if (!this._pbrRendererWithSAO) {
-            this._pbrRendererWithSAO = new VBOBatchingTrianglesPBRRenderer(this._scene, true);
+            this._pbrRendererWithSAO = new TrianglesPBRRenderer(this._scene, true);
         }
         return this._pbrRendererWithSAO;
     }
 
     get silhouetteRenderer() {
         if (!this._silhouetteRenderer) {
-            this._silhouetteRenderer = new VBOBatchingTrianglesSilhouetteRenderer(this._scene);
+            this._silhouetteRenderer = new TrianglesSilhouetteRenderer(this._scene);
         }
         return this._silhouetteRenderer;
     }
 
     get depthRenderer() {
         if (!this._depthRenderer) {
-            this._depthRenderer = new VBOBatchingTrianglesDepthRenderer(this._scene);
+            this._depthRenderer = new TrianglesDepthRenderer(this._scene);
         }
         return this._depthRenderer;
     }
 
     get normalsRenderer() {
         if (!this._normalsRenderer) {
-            this._normalsRenderer = new VBOBatchingTrianglesNormalsRenderer(this._scene);
+            this._normalsRenderer = new TrianglesNormalsRenderer(this._scene);
         }
         return this._normalsRenderer;
     }
 
     get edgesRenderer() {
         if (!this._edgesRenderer) {
-            this._edgesRenderer = new VBOBatchingTrianglesEdgesRenderer(this._scene);
+            this._edgesRenderer = new EdgesEmphasisRenderer(this._scene);
         }
         return this._edgesRenderer;
     }
 
     get edgesColorRenderer() {
         if (!this._edgesColorRenderer) {
-            this._edgesColorRenderer = new VBOBatchingTrianglesEdgesColorRenderer(this._scene);
+            this._edgesColorRenderer = new EdgesColorRenderer(this._scene);
         }
         return this._edgesColorRenderer;
     }
 
     get pickMeshRenderer() {
         if (!this._pickMeshRenderer) {
-            this._pickMeshRenderer = new VBOBatchingTrianglesPickMeshRenderer(this._scene);
+            this._pickMeshRenderer = new TrianglesPickMeshRenderer(this._scene);
         }
         return this._pickMeshRenderer;
     }
 
     get pickNormalsRenderer() {
         if (!this._pickNormalsRenderer) {
-            this._pickNormalsRenderer = new VBOBatchingTrianglesPickNormalsRenderer(this._scene);
+            this._pickNormalsRenderer = new TrianglesPickNormalsRenderer(this._scene);
         }
         return this._pickNormalsRenderer;
     }
 
     get pickNormalsFlatRenderer() {
         if (!this._pickNormalsFlatRenderer) {
-            this._pickNormalsFlatRenderer = new VBOBatchingTrianglesPickNormalsFlatRenderer(this._scene);
+            this._pickNormalsFlatRenderer = new TrianglesPickNormalsFlatRenderer(this._scene);
         }
         return this._pickNormalsFlatRenderer;
     }
 
     get pickDepthRenderer() {
         if (!this._pickDepthRenderer) {
-            this._pickDepthRenderer = new VBOBatchingTrianglesPickDepthRenderer(this._scene);
+            this._pickDepthRenderer = new TrianglesPickDepthRenderer(this._scene);
         }
         return this._pickDepthRenderer;
     }
 
     get occlusionRenderer() {
         if (!this._occlusionRenderer) {
-            this._occlusionRenderer = new VBOBatchingTrianglesOcclusionRenderer(this._scene);
+            this._occlusionRenderer = new TrianglesOcclusionRenderer(this._scene);
         }
         return this._occlusionRenderer;
     }
 
     get shadowRenderer() {
         if (!this._shadowRenderer) {
-            this._shadowRenderer = new VBOBatchingTrianglesShadowRenderer(this._scene);
+            this._shadowRenderer = new TrianglesShadowRenderer(this._scene);
         }
         return this._shadowRenderer;
     }
 
     get snapRenderer() {
         if (!this._snapRenderer) {
-            this._snapRenderer = new VBOBatchingTrianglesSnapRenderer(this._scene);
+            this._snapRenderer = new TrianglesSnapRenderer(this._scene);
         }
         return this._snapRenderer;
     }
 
     get snapInitRenderer() {
         if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new VBOBatchingTrianglesSnapInitRenderer(this._scene);
+            this._snapInitRenderer = new TrianglesSnapInitRenderer(this._scene);
         }
         return this._snapInitRenderer;
     }
@@ -358,7 +358,7 @@ export function getRenderers(scene) {
     const sceneId = scene.id;
     let batchingRenderers = cachdRenderers[sceneId];
     if (!batchingRenderers) {
-        batchingRenderers = new VBOBatchingTrianglesRenderers(scene);
+        batchingRenderers = new Renderers(scene);
         cachdRenderers[sceneId] = batchingRenderers;
         batchingRenderers._compile();
         batchingRenderers.eagerCreateRenders();

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesBatchingRenderer.js}

@@ -3,9 +3,10 @@ import {VBORenderer} from "./../../../VBORenderer.js";
 /**
  * @private
  */
-export class VBOBatchingTrianglesRenderer extends VBORenderer {
-    constructor(scene, withSAO, {instancing = false, edges = false} = {}) {
-        super(scene, withSAO, {instancing, edges});
+export class TrianglesBatchingRenderer extends VBORenderer {
+
+    constructor(scene, withSAO, {edges = false} = {}) {
+        super(scene, withSAO, {instancing: false, edges});
     }
 
     _draw(drawCfg) {

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesColorRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesColorRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesColorRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesColorRenderer extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesColorTextureRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesColorTextureRenderer.js}

@@ -1,10 +1,10 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesColorTextureRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesDepthRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesDepthRenderer.js}

@@ -1,10 +1,10 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesDepthRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesDepthRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesFlatColorRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesFlatColorRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesFlatColorRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesFlatColorRenderer extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesNormalsRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesNormalsRenderer.js}

@@ -1,4 +1,4 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 
 /**
@@ -6,7 +6,7 @@ import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
  */
 
 
-export class VBOBatchingTrianglesNormalsRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesNormalsRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesOcclusionRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesOcclusionRenderer.js}

@@ -1,4 +1,4 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 // Logarithmic depth buffer involves an accuracy tradeoff, sacrificing
 // accuracy at close range to improve accuracy at long range. This can
@@ -9,7 +9,7 @@ const ENABLE_LOG_DEPTH_BUF = false;
 /**
  * @private
  */
-export class VBOBatchingTrianglesOcclusionRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesOcclusionRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPBRRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPBRRenderer.js}

@@ -1,4 +1,4 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 // const TEXTURE_DECODE_FUNCS = {};
 // TEXTURE_DECODE_FUNCS[LinearEncoding] = "linearToLinear";
@@ -7,7 +7,7 @@ import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
 /**
  * @private
  */
-export class VBOBatchingTrianglesPBRRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesPBRRenderer extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
         return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickDepthRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickDepthRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesPickDepthRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesPickDepthRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
 

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickMeshRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickMeshRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesPickMeshRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesPickMeshRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickNormalsFlatRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickNormalsFlatRenderer.js}

@@ -1,11 +1,11 @@
 import { math } from "../../../../../math/math.js";
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesPickNormalsFlatRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesPickNormalsFlatRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickNormalsRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickNormalsRenderer.js}

@@ -1,11 +1,11 @@
 import { math } from "../../../../../math/math.js";
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesPickNormalsRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesPickNormalsRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesShadowRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesShadowRenderer.js}

@@ -1,11 +1,11 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 /**
  * Renders BatchingLayer fragment depths to a shadow map.
  *
  * @private
  */
-export class VBOBatchingTrianglesShadowRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesShadowRenderer extends TrianglesBatchingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesSilhouetteRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesSilhouetteRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOBatchingTrianglesRenderer} from "./VBOBatchingTrianglesRenderer.js";
+import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
 /**
  * @private
  */
-export class VBOBatchingTrianglesSilhouetteRenderer extends VBOBatchingTrianglesRenderer {
+export class TrianglesSilhouetteRenderer extends TrianglesBatchingRenderer {
 
     drawLayer(frameCtx, batchingLayer, renderPass) {
         super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: true });
@@ -67,7 +67,7 @@ export class VBOBatchingTrianglesSilhouetteRenderer extends VBOBatchingTriangles
             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;");

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesSnapInitRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesSnapInitRenderer.js}

@@ -13,7 +13,7 @@ const SNAPPING_LOG_DEPTH_BUF_ENABLED = true; // Improves occlusion accuracy at d
 /**
  * @private
  */
-export class VBOBatchingTrianglesSnapInitRenderer extends VBORenderer {
+export class TrianglesSnapInitRenderer extends VBORenderer {
 
     drawLayer(frameCtx, batchingLayer, renderPass) {
 

package/src/{viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesSnapRenderer.js → src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesSnapRenderer.js}

@@ -13,7 +13,7 @@ const SNAPPING_LOG_DEPTH_BUF_ENABLED = true; // Improves occlusion accuracy at d
 /**
  * @private
  */
-export class VBOBatchingTrianglesSnapRenderer extends VBORenderer{
+export class TrianglesSnapRenderer extends VBORenderer{
     _getHash() {
         return this._scene._sectionPlanesState.getHash() + (this._scene.pointsMaterial.hash);
     }