Diffuse Roughness support

packages/dev/core/src/Engines/constants.ts

@@ -447,6 +447,21 @@ export class Constants {
      */
     public static readonly MATERIAL_CounterClockWiseSideOrientation = 1;
 
+    /**
+     * Energy-conserving Oren Nayar diffuse model type.
+     */
+    public static readonly MATERIAL_DIFFUSE_ROUGHNESS_E_OREN_NAYAR = 0;
+
+    /**
+     * Burley diffuse model type.
+     */
+    public static readonly MATERIAL_DIFFUSE_ROUGHNESS_BURLEY = 1;
+
+    /**
+     * Lambertian diffuse model type.
+     */
+    public static readonly MATERIAL_DIFFUSE_ROUGHNESS_LAMBERT = 2;
+
     /**
      * Nothing
      * @see https://doc.babylonjs.com/features/featuresDeepDive/events/actions#triggers

packages/dev/core/src/Materials/Node/Blocks/PBR/pbrMetallicRoughnessBlock.ts

@@ -96,6 +96,7 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
     private _metallicReflectanceColor: Color3 = Color3.White();
     private _metallicF0Factor = 1;
     private _vMetallicReflectanceFactorsName: string;
+    private _baseDiffuseRoughnessName: string;
 
     /**
      * Create a new ReflectionBlock
@@ -270,6 +271,19 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
     })
     public realTimeFilteringQuality = Constants.TEXTURE_FILTERING_QUALITY_LOW;
 
+    /**
+     * Base Diffuse Roughness Model
+     */
+    @editableInPropertyPage("Diffuse Roughness Model", PropertyTypeForEdition.List, "RENDERING", {
+        notifiers: { update: true },
+        options: [
+            { label: "Lambert", value: Constants.MATERIAL_DIFFUSE_ROUGHNESS_LAMBERT },
+            { label: "Burley", value: Constants.MATERIAL_DIFFUSE_ROUGHNESS_BURLEY },
+            { label: "Oren-Nayar", value: Constants.MATERIAL_DIFFUSE_ROUGHNESS_E_OREN_NAYAR },
+        ],
+    })
+    public baseDiffuseRoughnessModel = Constants.MATERIAL_DIFFUSE_ROUGHNESS_E_OREN_NAYAR;
+
     /**
      * Defines if the material uses energy conservation.
      */
@@ -761,6 +775,8 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
             defines.setValue("NUM_SAMPLES", "" + this.realTimeFilteringQuality, true);
         }
 
+        defines.setValue("BASE_DIFFUSE_ROUGHNESS_MODEL", this.baseDiffuseRoughnessModel, true);
+
         // Advanced
         defines.setValue("BRDF_V_HEIGHT_CORRELATED", true);
         defines.setValue("MS_BRDF_ENERGY_CONSERVATION", this.useEnergyConservation, true);
@@ -1013,13 +1029,21 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         this._vMetallicReflectanceFactorsName = state._getFreeVariableName("vMetallicReflectanceFactors");
         state._emitUniformFromString(this._vMetallicReflectanceFactorsName, NodeMaterialBlockConnectionPointTypes.Vector4);
 
+        this._baseDiffuseRoughnessName = state._getFreeVariableName("baseDiffuseRoughness");
+        state._emitUniformFromString(this._baseDiffuseRoughnessName, NodeMaterialBlockConnectionPointTypes.Float);
+
         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);
             reflectivityOut = reflectivityBlock(
                 vReflectivityColor
             #ifdef METALLICWORKFLOW
                 , surfaceAlbedo
                 , ${(isWebGPU ? "uniforms." : "") + this._vMetallicReflectanceFactorsName}
+            #endif
+                , ${(isWebGPU ? "uniforms." : "") + this._baseDiffuseRoughnessName}
+            #ifdef BASE_DIFFUSE_ROUGHNESS
+                , 0.
+                , vec2${state.fSuffix}(0., 0.)
             #endif
             #ifdef REFLECTIVITY
                 , vec3${state.fSuffix}(0., 0., ${aoIntensity})
@@ -1035,6 +1059,7 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
 
             ${state._declareLocalVar("microSurface", NodeMaterialBlockConnectionPointTypes.Float)} = reflectivityOut.microSurface;
             ${state._declareLocalVar("roughness", NodeMaterialBlockConnectionPointTypes.Float)} = reflectivityOut.roughness;
+            ${state._declareLocalVar("diffuseRoughness", NodeMaterialBlockConnectionPointTypes.Float)} = reflectivityOut.diffuseRoughness;
 
             #ifdef METALLICWORKFLOW
                 surfaceAlbedo = reflectivityOut.surfaceAlbedo;

packages/dev/core/src/Materials/Node/Blocks/PBR/reflectionBlock.ts

@@ -438,6 +438,9 @@ export class ReflectionBlock extends ReflectionTextureBaseBlock {
             #ifdef USEIRRADIANCEMAP
                 , irradianceSampler         // ** not handled **
                 ${isWebGPU ? `, irradianceSamplerSampler` : ""}
+                #ifdef USE_IRRADIANCE_DOMINANT_DIRECTION
+                , vReflectionDominantDirection
+                #endif
             #endif
             #ifndef LODBASEDMICROSFURACE
                 #ifdef ${this._define3DName}
@@ -459,6 +462,8 @@ export class ReflectionBlock extends ReflectionTextureBaseBlock {
                     ${isWebGPU ? `, icdfSamplerSampler` : ""}
                 #endif
             #endif
+            , viewDirectionW
+            , diffuseRoughness
             );
         #endif\n`;