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

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesEdgesColorRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/EdgesColorRenderer.js}

@@ -1,11 +1,15 @@
-import {VBOSceneModelTriangleInstancingEdgesRenderer} from "./VBOSceneModelTriangleInstancingEdgesRenderer.js";
+import {EdgesRenderer} from "./EdgesRenderer.js";
 
 /**
  * @private
  */
 
 
-export class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTriangleInstancingEdgesRenderer {
+export class EdgesColorRenderer extends EdgesRenderer {
+
+    drawLayer(frameCtx, batchingLayer, renderPass) {
+        super.drawLayer(frameCtx, batchingLayer, renderPass, { colorUniform: false });
+    }
 
     _buildVertexShader() {
         const scene = this._scene;
@@ -13,7 +17,7 @@ export class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTrian
         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;");
@@ -83,7 +87,7 @@ export class VBOInstancingTrianglesEdgesColorRenderer extends VBOSceneModelTrian
         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;");

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesEdgesRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/EdgesEmphasisRenderer.js}

@@ -1,11 +1,11 @@
-import {VBOSceneModelTriangleInstancingEdgesRenderer} from "./VBOSceneModelTriangleInstancingEdgesRenderer.js";
+import {EdgesRenderer} from "./EdgesRenderer.js";
 
 /**
  * @private
  */
 
 
-export class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleInstancingEdgesRenderer {
+export class EdgesEmphasisRenderer extends EdgesRenderer {
 
     drawLayer(frameCtx, instancingLayer, renderPass) {
         super.drawLayer(frameCtx, instancingLayer, renderPass, {colorUniform: true});
@@ -17,10 +17,11 @@ export class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleIn
         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;");
@@ -58,7 +59,9 @@ export class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleIn
         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;");
@@ -86,7 +89,7 @@ export class VBOInstancingTrianglesEdgesRenderer extends VBOSceneModelTriangleIn
         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;");

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

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

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesRenderers.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/Renderers.js}

@@ -1,25 +1,25 @@
-import {VBOInstancingTrianglesColorRenderer} from "./VBOInstancingTrianglesColorRenderer.js";
-import {VBOInstancingTrianglesFlatColorRenderer} from "./VBOInstancingTrianglesFlatColorRenderer.js";
-import {VBOInstancingTrianglesSilhouetteRenderer} from "./VBOInstancingTrianglesSilhouetteRenderer.js";
-import {VBOInstancingTrianglesEdgesRenderer} from "./VBOInstancingTrianglesEdgesRenderer.js";
-import {VBOInstancingTrianglesEdgesColorRenderer} from "./VBOInstancingTrianglesEdgesColorRenderer.js";
-import {VBOInstancingTrianglesPickMeshRenderer} from "./VBOInstancingTrianglesPickMeshRenderer.js";
-import {VBOInstancingTrianglesPickDepthRenderer} from "./VBOInstancingTrianglesPickDepthRenderer.js";
-import {VBOInstancingTrianglesPickNormalsRenderer} from "./VBOInstancingTrianglesPickNormalsRenderer.js";
-import {VBOInstancingTrianglesOcclusionRenderer} from "./VBOInstancingTrianglesOcclusionRenderer.js";
-import {VBOInstancingTrianglesDepthRenderer} from "./VBOInstancingTrianglesDepthRenderer.js";
-import {VBOInstancingTrianglesNormalsRenderer} from "./VBOInstancingTrianglesNormalsRenderer.js";
-import {VBOInstancingTrianglesShadowRenderer} from "./VBOInstancingTrianglesShadowRenderer.js";
-import {VBOInstancingTrianglesPBRRenderer} from "./VBOInstancingTrianglesPBRRenderer.js";
-import {VBOInstancingTrianglesPickNormalsFlatRenderer} from "./VBOInstancingTrianglesPickNormalsFlatRenderer.js";
-import {VBOInstancingTrianglesColorTextureRenderer} from "./VBOInstancingTrianglesColorTextureRenderer.js";
-import {VBOInstancingTrianglesSnapInitRenderer} from "./VBOInstancingTrianglesSnapInitRenderer.js";
-import {VBOInstancingTrianglesSnapRenderer} from "./VBOInstancingTrianglesSnapRenderer.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 VBOInstancingTrianglesRenderers {
+class Renderers {
 
     constructor(scene) {
         this._scene = scene;
@@ -119,165 +119,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;
     }
@@ -358,7 +358,7 @@ export function getRenderers(scene) {
     const sceneId = scene.id;
     let instancingRenderers = cachedRenderers[sceneId];
     if (!instancingRenderers) {
-        instancingRenderers = new VBOInstancingTrianglesRenderers(scene);
+        instancingRenderers = new Renderers(scene);
         cachedRenderers[sceneId] = instancingRenderers;
         instancingRenderers._compile();
         instancingRenderers.eagerCreateRenders();

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesColorRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesColorRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @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(";");
@@ -250,4 +250,4 @@ class VBOInstancingTrianglesColorRenderer extends VBOSceneModelTriangleInstancin
     }
 }
 
-export {VBOInstancingTrianglesColorRenderer};
+export {TrianglesColorRenderer};

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesColorTextureRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesColorTextureRenderer.js}

@@ -1,11 +1,11 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @private
  */
 
 
-export class VBOInstancingTrianglesColorTextureRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
     _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/instancing/triangles/renderers/VBOInstancingTrianglesDepthRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesDepthRenderer.js}

@@ -1,11 +1,11 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @private
  */
 
 
-export class VBOInstancingTrianglesDepthRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesDepthRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesFlatColorRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesFlatColorRenderer.js}

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

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesFlatNormalsRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesFlatNormalsRenderer.js}

@@ -1,11 +1,11 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 
 /**
  * @private
  */
 
-export class VBOInstancingTrianglesFlatNormalsRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesFlatNormalsRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOSceneModelTriangleInstancingRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesInstancingRenderer.js}

