@babylonjs/core 8.8.0 → 8.8.2

package/Materials/Node/Blocks/PBR/pbrMetallicRoughnessBlock.js

@@ -17,7 +17,7 @@ import { ClearCoatBlock } from "./clearCoatBlock.js";
 import { IridescenceBlock } from "./iridescenceBlock.js";
 import { SubSurfaceBlock } from "./subSurfaceBlock.js";
 
-import { Color3, TmpColors } from "../../../../Maths/math.color.js";
+import { Color3 } from "../../../../Maths/math.color.js";
 import { Logger } from "../../../../Misc/logger.js";
 import { BindLight, BindLights, PrepareDefinesForLight, PrepareDefinesForLights, PrepareDefinesForMultiview, PrepareUniformsAndSamplersForLight, } from "../../../materialHelper.functions.js";
 const MapOutputToVariable = {
@@ -238,6 +238,7 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         state._excludeVariableName("finalColor");
         state._excludeVariableName("vClipSpacePosition");
         state._excludeVariableName("vDebugMode");
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this._initShaderSourceAsync(state.shaderLanguage);
     }
     async _initShaderSourceAsync(shaderLanguage) {
@@ -600,16 +601,8 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         effect.setFloat(this._invertNormalName, invertNormal ? -1 : 1);
         effect.setFloat4("vLightingIntensity", this.directIntensity, 1, this.environmentIntensity * this._scene.environmentIntensity, this.specularIntensity);
         // reflectivity bindings
-        const outsideIOR = 1; // consider air as clear coat and other layers would remap in the shader.
-        const ior = this.indexOfRefraction.connectInputBlock?.value ?? 1.5;
-        // We are here deriving our default reflectance from a common value for none metallic surface.
-        // Based of the schlick fresnel approximation model
-        // for dielectrics.
-        const f0 = Math.pow((ior - outsideIOR) / (ior + outsideIOR), 2);
-        // Tweak the default F0 and F90 based on our given setup
-        this._metallicReflectanceColor.scaleToRef(f0 * this._metallicF0Factor, TmpColors.Color3[0]);
         const metallicF90 = this._metallicF0Factor;
-        effect.setColor4(this._vMetallicReflectanceFactorsName, TmpColors.Color3[0], metallicF90);
+        effect.setColor4(this._vMetallicReflectanceFactorsName, this._metallicReflectanceColor, metallicF90);
         if (nodeMaterial.imageProcessingConfiguration) {
             nodeMaterial.imageProcessingConfiguration.bind(effect);
         }
@@ -714,8 +707,13 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         state._emitUniformFromString(this._vMetallicReflectanceFactorsName, NodeMaterialBlockConnectionPointTypes.Vector4);
         this._baseDiffuseRoughnessName = state._getFreeVariableName("baseDiffuseRoughness");
         state._emitUniformFromString(this._baseDiffuseRoughnessName, NodeMaterialBlockConnectionPointTypes.Float);
+        const outsideIOR = 1; // consider air as clear coat and other layers would remap in the shader.
+        const ior = this.indexOfRefraction.connectInputBlock?.value ?? 1.5;
+        // Based of the schlick fresnel approximation model
+        // for dielectrics.
+        const f0 = Math.pow((ior - outsideIOR) / (ior + outsideIOR), 2);
         code += `${state._declareLocalVar("baseColor", NodeMaterialBlockConnectionPointTypes.Vector3)} = surfaceAlbedo;
-            ${isWebGPU ? "let" : `vec4${state.fSuffix}`} vReflectivityColor = vec4${state.fSuffix}(${this.metallic.associatedVariableName}, ${this.roughness.associatedVariableName}, ${this.indexOfRefraction.associatedVariableName || "1.5"}, 1.0);
+            ${isWebGPU ? "let" : `vec4${state.fSuffix}`} vReflectivityColor = vec4${state.fSuffix}(${this.metallic.associatedVariableName}, ${this.roughness.associatedVariableName}, ${this.indexOfRefraction.associatedVariableName || "1.5"}, ${f0});
             reflectivityOut = reflectivityBlock(
                 vReflectivityColor
             #ifdef METALLICWORKFLOW