@babylonjs/core 5.57.0 → 6.0.0

package/Lights/Shadows/shadowGenerator.d.ts

@@ -17,6 +17,7 @@ import "../../Shaders/shadowMap.fragment";
 import "../../Shaders/shadowMap.vertex";
 import "../../Shaders/depthBoxBlur.fragment";
 import "../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow";
+import type { BaseTexture } from "../../Materials/Textures/baseTexture";
 /**
  * Defines the options associated with the creation of a custom shader for a shadow generator.
  */
@@ -506,6 +507,7 @@ export declare class ShadowGenerator implements IShadowGenerator {
     protected _useUBO: boolean;
     protected _sceneUBOs: UniformBuffer[];
     protected _currentSceneUBO: UniformBuffer;
+    protected _opacityTexture: Nullable<BaseTexture>;
     /**
      * @internal
      */

package/Lights/Shadows/shadowGenerator.js

@@ -832,19 +832,9 @@ export class ShadowGenerator {
             }
             else {
                 // Alpha test
-                if (this.useOpacityTextureForTransparentShadow) {
-                    const opacityTexture = material.opacityTexture;
-                    if (opacityTexture) {
-                        effect.setTexture("diffuseSampler", opacityTexture);
-                        effect.setMatrix("diffuseMatrix", opacityTexture.getTextureMatrix() || this._defaultTextureMatrix);
-                    }
-                }
-                else if (material.needAlphaTesting() || material.needAlphaBlending()) {
-                    const alphaTexture = material.getAlphaTestTexture();
-                    if (alphaTexture) {
-                        effect.setTexture("diffuseSampler", alphaTexture);
-                        effect.setMatrix("diffuseMatrix", alphaTexture.getTextureMatrix() || this._defaultTextureMatrix);
-                    }
+                if (this._opacityTexture) {
+                    effect.setTexture("diffuseSampler", this._opacityTexture);
+                    effect.setMatrix("diffuseMatrix", this._opacityTexture.getTextureMatrix() || this._defaultTextureMatrix);
                 }
                 // Bones
                 if (renderingMesh.useBones && renderingMesh.computeBonesUsingShaders && renderingMesh.skeleton) {
@@ -1015,6 +1005,7 @@ export class ShadowGenerator {
     isReady(subMesh, useInstances, isTransparent) {
         var _a;
         const material = subMesh.getMaterial(), shadowDepthWrapper = material === null || material === void 0 ? void 0 : material.shadowDepthWrapper;
+        this._opacityTexture = null;
         if (!material) {
             return false;
         }
@@ -1040,18 +1031,16 @@ export class ShadowGenerator {
                 }
             }
             // Alpha test
-            const needAlphaTesting = material === null || material === void 0 ? void 0 : material.needAlphaTesting();
-            const needAlphaBlending = material === null || material === void 0 ? void 0 : material.needAlphaBlending();
-            if (material && (needAlphaTesting || needAlphaBlending)) {
-                let alphaTexture = null;
+            const needAlphaTesting = material.needAlphaTesting();
+            if (needAlphaTesting || material.needAlphaBlending()) {
                 if (this.useOpacityTextureForTransparentShadow) {
-                    alphaTexture = material.opacityTexture;
+                    this._opacityTexture = material.opacityTexture;
                 }
                 else {
-                    alphaTexture = material.getAlphaTestTexture();
+                    this._opacityTexture = material.getAlphaTestTexture();
                 }
-                if (alphaTexture) {
-                    if (!alphaTexture.isReady()) {
+                if (this._opacityTexture) {
+                    if (!this._opacityTexture.isReady()) {
                         return false;
                     }
                     const alphaCutOff = (_a = material.alphaCutOff) !== null && _a !== void 0 ? _a : ShadowGenerator.DEFAULT_ALPHA_CUTOFF;
@@ -1064,7 +1053,7 @@ export class ShadowGenerator {
                         defines.push("#define UV1");
                     }
                     if (mesh.isVerticesDataPresent(VertexBuffer.UV2Kind)) {
-                        if (alphaTexture.coordinatesIndex === 1) {
+                        if (this._opacityTexture.coordinatesIndex === 1) {
                             attribs.push(VertexBuffer.UV2Kind);
                             defines.push("#define UV2");
                         }