@@ -3,7 +3,7 @@ import {VBORenderer} from "./../../../VBORenderer.js";
 /**
  * @private
  */
-export class VBOSceneModelTriangleInstancingRenderer extends VBORenderer {
+export class TrianglesInstancingRenderer extends VBORenderer {
     constructor(scene, withSAO, {edges = false} = {}) {
         super(scene, withSAO, {instancing: true, edges});
     }

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesNormalsRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesNormalsRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @private
  */
-export class VBOInstancingTrianglesNormalsRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesNormalsRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesOcclusionRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesOcclusionRenderer.js}

@@ -1,4 +1,4 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.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 VBOInstancingTrianglesOcclusionRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesOcclusionRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPBRRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPBRRenderer.js}

@@ -1,5 +1,5 @@
 import {LinearEncoding, sRGBEncoding} from "../../../../../constants/constants.js";
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 const TEXTURE_DECODE_FUNCS = {};
 TEXTURE_DECODE_FUNCS[LinearEncoding] = "linearToLinear";
@@ -8,7 +8,7 @@ TEXTURE_DECODE_FUNCS[sRGBEncoding] = "sRGBToLinear";
 /**
  * @private
  */
-export class VBOInstancingTrianglesPBRRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesPBRRenderer extends TrianglesInstancingRenderer {
     _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/instancing/triangles/renderers/VBOInstancingTrianglesPickDepthRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickDepthRenderer.js}

@@ -1,8 +1,8 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 /**
  * @private
  */
-export class VBOInstancingTrianglesPickDepthRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesPickDepthRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickMeshRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickMeshRenderer.js}

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

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickNormalsFlatRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickNormalsFlatRenderer.js}

@@ -1,10 +1,10 @@
 import { math } from "../../../../../math/math.js";
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @private
  */
-export class VBOInstancingTrianglesPickNormalsFlatRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesPickNormalsFlatRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickNormalsRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickNormalsRenderer.js}

@@ -1,10 +1,10 @@
 import { math } from "../../../../../math/math.js";
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @private
  */
-export class VBOInstancingTrianglesPickNormalsRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesPickNormalsRenderer extends TrianglesInstancingRenderer {
 
     _buildVertexShader() {
         const scene = this._scene;

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesShadowRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesShadowRenderer.js}

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

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesSilhouetteRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSilhouetteRenderer.js}

@@ -1,9 +1,9 @@
-import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
+import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
 
 /**
  * @private
  */
-export class VBOInstancingTrianglesSilhouetteRenderer extends VBOSceneModelTriangleInstancingRenderer {
+export class TrianglesSilhouetteRenderer extends TrianglesInstancingRenderer {
 
     drawLayer(frameCtx, instancingLayer, renderPass) {
         // TODO color uniform true ???

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesSnapInitRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSnapInitRenderer.js}

@@ -13,7 +13,7 @@ const SNAPPING_LOG_DEPTH_BUF_ENABLED = true; // Improves occlusion accuracy at d
 /**
  * @private
  */
-export class VBOInstancingTrianglesSnapInitRenderer extends VBORenderer {
+export class TrianglesSnapInitRenderer extends VBORenderer {
 
     constructor(scene) {
         super(scene, false, { instancing: true });

package/src/{viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesSnapRenderer.js → src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSnapRenderer.js}

@@ -13,7 +13,7 @@ const SNAPPING_LOG_DEPTH_BUF_ENABLED = true; // Improves occlusion accuracy at d
 /**
  * @private
  */
-export class VBOInstancingTrianglesSnapRenderer extends VBORenderer {
+export class TrianglesSnapRenderer extends VBORenderer {
 
     constructor(scene) {
         super(scene, false, { instancing: true });