@babylonjs/core 7.44.1 → 7.46.0

package/Materials/PBR/pbrBaseMaterial.js

@@ -60,6 +60,8 @@ export class PBRMaterialDefines extends MaterialDefines {
         this.GAMMAALBEDO = false;
         this.ALBEDODIRECTUV = 0;
         this.VERTEXCOLOR = false;
+        this.BASEWEIGHT = false;
+        this.BASEWEIGHTDIRECTUV = 0;
         this.BAKED_VERTEX_ANIMATION_TEXTURE = false;
         this.AMBIENT = false;
         this.AMBIENTDIRECTUV = 0;
@@ -224,6 +226,7 @@ export class PBRMaterialDefines extends MaterialDefines {
         this.LOGARITHMICDEPTH = false;
         this.CAMERA_ORTHOGRAPHIC = false;
         this.CAMERA_PERSPECTIVE = false;
+        this.AREALIGHTSUPPORTED = true;
         this.FORCENORMALFORWARD = false;
         this.SPECULARAA = false;
         this.UNLIT = false;
@@ -350,6 +353,11 @@ export class PBRBaseMaterial extends PushMaterial {
          * @internal
          */
         this._albedoTexture = null;
+        /**
+         * OpenPBR Base Weight (multiplier to the diffuse and metal lobes).
+         * @internal
+         */
+        this._baseWeightTexture = null;
         /**
          * AKA Occlusion Texture in other nomenclature.
          * @internal
@@ -472,6 +480,11 @@ export class PBRBaseMaterial extends PushMaterial {
          * @internal
          */
         this._albedoColor = new Color3(1, 1, 1);
+        /**
+         * OpenPBR Base Weight (multiplier to the diffuse and metal lobes).
+         * @internal
+         */
+        this._baseWeight = 1;
         /**
          * AKA Specular Color in other nomenclature.
          * @internal
@@ -834,6 +847,11 @@ export class PBRBaseMaterial extends PushMaterial {
                         return false;
                     }
                 }
+                if (this._baseWeightTexture && MaterialFlags.BaseWeightTextureEnabled) {
+                    if (!this._baseWeightTexture.isReadyOrNotBlocking()) {
+                        return false;
+                    }
+                }
                 if (this._ambientTexture && MaterialFlags.AmbientTextureEnabled) {
                     if (!this._ambientTexture.isReadyOrNotBlocking()) {
                         return false;
@@ -924,6 +942,14 @@ export class PBRBaseMaterial extends PushMaterial {
                 return false;
             }
         }
+        // Check if Area Lights have LTC texture.
+        if (defines["AREALIGHTUSED"]) {
+            for (let index = 0; index < mesh.lightSources.length; index++) {
+                if (!mesh.lightSources[index]._isReady()) {
+                    return false;
+                }
+            }
+        }
         if (!engine.getCaps().standardDerivatives && !mesh.isVerticesDataPresent(VertexBuffer.NormalKind)) {
             mesh.createNormals(true);
             Logger.Warn("PBRMaterial: Normals have been created for the mesh: " + mesh.name);
@@ -1077,6 +1103,7 @@ export class PBRBaseMaterial extends PushMaterial {
             "vLightsType",
             "vAmbientColor",
             "vAlbedoColor",
+            "baseWeight",
             "vReflectivityColor",
             "vMetallicReflectanceFactors",
             "vEmissiveColor",
@@ -1086,6 +1113,7 @@ export class PBRBaseMaterial extends PushMaterial {
             "vFogColor",
             "pointSize",
             "vAlbedoInfos",
+            "vBaseWeightInfos",
             "vAmbientInfos",
             "vOpacityInfos",
             "vReflectionInfos",
@@ -1101,6 +1129,7 @@ export class PBRBaseMaterial extends PushMaterial {
             "vLightmapInfos",
             "mBones",
             "albedoMatrix",
+            "baseWeightMatrix",
             "ambientMatrix",
             "opacityMatrix",
             "reflectionMatrix",
@@ -1141,6 +1170,7 @@ export class PBRBaseMaterial extends PushMaterial {
         ];
         const samplers = [
             "albedoSampler",
+            "baseWeightSampler",
             "reflectivitySampler",
             "ambientSampler",
             "emissiveSampler",
@@ -1160,6 +1190,8 @@ export class PBRBaseMaterial extends PushMaterial {
             "oitDepthSampler",
             "oitFrontColorSampler",
             "icdfSampler",
+            "areaLightsLTC1Sampler",
+            "areaLightsLTC2Sampler",
         ];
         const uniformBuffers = ["Material", "Scene", "Mesh"];
         const indexParameters = { maxSimultaneousLights: this._maxSimultaneousLights, maxSimultaneousMorphTargets: defines.NUM_MORPH_INFLUENCERS };
@@ -1246,6 +1278,7 @@ export class PBRBaseMaterial extends PushMaterial {
             }
             if (scene.texturesEnabled) {
                 defines.ALBEDODIRECTUV = 0;
+                defines.BASEWEIGHTDIRECTUV = 0;
                 defines.AMBIENTDIRECTUV = 0;
                 defines.OPACITYDIRECTUV = 0;
                 defines.EMISSIVEDIRECTUV = 0;
@@ -1265,6 +1298,12 @@ export class PBRBaseMaterial extends PushMaterial {
                 else {
                     defines.ALBEDO = false;
                 }
+                if (this._baseWeightTexture && MaterialFlags.BaseWeightTextureEnabled) {
+                    PrepareDefinesForMergedUV(this._baseWeightTexture, defines, "BASEWEIGHT");
+                }
+                else {
+                    defines.BASEWEIGHT = false;
+                }
                 if (this._ambientTexture && MaterialFlags.AmbientTextureEnabled) {
                     PrepareDefinesForMergedUV(this._ambientTexture, defines, "AMBIENT");
                     defines.AMBIENTINGRAYSCALE = this._useAmbientInGrayScale;
@@ -1587,6 +1626,7 @@ export class PBRBaseMaterial extends PushMaterial {
         // Order is important !
         const ubo = this._uniformBuffer;
         ubo.addUniform("vAlbedoInfos", 2);
+        ubo.addUniform("vBaseWeightInfos", 2);
         ubo.addUniform("vAmbientInfos", 4);
         ubo.addUniform("vOpacityInfos", 2);
         ubo.addUniform("vEmissiveInfos", 2);
@@ -1599,6 +1639,7 @@ export class PBRBaseMaterial extends PushMaterial {
         ubo.addUniform("vReflectionSize", 3);
         ubo.addUniform("vBumpInfos", 3);
         ubo.addUniform("albedoMatrix", 16);
+        ubo.addUniform("baseWeightMatrix", 16);
         ubo.addUniform("ambientMatrix", 16);
         ubo.addUniform("opacityMatrix", 16);
         ubo.addUniform("emissiveMatrix", 16);
@@ -1610,6 +1651,7 @@ export class PBRBaseMaterial extends PushMaterial {
         ubo.addUniform("reflectionMatrix", 16);
         ubo.addUniform("vReflectionColor", 3);
         ubo.addUniform("vAlbedoColor", 4);
+        ubo.addUniform("baseWeight", 1);
         ubo.addUniform("vLightingIntensity", 4);
         ubo.addUniform("vReflectionMicrosurfaceInfos", 3);
         ubo.addUniform("pointSize", 1);
@@ -1689,6 +1731,10 @@ export class PBRBaseMaterial extends PushMaterial {
                         ubo.updateFloat2("vAlbedoInfos", this._albedoTexture.coordinatesIndex, this._albedoTexture.level);
                         BindTextureMatrix(this._albedoTexture, ubo, "albedo");
                     }
+                    if (this._baseWeightTexture && MaterialFlags.BaseWeightTextureEnabled) {
+                        ubo.updateFloat2("vBaseWeightInfos", this._baseWeightTexture.coordinatesIndex, this._baseWeightTexture.level);
+                        BindTextureMatrix(this._baseWeightTexture, ubo, "baseWeight");
+                    }
                     if (this._ambientTexture && MaterialFlags.AmbientTextureEnabled) {
                         ubo.updateFloat4("vAmbientInfos", this._ambientTexture.coordinatesIndex, this._ambientTexture.level, this._ambientTextureStrength, this._ambientTextureImpactOnAnalyticalLights);
                         BindTextureMatrix(this._ambientTexture, ubo, "ambient");
@@ -1811,6 +1857,7 @@ export class PBRBaseMaterial extends PushMaterial {
                 else {
                     ubo.updateColor4("vAlbedoColor", this._albedoColor, this.alpha);
                 }
+                ubo.updateFloat("baseWeight", this._baseWeight);
                 // Misc
                 this._lightingInfos.x = this._directIntensity;
                 this._lightingInfos.y = this._emissiveIntensity;
@@ -1827,6 +1874,9 @@ export class PBRBaseMaterial extends PushMaterial {
                 if (this._albedoTexture && MaterialFlags.DiffuseTextureEnabled) {
                     ubo.setTexture("albedoSampler", this._albedoTexture);
                 }
+                if (this._baseWeightTexture && MaterialFlags.BaseWeightTextureEnabled) {
+                    ubo.setTexture("baseWeightSampler", this._baseWeightTexture);
+                }
                 if (this._ambientTexture && MaterialFlags.AmbientTextureEnabled) {
                     ubo.setTexture("ambientSampler", this._ambientTexture);
                 }
@@ -1934,6 +1984,9 @@ export class PBRBaseMaterial extends PushMaterial {
         if (this._albedoTexture && this._albedoTexture.animations && this._albedoTexture.animations.length > 0) {
             results.push(this._albedoTexture);
         }
+        if (this._baseWeightTexture && this._baseWeightTexture.animations && this._baseWeightTexture.animations.length > 0) {
+            results.push(this._baseWeightTexture);
+        }
         if (this._ambientTexture && this._ambientTexture.animations && this._ambientTexture.animations.length > 0) {
             results.push(this._ambientTexture);
         }
@@ -1988,6 +2041,9 @@ export class PBRBaseMaterial extends PushMaterial {
         if (this._albedoTexture) {
             activeTextures.push(this._albedoTexture);
         }
+        if (this._baseWeightTexture) {
+            activeTextures.push(this._baseWeightTexture);
+        }
         if (this._ambientTexture) {
             activeTextures.push(this._ambientTexture);
         }
@@ -2035,6 +2091,9 @@ export class PBRBaseMaterial extends PushMaterial {
         if (this._albedoTexture === texture) {
             return true;
         }
+        if (this._baseWeightTexture === texture) {
+            return true;
+        }
         if (this._ambientTexture === texture) {
             return true;
         }
@@ -2098,6 +2157,7 @@ export class PBRBaseMaterial extends PushMaterial {
                 this._environmentBRDFTexture.dispose();
             }
             this._albedoTexture?.dispose();
+            this._baseWeightTexture?.dispose();
             this._ambientTexture?.dispose();
             this._opacityTexture?.dispose();
             this._reflectionTexture?.dispose();