@babylonjs/core 6.40.0 → 6.41.1

package/Materials/PBR/pbrBaseMaterial.js

@@ -733,10 +733,9 @@ export class PBRBaseMaterial extends PushMaterial {
      * Returns true if alpha blending should be disabled.
      */
     get _disableAlphaBlending() {
-        var _a;
         return (this._transparencyMode === PBRBaseMaterial.PBRMATERIAL_OPAQUE ||
             this._transparencyMode === PBRBaseMaterial.PBRMATERIAL_ALPHATEST ||
-            ((_a = this.subSurface) === null || _a === void 0 ? void 0 : _a.disableAlphaBlending));
+            this.subSurface?.disableAlphaBlending);
     }
     /**
      * @returns whether or not this material should be rendered in alpha blend mode.
@@ -751,11 +750,10 @@ export class PBRBaseMaterial extends PushMaterial {
      * @returns whether or not this material should be rendered in alpha test mode.
      */
     needAlphaTesting() {
-        var _a;
         if (this._forceAlphaTest) {
             return true;
         }
-        if ((_a = this.subSurface) === null || _a === void 0 ? void 0 : _a.disableAlphaBlending) {
+        if (this.subSurface?.disableAlphaBlending) {
             return false;
         }
         return this._hasAlphaChannel() && (this._transparencyMode == null || this._transparencyMode === PBRBaseMaterial.PBRMATERIAL_ALPHATEST);
@@ -786,12 +784,12 @@ export class PBRBaseMaterial extends PushMaterial {
      * @returns - boolean indicating that the submesh is ready or not.
      */
     isReadyForSubMesh(mesh, subMesh, useInstances) {
-        var _a;
         if (!this._uniformBufferLayoutBuilt) {
             this.buildUniformLayout();
         }
-        if (subMesh.effect && this.isFrozen) {
-            if (subMesh.effect._wasPreviouslyReady && subMesh.effect._wasPreviouslyUsingInstances === useInstances) {
+        const drawWrapper = subMesh._drawWrapper;
+        if (drawWrapper.effect && this.isFrozen) {
+            if (drawWrapper._wasPreviouslyReady && drawWrapper._wasPreviouslyUsingInstances === useInstances) {
                 return true;
             }
         }
@@ -837,7 +835,7 @@ export class PBRBaseMaterial extends PushMaterial {
                     }
                     else {
                         // Not ready until spherical are ready too.
-                        if (!reflectionTexture.sphericalPolynomial && ((_a = reflectionTexture.getInternalTexture()) === null || _a === void 0 ? void 0 : _a._sphericalPolynomialPromise)) {
+                        if (!reflectionTexture.sphericalPolynomial && reflectionTexture.getInternalTexture()?._sphericalPolynomialPromise) {
                             return false;
                         }
                     }
@@ -939,8 +937,8 @@ export class PBRBaseMaterial extends PushMaterial {
             return false;
         }
         defines._renderId = scene.getRenderId();
-        subMesh.effect._wasPreviouslyReady = forceWasNotReadyPreviously ? false : true;
-        subMesh.effect._wasPreviouslyUsingInstances = !!useInstances;
+        drawWrapper._wasPreviouslyReady = forceWasNotReadyPreviously ? false : true;
+        drawWrapper._wasPreviouslyUsingInstances = !!useInstances;
         this._checkScenePerformancePriority();
         return true;
     }
@@ -1191,7 +1189,6 @@ export class PBRBaseMaterial extends PushMaterial {
         return effect;
     }
     _prepareDefines(mesh, defines, useInstances = null, useClipPlane = null, useThinInstances = false) {
-        var _a;
         const scene = this.getScene();
         const engine = scene.getEngine();
         // Lights
@@ -1384,7 +1381,7 @@ export class PBRBaseMaterial extends PushMaterial {
                     }
                     if (this._metallicReflectanceTexture || this._reflectanceTexture) {
                         const identicalTextures = this._metallicReflectanceTexture !== null &&
-                            this._metallicReflectanceTexture._texture === ((_a = this._reflectanceTexture) === null || _a === void 0 ? void 0 : _a._texture) &&
+                            this._metallicReflectanceTexture._texture === this._reflectanceTexture?._texture &&
                             this._metallicReflectanceTexture.checkTransformsAreIdentical(this._reflectanceTexture);
                         defines.METALLIC_REFLECTANCE_USE_ALPHA_ONLY = this._useOnlyMetallicFromMetallicReflectanceTexture && !identicalTextures;
                         if (this._metallicReflectanceTexture) {
@@ -1512,7 +1509,11 @@ export class PBRBaseMaterial extends PushMaterial {
      * @param options - Define the options used to create the compilation
      */
     forceCompilation(mesh, onCompiled, options) {
-        const localOptions = Object.assign({ clipPlane: false, useInstances: false }, options);
+        const localOptions = {
+            clipPlane: false,
+            useInstances: false,
+            ...options,
+        };
         if (!this._uniformBufferLayoutBuilt) {
             this.buildUniformLayout();
         }
@@ -1606,7 +1607,6 @@ export class PBRBaseMaterial extends PushMaterial {
      * @param subMesh - A submesh of the BJS mesh.
      */
     bindForSubMesh(world, mesh, subMesh) {
-        var _a, _b, _c, _d;
         const scene = this.getScene();
         const defines = subMesh.materialDefines;
         if (!defines) {
@@ -1631,7 +1631,7 @@ export class PBRBaseMaterial extends PushMaterial {
             world.toNormalMatrix(this._normalMatrix);
             this.bindOnlyNormalMatrix(this._normalMatrix);
         }
-        const mustRebind = effect._forceRebindOnNextCall || this._mustRebind(scene, effect, mesh.visibility);
+        const mustRebind = this._mustRebind(scene, effect, subMesh, mesh.visibility);
         // Bones
         MaterialHelper.BindBonesParameters(mesh, this._activeEffect, this.prePassConfiguration);
         let reflectionTexture = null;
@@ -1639,7 +1639,7 @@ export class PBRBaseMaterial extends PushMaterial {
         if (mustRebind) {
             this.bindViewProjection(effect);
             reflectionTexture = this._getReflectionTexture();
-            if (!ubo.useUbo || !this.isFrozen || !ubo.isSync || effect._forceRebindOnNextCall) {
+            if (!ubo.useUbo || !this.isFrozen || !ubo.isSync || subMesh._drawWrapper._forceRebindOnNextCall) {
                 // Texture uniforms
                 if (scene.texturesEnabled) {
                     if (this._albedoTexture && MaterialFlags.DiffuseTextureEnabled) {
@@ -1746,7 +1746,7 @@ export class PBRBaseMaterial extends PushMaterial {
                     TmpColors.Color3[0].r = this._metallic === undefined || this._metallic === null ? 1 : this._metallic;
                     TmpColors.Color3[0].g = this._roughness === undefined || this._roughness === null ? 1 : this._roughness;
                     ubo.updateColor4("vReflectivityColor", TmpColors.Color3[0], 1);
-                    const ior = (_b = (_a = this.subSurface) === null || _a === void 0 ? void 0 : _a._indexOfRefraction) !== null && _b !== void 0 ? _b : 1.5;
+                    const ior = this.subSurface?._indexOfRefraction ?? 1.5;
                     const outsideIOR = 1; // consider air as clear coat and other layers would remap in the shader.
                     // We are here deriving our default reflectance from a common value for none metallic surface.
                     // Based of the schlick fresnel approximation model
@@ -1762,7 +1762,7 @@ export class PBRBaseMaterial extends PushMaterial {
                 }
                 ubo.updateColor3("vEmissiveColor", MaterialFlags.EmissiveTextureEnabled ? this._emissiveColor : Color3.BlackReadOnly);
                 ubo.updateColor3("vReflectionColor", this._reflectionColor);
-                if (!defines.SS_REFRACTION && ((_c = this.subSurface) === null || _c === void 0 ? void 0 : _c._linkRefractionWithTransparency)) {
+                if (!defines.SS_REFRACTION && this.subSurface?._linkRefractionWithTransparency) {
                     ubo.updateColor4("vAlbedoColor", this._albedoColor, 1);
                 }
                 else {
@@ -1866,14 +1866,14 @@ export class PBRBaseMaterial extends PushMaterial {
                 MaterialHelper.BindMorphTargetParameters(mesh, this._activeEffect);
             }
             if (defines.BAKED_VERTEX_ANIMATION_TEXTURE) {
-                (_d = mesh.bakedVertexAnimationManager) === null || _d === void 0 ? void 0 : _d.bind(effect, defines.INSTANCES);
+                mesh.bakedVertexAnimationManager?.bind(effect, defines.INSTANCES);
             }
             // image processing
             this._imageProcessingConfiguration.bind(this._activeEffect);
             // Log. depth
             MaterialHelper.BindLogDepth(defines, this._activeEffect, scene);
         }
-        this._afterBind(mesh, this._activeEffect);
+        this._afterBind(mesh, this._activeEffect, subMesh);
         ubo.update();
     }
     /**
@@ -2029,8 +2029,7 @@ export class PBRBaseMaterial extends PushMaterial {
      * @returns - If prepass is enabled or not.
      */
     setPrePassRenderer() {
-        var _a;
-        if (!((_a = this.subSurface) === null || _a === void 0 ? void 0 : _a.isScatteringEnabled)) {
+        if (!this.subSurface?.isScatteringEnabled) {
             return false;
         }
         const subSurfaceConfiguration = this.getScene().enableSubSurfaceForPrePass();
@@ -2045,23 +2044,22 @@ export class PBRBaseMaterial extends PushMaterial {
      * @param forceDisposeTextures - Forces the disposal of all textures.
      */
     dispose(forceDisposeEffect, forceDisposeTextures) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (forceDisposeTextures) {
             if (this._environmentBRDFTexture && this.getScene().environmentBRDFTexture !== this._environmentBRDFTexture) {
                 this._environmentBRDFTexture.dispose();
             }
-            (_a = this._albedoTexture) === null || _a === void 0 ? void 0 : _a.dispose();
-            (_b = this._ambientTexture) === null || _b === void 0 ? void 0 : _b.dispose();
-            (_c = this._opacityTexture) === null || _c === void 0 ? void 0 : _c.dispose();
-            (_d = this._reflectionTexture) === null || _d === void 0 ? void 0 : _d.dispose();
-            (_e = this._emissiveTexture) === null || _e === void 0 ? void 0 : _e.dispose();
-            (_f = this._metallicTexture) === null || _f === void 0 ? void 0 : _f.dispose();
-            (_g = this._reflectivityTexture) === null || _g === void 0 ? void 0 : _g.dispose();
-            (_h = this._bumpTexture) === null || _h === void 0 ? void 0 : _h.dispose();
-            (_j = this._lightmapTexture) === null || _j === void 0 ? void 0 : _j.dispose();
-            (_k = this._metallicReflectanceTexture) === null || _k === void 0 ? void 0 : _k.dispose();
-            (_l = this._reflectanceTexture) === null || _l === void 0 ? void 0 : _l.dispose();
-            (_m = this._microSurfaceTexture) === null || _m === void 0 ? void 0 : _m.dispose();
+            this._albedoTexture?.dispose();
+            this._ambientTexture?.dispose();
+            this._opacityTexture?.dispose();
+            this._reflectionTexture?.dispose();
+            this._emissiveTexture?.dispose();
+            this._metallicTexture?.dispose();
+            this._reflectivityTexture?.dispose();
+            this._bumpTexture?.dispose();
+            this._lightmapTexture?.dispose();
+            this._metallicReflectanceTexture?.dispose();
+            this._reflectanceTexture?.dispose();
+            this._microSurfaceTexture?.dispose();
         }
         this._renderTargets.dispose();
         if (this._imageProcessingConfiguration && this._imageProcessingObserver) {