@xeokit/xeokit-sdk 2.6.28 → 2.6.30

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

@@ -50,6 +50,14 @@ class Renderers {
             this._colorTextureRendererWithSAO.destroy();
             this._colorTextureRendererWithSAO = null;
         }
+        if (this._colorTextureRendererAlphaCutoff && (!this._colorTextureRendererAlphaCutoff.getValid())) {
+            this._colorTextureRendererAlphaCutoff.destroy();
+            this._colorTextureRendererAlphaCutoff = null;
+        }
+        if (this._colorTextureRendererWithSAOAlphaCutoff && (!this._colorTextureRendererWithSAOAlphaCutoff.getValid())) {
+            this._colorTextureRendererWithSAOAlphaCutoff.destroy();
+            this._colorTextureRendererWithSAOAlphaCutoff = null;
+        }
         if (this._pbrRenderer && (!this._pbrRenderer.getValid())) {
             this._pbrRenderer.destroy();
             this._pbrRenderer = null;
@@ -177,6 +185,20 @@ class Renderers {
         return this._colorTextureRendererWithSAO;
     }
 
+    get colorTextureRendererAlphaCutoff() {
+        if (!this._colorTextureRendererAlphaCutoff) {
+            this._colorTextureRendererAlphaCutoff = new TrianglesColorTextureRenderer(this._scene, false, { useAlphaCutoff: true });
+        }
+        return this._colorTextureRendererAlphaCutoff;
+    }
+
+    get colorTextureRendererWithSAOAlphaCutoff() {
+        if (!this._colorTextureRendererWithSAOAlphaCutoff) {
+            this._colorTextureRendererWithSAOAlphaCutoff = new TrianglesColorTextureRenderer(this._scene, true, { useAlphaCutoff: true });
+        }
+        return this._colorTextureRendererWithSAOAlphaCutoff;
+    }
+
     get pbrRenderer() {
         if (!this._pbrRenderer) {
             this._pbrRenderer = new TrianglesPBRRenderer(this._scene, false);
@@ -301,6 +323,12 @@ class Renderers {
         if (this._colorTextureRendererWithSAO) {
             this._colorTextureRendererWithSAO.destroy();
         }
+        if (this._colorTextureRendererAlphaCutoff) {
+            this._colorTextureRendererAlphaCutoff.destroy();
+        }
+        if (this._colorTextureRendererWithSAOAlphaCutoff) {
+            this._colorTextureRendererWithSAOAlphaCutoff.destroy();
+        }
         if (this._pbrRenderer) {
             this._pbrRenderer.destroy();
         }
@@ -349,27 +377,27 @@ class Renderers {
     }
 }
 
-const cachdRenderers = {};
+const cachedRenderers = {};
 
 /**
  * @private
  */
 export function getRenderers(scene) {
     const sceneId = scene.id;
-    let batchingRenderers = cachdRenderers[sceneId];
-    if (!batchingRenderers) {
-        batchingRenderers = new Renderers(scene);
-        cachdRenderers[sceneId] = batchingRenderers;
-        batchingRenderers._compile();
-        batchingRenderers.eagerCreateRenders();
+    let renderers = cachedRenderers[sceneId];
+    if (!renderers) {
+        renderers = new Renderers(scene);
+        cachedRenderers[sceneId] = renderers;
+        renderers._compile();
+        renderers.eagerCreateRenders();
         scene.on("compile", () => {
-            batchingRenderers._compile();
-            batchingRenderers.eagerCreateRenders();
+            renderers._compile();
+            renderers.eagerCreateRenders();
         });
         scene.on("destroyed", () => {
-            delete cachdRenderers[sceneId];
-            batchingRenderers._destroy();
+            delete cachedRenderers[sceneId];
+            renderers._destroy();
         });
     }
-    return batchingRenderers;
+    return renderers;
 }

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

@@ -5,8 +5,8 @@ import {VBORenderer} from "./../../../VBORenderer.js";
  */
 export class TrianglesBatchingRenderer extends VBORenderer {
 
-    constructor(scene, withSAO, {edges = false} = {}) {
-        super(scene, withSAO, {instancing: false, edges});
+    constructor(scene, withSAO, {edges = false, useAlphaCutoff = false} = {}) {
+        super(scene, withSAO, {instancing: false, edges, useAlphaCutoff});
     }
 
     _draw(drawCfg) {
@@ -23,7 +23,6 @@ export class TrianglesBatchingRenderer extends VBORenderer {
         } else {
             const count = frameCtx.pickElementsCount || state.indicesBuf.numItems;
             const offset = frameCtx.pickElementsOffset ? frameCtx.pickElementsOffset * state.indicesBuf.itemByteSize : 0;
-
             gl.drawElements(gl.TRIANGLES, count, state.indicesBuf.itemType, offset);
 
             if (incrementDrawState) {

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

@@ -1,9 +1,9 @@
 import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
 
-
 /**
  * @private
  */
+
 export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
     _getHash() {
         const scene = this._scene;
@@ -11,11 +11,10 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
     }
 
     drawLayer(frameCtx, layer, renderPass) {
-        super.drawLayer(frameCtx, layer, renderPass, {incrementDrawState: true});
+        super.drawLayer(frameCtx, layer, renderPass, { incrementDrawState: true });
     }
 
     _buildVertexShader() {
-
         const scene = this._scene;
         const sectionPlanesState = scene._sectionPlanesState;
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
@@ -36,7 +35,7 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
 
         this._addMatricesUniformBlockLines(src);
 
-        src.push("uniform mat3 uvDecodeMatrix;")
+        src.push("uniform mat3 uvDecodeMatrix;");
 
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
@@ -70,6 +69,7 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
         if (scene.entityOffsetsEnabled) {
             src.push("worldPosition.xyz = worldPosition.xyz + offset;");
         }
+
         src.push("vec4 viewPosition  = viewMatrix * worldPosition; ");
         src.push("vViewPosition = viewPosition;");
         src.push("vColor = vec4(float(color.r) / 255.0, float(color.g) / 255.0, float(color.b) / 255.0, float(color.a) / 255.0);");
@@ -80,10 +80,12 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
+
         if (clipping) {
             src.push("vWorldPosition = worldPosition;");
             src.push("vFlags = flags;");
         }
+
         src.push("gl_Position = clipPos;");
         src.push("}");
         src.push("}");
@@ -96,6 +98,7 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
         const lightsState = scene._lightsState;
         const sectionPlanesState = scene._sectionPlanesState;
         const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
+        const useAlphaCutoff = this._useAlphaCutoff;
         const src = [];
         src.push("#version 300 es");
         src.push("// Triangles batching color texture fragment shader");
@@ -154,6 +157,7 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
             src.push("uniform vec4 sliceColor;");
         }
         this._addMatricesUniformBlockLines(src);
+
         src.push("uniform vec4 lightAmbient;");
         for (let i = 0, len = lightsState.lights.length; i < len; i++) {
             const light = lightsState.lights[i];
@@ -173,6 +177,10 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
             }
         }
 
+        if (useAlphaCutoff) {
+            src.push("uniform float materialAlphaCutoff;");
+        }
+
         src.push("in vec4 vViewPosition;");
         src.push("in vec4 vColor;");
         src.push("in vec2 vUV;");
@@ -240,11 +248,21 @@ export class TrianglesColorTextureRenderer extends TrianglesBatchingRenderer {
         }
 
         src.push("vec4 color =  vec4((lightAmbient.rgb * lightAmbient.a * newColor.rgb) + (reflectedColor * newColor.rgb), newColor.a);");
+
+        src.push("vec4 sampleColor = texture(uColorMap, vUV);");
+
+        if (useAlphaCutoff) {
+            src.push("if (sampleColor.a < materialAlphaCutoff) {");
+            src.push("   discard;");
+            src.push("}");
+        }
+
         if (gammaOutput) {
-            src.push("vec4 colorTexel = color * sRGBToLinear(texture(uColorMap, vUV));");
-        } else {
-            src.push("vec4 colorTexel = color * texture(uColorMap, vUV);");
+            src.push("sampleColor = sRGBToLinear(sampleColor);");
         }
+
+        src.push("vec4 colorTexel = color * sampleColor;");
+
         src.push("float opacity = color.a;");
 
         if (this._withSAO) {

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

@@ -214,7 +214,7 @@ export class TrianglesSnapRenderer extends VBORenderer{
 
         src.push(`int pickFlag = int(flags) >> 12 & 0xF;`);
         src.push(`if (pickFlag != renderPass) {`);
-        src.push("      gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
+        src.push("      gl_Position = vec4(2.0, 0.0, 0.0, 0.0);"); // Cull vertex
         src.push("  } else {");
         src.push("      vec4 worldPosition = worldMatrix * (positionsDecodeMatrix * vec4(position, 1.0)); ");
         if (scene.entityOffsetsEnabled) {

package/src/viewer/scene/model/vbo/instancing/lines/VBOInstancingLinesLayer.js

@@ -28,7 +28,7 @@ class VBOInstancingLinesLayer {
      */
     constructor(cfg) {
 
-        console.info("VBOInstancingLinesLayer");
+     //   console.info("VBOInstancingLinesLayer");
 
         /**
          * Owner model
@@ -108,6 +108,11 @@ class VBOInstancingLinesLayer {
         }
 
         this._finalized = false;
+
+        /**
+         * The type of primitives in this layer.
+         */
+        this.primitive = cfg.primitive;
     }
 
     get aabb() {

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

@@ -221,7 +221,7 @@ export class VBOInstancingLinesSnapRenderer extends VBORenderer {
         // renderPass = PICK
         src.push(`int pickFlag = int(flags) >> 12 & 0xF;`);
         src.push(`if (pickFlag != renderPass) {`);
-        src.push("   gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
+        src.push("   gl_Position = vec4(2.0, 0.0, 0.0, 0.0);"); // Cull vertex
         src.push("} else {");
         src.push("  vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
         src.push("  worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");

package/src/viewer/scene/model/vbo/instancing/points/VBOInstancingPointsLayer.js

@@ -27,7 +27,7 @@ export class VBOInstancingPointsLayer {
      */
     constructor(cfg) {
 
-        console.info("VBOInstancingPointsLayer");
+      //  console.info("VBOInstancingPointsLayer");
 
         /**
          * Owner model
@@ -101,6 +101,11 @@ export class VBOInstancingPointsLayer {
         this.aabbDirty = true;
 
         this._finalized = false;
+
+        /**
+         * The type of primitives in this layer.
+         */
+        this.primitive = cfg.geometry.primitive;
     }
 
     get aabb() {

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

@@ -36,7 +36,7 @@ export class VBOInstancingTrianglesLayer {
      */
     constructor(cfg) {
 
-         console.info("Creating VBOInstancingTrianglesLayer");
+      //   console.info("Creating VBOInstancingTrianglesLayer");
 
         /**
          * Owner model
@@ -139,6 +139,11 @@ export class VBOInstancingTrianglesLayer {
          * @type {number|*}
          */
         this.numIndices = cfg.geometry.numIndices;
+
+        /**
+         * The type of primitives in this layer.
+         */
+        this.primitive = cfg.geometry.primitive;
     }
 
     get aabb() {
@@ -252,7 +257,7 @@ export class VBOInstancingTrianglesLayer {
 
         const portion = {};
 
-        if (this.model.scene.pickSurfacePrecisionEnabled) {
+        if (this.model.scene.readableGeometryEnabled) {
             portion.matrix = meshMatrix.slice();
             portion.inverseMatrix = null; // Lazy-computed in precisionRayPickSurface
             portion.normalMatrix = null; // Lazy-computed in precisionRayPickSurface
@@ -690,7 +695,7 @@ export class VBOInstancingTrianglesLayer {
     }
 
     getEachVertex(portionId, callback) {
-        if (!this.model.scene.pickSurfacePrecisionEnabled) {
+        if (!this.model.scene.readableGeometryEnabled) {
             return false;
         }
         const state = this._state;
@@ -702,13 +707,12 @@ export class VBOInstancingTrianglesLayer {
         }
         const positions = geometry.quantizedPositions;
         const origin = state.origin;
-        const offset = portion.offset;
-        const offsetX = origin[0] + offset[0];
-        const offsetY = origin[1] + offset[1];
-        const offsetZ = origin[2] + offset[2];
+        const offsetX = origin[0] ;
+        const offsetY = origin[1] ;
+        const offsetZ = origin[2] ;
         const worldPos = tempVec4a;
         const portionMatrix = portion.matrix;
-        const sceneModelPatrix = this.model.sceneModelMatrix;
+        const sceneModelMatrix = this.model.matrix;
         const positionsDecodeMatrix = state.positionsDecodeMatrix;
         for (let i = 0, len = positions.length; i < len; i += 3) {
             worldPos[0] = positions[i];
@@ -716,7 +720,7 @@ export class VBOInstancingTrianglesLayer {
             worldPos[2] = positions[i + 2];
             math.decompressPosition(worldPos, positionsDecodeMatrix);
             math.transformPoint3(portionMatrix, worldPos);
-            math.transformPoint3(sceneModelPatrix, worldPos);
+            math.transformPoint3(sceneModelMatrix, worldPos);
             worldPos[0] += offsetX;
             worldPos[1] += offsetY;
             worldPos[2] += offsetZ;
@@ -724,6 +728,23 @@ export class VBOInstancingTrianglesLayer {
         }
     }
 
+    getEachIndex(portionId, callback) {
+        if (!this.model.scene.readableGeometryEnabled) {
+            return false;
+        }
+        const state = this._state;
+        const geometry = state.geometry;
+        const portion = this._portions[portionId];
+        if (!portion) {
+            this.model.error("portion not found: " + portionId);
+            return;
+        }
+        const indices = geometry.indices;
+        for (let i = 0, len = indices.length; i < len; i++) {
+            callback(indices[i]);
+        }
+    }
+
     setMatrix(portionId, matrix) {
         if (!this._finalized) {
             throw "Not finalized";
@@ -764,14 +785,21 @@ export class VBOInstancingTrianglesLayer {
             return;
         }
         this._updateBackfaceCull(renderFlags, frameCtx);
+        const useAlphaCutoff = this._state.textureSet && (typeof(this._state.textureSet.alphaCutoff) === "number");
         if (frameCtx.withSAO && this.model.saoEnabled) {
             if (frameCtx.pbrEnabled && this.model.pbrEnabled && this._state.pbrSupported) {
                 if (this._renderers.pbrRendererWithSAO) {
                     this._renderers.pbrRendererWithSAO.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
                 }
             } else if (frameCtx.colorTextureEnabled && this.model.colorTextureEnabled && this._state.colorTextureSupported) {
-                if (this._renderers.colorTextureRendererWithSAO) {
-                    this._renderers.colorTextureRendererWithSAO.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
+                if (useAlphaCutoff) {
+                    if (this._renderers.colorTextureRendererWithSAOAlphaCutoff) {
+                        this._renderers.colorTextureRendererWithSAOAlphaCutoff.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
+                    }
+                } else {
+                    if (this._renderers.colorTextureRendererWithSAO) {
+                        this._renderers.colorTextureRendererWithSAO.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
+                    }
                 }
             } else if (this._state.normalsBuf) {
                 if (this._renderers.colorRendererWithSAO) {
@@ -787,8 +815,14 @@ export class VBOInstancingTrianglesLayer {
                 this._renderers.pbrRenderer.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
             }
         } else if (frameCtx.colorTextureEnabled && this.model.colorTextureEnabled && this._state.colorTextureSupported) {
-            if (this._renderers.colorTextureRenderer) {
-                this._renderers.colorTextureRenderer.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
+            if (useAlphaCutoff) {
+                if (this._renderers.colorTextureRendererAlphaCutoff) {
+                    this._renderers.colorTextureRendererAlphaCutoff.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
+                }
+            } else {
+                if (this._renderers.colorTextureRenderer) {
+                    this._renderers.colorTextureRenderer.drawLayer(frameCtx, this, RENDER_PASSES.COLOR_OPAQUE);
+                }
             }
         } else if (this._state.normalsBuf) {
             if (this._renderers.colorRenderer) {
@@ -1030,7 +1064,7 @@ export class VBOInstancingTrianglesLayer {
 
     precisionRayPickSurface(portionId, worldRayOrigin, worldRayDir, worldSurfacePos, worldNormal) {
 
-        if (!this.model.scene.pickSurfacePrecisionEnabled) {
+        if (!this.model.scene.readableGeometryEnabled) {
             return false;
         }
 

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

@@ -42,14 +42,6 @@ class Renderers {
             this._flatColorRendererWithSAO.destroy();
             this._flatColorRendererWithSAO = null;
         }
-        if (this._pbrRenderer && (!this._pbrRenderer.getValid())) {
-            this._pbrRenderer.destroy();
-            this._pbrRenderer = null;
-        }
-        if (this._pbrRendererWithSAO && (!this._pbrRendererWithSAO.getValid())) {
-            this._pbrRendererWithSAO.destroy();
-            this._pbrRendererWithSAO = null;
-        }
         if (this._colorTextureRenderer && (!this._colorTextureRenderer.getValid())) {
             this._colorTextureRenderer.destroy();
             this._colorTextureRenderer = null;
@@ -58,6 +50,22 @@ class Renderers {
             this._colorTextureRendererWithSAO.destroy();
             this._colorTextureRendererWithSAO = null;
         }
+        if (this._colorTextureRendererAlphaCutoff && (!this._colorTextureRendererAlphaCutoff.getValid())) {
+            this._colorTextureRendererAlphaCutoff.destroy();
+            this._colorTextureRendererAlphaCutoff = null;
+        }
+        if (this._colorTextureRendererWithSAOAlphaCutoff && (!this._colorTextureRendererWithSAOAlphaCutoff.getValid())) {
+            this._colorTextureRendererWithSAOAlphaCutoff.destroy();
+            this._colorTextureRendererWithSAOAlphaCutoff = null;
+        }
+        if (this._pbrRenderer && (!this._pbrRenderer.getValid())) {
+            this._pbrRenderer.destroy();
+            this._pbrRenderer = null;
+        }
+        if (this._pbrRendererWithSAO && (!this._pbrRendererWithSAO.getValid())) {
+            this._pbrRendererWithSAO.destroy();
+            this._pbrRendererWithSAO = null;
+        }
         if (this._depthRenderer && (!this._depthRenderer.getValid())) {
             this._depthRenderer.destroy();
             this._depthRenderer = null;
@@ -90,7 +98,7 @@ class Renderers {
             this._pickNormalsRenderer.destroy();
             this._pickNormalsRenderer = null;
         }
-        if (this._pickNormalsFlatRenderer && (!this._pickNormalsFlatRenderer.getValid())) {
+        if (this._pickNormalsFlatRenderer && this._pickNormalsFlatRenderer.getValid() === false) {
             this._pickNormalsFlatRenderer.destroy();
             this._pickNormalsFlatRenderer = null;
         }
@@ -163,20 +171,6 @@ class Renderers {
         return this._flatColorRendererWithSAO;
     }
 
-    get pbrRenderer() {
-        if (!this._pbrRenderer) {
-            this._pbrRenderer = new TrianglesPBRRenderer(this._scene, false);
-        }
-        return this._pbrRenderer;
-    }
-
-    get pbrRendererWithSAO() {
-        if (!this._pbrRendererWithSAO) {
-            this._pbrRendererWithSAO = new TrianglesPBRRenderer(this._scene, true);
-        }
-        return this._pbrRendererWithSAO;
-    }
-
     get colorTextureRenderer() {
         if (!this._colorTextureRenderer) {
             this._colorTextureRenderer = new TrianglesColorTextureRenderer(this._scene, false);
@@ -191,6 +185,34 @@ class Renderers {
         return this._colorTextureRendererWithSAO;
     }
 
+    get colorTextureRendererAlphaCutoff() {
+        if (!this._colorTextureRendererAlphaCutoff) {
+            this._colorTextureRendererAlphaCutoff = new TrianglesColorTextureRenderer(this._scene, false, { useAlphaCutoff: true });
+        }
+        return this._colorTextureRendererAlphaCutoff;
+    }
+
+    get colorTextureRendererWithSAOAlphaCutoff() {
+        if (!this._colorTextureRendererWithSAOAlphaCutoff) {
+            this._colorTextureRendererWithSAOAlphaCutoff = new TrianglesColorTextureRenderer(this._scene, true, { useAlphaCutoff: true });
+        }
+        return this._colorTextureRendererWithSAOAlphaCutoff;
+    }
+
+    get pbrRenderer() {
+        if (!this._pbrRenderer) {
+            this._pbrRenderer = new TrianglesPBRRenderer(this._scene, false);
+        }
+        return this._pbrRenderer;
+    }
+
+    get pbrRendererWithSAO() {
+        if (!this._pbrRendererWithSAO) {
+            this._pbrRendererWithSAO = new TrianglesPBRRenderer(this._scene, true);
+        }
+        return this._pbrRendererWithSAO;
+    }
+
     get silhouetteRenderer() {
         if (!this._silhouetteRenderer) {
             this._silhouetteRenderer = new TrianglesSilhouetteRenderer(this._scene);
@@ -268,13 +290,6 @@ class Renderers {
         return this._shadowRenderer;
     }
 
-    get snapInitRenderer() {
-        if (!this._snapInitRenderer) {
-            this._snapInitRenderer = new TrianglesSnapInitRenderer(this._scene, false);
-        }
-        return this._snapInitRenderer;
-    }
-
     get snapRenderer() {
         if (!this._snapRenderer) {
             this._snapRenderer = new TrianglesSnapRenderer(this._scene);
@@ -282,6 +297,13 @@ class Renderers {
         return this._snapRenderer;
     }
 
+    get snapInitRenderer() {
+        if (!this._snapInitRenderer) {
+            this._snapInitRenderer = new TrianglesSnapInitRenderer(this._scene);
+        }
+        return this._snapInitRenderer;
+    }
+
     _destroy() {
         if (this._colorRenderer) {
             this._colorRenderer.destroy();
@@ -295,18 +317,24 @@ class Renderers {
         if (this._flatColorRendererWithSAO) {
             this._flatColorRendererWithSAO.destroy();
         }
-        if (this._pbrRenderer) {
-            this._pbrRenderer.destroy();
-        }
-        if (this._pbrRendererWithSAO) {
-            this._pbrRendererWithSAO.destroy();
-        }
         if (this._colorTextureRenderer) {
             this._colorTextureRenderer.destroy();
         }
         if (this._colorTextureRendererWithSAO) {
             this._colorTextureRendererWithSAO.destroy();
         }
+        if (this._colorTextureRendererAlphaCutoff) {
+            this._colorTextureRendererAlphaCutoff.destroy();
+        }
+        if (this._colorTextureRendererWithSAOAlphaCutoff) {
+            this._colorTextureRendererWithSAOAlphaCutoff.destroy();
+        }
+        if (this._pbrRenderer) {
+            this._pbrRenderer.destroy();
+        }
+        if (this._pbrRendererWithSAO) {
+            this._pbrRendererWithSAO.destroy();
+        }
         if (this._depthRenderer) {
             this._depthRenderer.destroy();
         }
@@ -356,21 +384,20 @@ const cachedRenderers = {};
  */
 export function getRenderers(scene) {
     const sceneId = scene.id;
-    let instancingRenderers = cachedRenderers[sceneId];
-    if (!instancingRenderers) {
-        instancingRenderers = new Renderers(scene);
-        cachedRenderers[sceneId] = instancingRenderers;
-        instancingRenderers._compile();
-        instancingRenderers.eagerCreateRenders();
+    let renderers = cachedRenderers[sceneId];
+    if (!renderers) {
+        renderers = new Renderers(scene);
+        cachedRenderers[sceneId] = renderers;
+        renderers._compile();
+        renderers.eagerCreateRenders();
         scene.on("compile", () => {
-            instancingRenderers._compile();
-            instancingRenderers.eagerCreateRenders();
+            renderers._compile();
+            renderers.eagerCreateRenders();
         });
         scene.on("destroyed", () => {
             delete cachedRenderers[sceneId];
-            instancingRenderers._destroy();
+            renderers._destroy();
         });
     }
-    return instancingRenderers;
+    return renderers;
 }
-