@zephyr3d/scene 0.9.3 → 0.9.5

package/dist/material/mixins/pbr/common.js

@@ -1,6 +1,7 @@
 import { applyMaterialMixins } from '../../meshmaterial.js';
 import { Vector4, Vector3 } from '@zephyr3d/base';
 import { getGGXLUT } from '../../../utility/textures/ggxlut.js';
+import { getSheenLUT } from '../../../utility/textures/sheenlut.js';
 import { mixinTextureProps } from '../texture.js';
 import { ShaderHelper } from '../../shader/helper.js';
 import { MaterialVaryingFlags, RENDER_PASS_TYPE_LIGHT } from '../../../values.js';
@@ -266,6 +267,7 @@ import { mixinPBRBRDF } from './brdf.js';
                 }
                 if (this.sheen) {
                     scope.zSheenFactor = pb.vec4().uniform(2);
+                    scope.zSheenLut = pb.tex2D().uniform(2);
                 }
                 if (this.clearcoat) {
                     scope.zClearcoatFactor = pb.vec4().uniform(2);
@@ -300,6 +302,7 @@ import { mixinPBRBRDF } from './brdf.js';
                 }
                 if (this.sheen) {
                     bindGroup.setValue('zSheenFactor', this._sheenFactor);
+                    bindGroup.setTexture('zSheenLut', getSheenLUT(64));
                 }
                 if (this.clearcoat) {
                     bindGroup.setValue('zClearcoatFactor', this._clearcoatFactor);
@@ -331,7 +334,6 @@ import { mixinPBRBRDF } from './brdf.js';
                 pb.float('roughness'),
                 pb.float('specularWeight'),
                 ...this.sheen ? [
-                    pb.float('sheenAlbedoScaling'),
                     pb.vec3('sheenColor'),
                     pb.float('sheenRoughness')
                 ] : [],
@@ -383,8 +385,6 @@ import { mixinPBRBRDF } from './brdf.js';
                 } else {
                     data.sheenRoughness = scope.zSheenFactor.a;
                 }
-                scope.$l.sheenDFG = 0.157;
-                data.sheenAlbedoScaling = pb.sub(1, pb.mul(pb.max(pb.max(data.sheenColor.r, data.sheenColor.g), data.sheenColor.b), scope.sheenDFG));
             }
             if (this.clearcoat) {
                 if (this.clearcoatNormalTexture) {
@@ -444,6 +444,18 @@ import { mixinPBRBRDF } from './brdf.js';
                 return pb.mul(this.getEmissiveColor(scope), this.getEmissiveStrength(scope));
             }
         }
+        getSheenAlbedoScaling(scope, Ndot, sheenColor, sheenRoughness) {
+            const pb = scope.$builder;
+            const sheenE = pb.textureSampleLevel(scope.zSheenLut, pb.clamp(pb.vec2(Ndot, sheenRoughness), pb.vec2(0), pb.vec2(1)), 0).r;
+            const maxSheenColor = pb.max(pb.max(sheenColor.r, sheenColor.g), sheenColor.b);
+            return pb.sub(1, pb.mul(maxSheenColor, sheenE));
+        }
+        getSheenAlbedoScalingForDirect(scope, NoV, NoL, sheenColor, sheenRoughness) {
+            const pb = scope.$builder;
+            const eV = this.getSheenAlbedoScaling(scope, NoV, sheenColor, sheenRoughness);
+            const eL = this.getSheenAlbedoScaling(scope, NoL, sheenColor, sheenRoughness);
+            return pb.min(eV, eL);
+        }
         D_Charlie(scope, NdotH, sheenRoughness) {
             const funcNameDCharlie = 'Z_DCharlie';
             const pb = scope.$builder;
@@ -451,7 +463,7 @@ import { mixinPBRBRDF } from './brdf.js';
                 pb.float('NdotH'),
                 pb.float('sheenRoughness')
             ], function() {
-                this.$l.alphaG = pb.mul(this.sheenRoughness, this.sheenRoughness);
+                this.$l.alphaG = pb.mul(pb.max(this.sheenRoughness, 0.000001), pb.max(this.sheenRoughness, 0.000001));
                 this.$l.invR = pb.div(1, this.alphaG);
                 this.$l.cos2h = pb.mul(this.NdotH, this.NdotH);
                 this.$l.sin2h = pb.max(pb.sub(1, this.cos2h), 0.0078125);
@@ -459,6 +471,40 @@ import { mixinPBRBRDF } from './brdf.js';
             });
             return scope.$g[funcNameDCharlie](NdotH, sheenRoughness);
         }
+        V_Sheen(scope, NdotL, NdotV, sheenRoughness) {
+            const funcNameVSheen = 'Z_VSheen';
+            const pb = scope.$builder;
+            pb.func('Z_lambdaSheenNumericHelper', [
+                pb.float('x'),
+                pb.float('alphaG')
+            ], function() {
+                this.$l.oneMinusAlphaSq = pb.mul(pb.sub(1, this.alphaG), pb.sub(1, this.alphaG));
+                this.$l.a = pb.mix(21.5473, 25.3245, this.oneMinusAlphaSq);
+                this.$l.b = pb.mix(3.82987, 3.32435, this.oneMinusAlphaSq);
+                this.$l.c = pb.mix(0.19823, 0.16801, this.oneMinusAlphaSq);
+                this.$l.d = pb.mix(-1.9776, -1.27393, this.oneMinusAlphaSq);
+                this.$l.e = pb.mix(-4.32054, -4.85967, this.oneMinusAlphaSq);
+                this.$return(pb.add(pb.div(this.a, pb.add(1, pb.mul(this.b, pb.pow(this.x, this.c)))), pb.mul(this.d, this.x), this.e));
+            });
+            pb.func('Z_lambdaSheen', [
+                pb.float('cosTheta'),
+                pb.float('alphaG')
+            ], function() {
+                this.$if(pb.lessThan(pb.abs(this.cosTheta), 0.5), function() {
+                    this.$return(pb.exp(this.Z_lambdaSheenNumericHelper(pb.abs(this.cosTheta), this.alphaG)));
+                });
+                this.$return(pb.exp(pb.sub(pb.mul(2, this.Z_lambdaSheenNumericHelper(0.5, this.alphaG)), this.Z_lambdaSheenNumericHelper(pb.sub(1, pb.abs(this.cosTheta)), this.alphaG))));
+            });
+            pb.func(funcNameVSheen, [
+                pb.float('NdotL'),
+                pb.float('NdotV'),
+                pb.float('sheenRoughness')
+            ], function() {
+                this.$l.alphaG = pb.mul(pb.max(this.sheenRoughness, 0.000001), pb.max(this.sheenRoughness, 0.000001));
+                this.$return(pb.clamp(pb.div(1, pb.mul(pb.add(1, this.Z_lambdaSheen(this.NdotV, this.alphaG), this.Z_lambdaSheen(this.NdotL, this.alphaG)), 4, this.NdotV, this.NdotL)), 0, 1));
+            });
+            return scope.$g[funcNameVSheen](NdotL, NdotV, sheenRoughness);
+        }
         V_Ashikhmin(scope, NdotL, NdotV) {
             const funcNameVAshikhmin = 'Z_VAshikhmin';
             const pb = scope.$builder;
@@ -598,13 +644,16 @@ import { mixinPBRBRDF } from './brdf.js';
                     } else {
                         this.$l.F = this.schlickFresnel;
                     }
+                    if (that.sheen) {
+                        this.$l.sheenAlbedoScaling = that.getSheenAlbedoScalingForDirect(this, this.NoV, this.NoL, this.data.sheenColor, this.data.sheenRoughness);
+                    }
                     this.$l.specularRoughness = pb.clamp(pb.add(this.data.roughness, this.sourceRadiusFactor), 0, 1);
                     this.$l.alphaRoughness = pb.mul(this.specularRoughness, this.specularRoughness);
                     this.$l.D = that.distributionGGX(this, this.NoH, this.alphaRoughness);
                     this.$l.V = that.visGGX(this, this.NoV, this.NoL, this.alphaRoughness);
                     this.$l.specular = pb.mul(this.lightColor, this.D, this.V, this.F, this.specularScale);
                     if (that.sheen) {
-                        this.specular = pb.mul(this.specular, this.data.sheenAlbedoScaling);
+                        this.specular = pb.mul(this.specular, this.sheenAlbedoScaling);
                     }
                     this.outColor = pb.add(this.outColor, this.specular);
                     if (that.iridescence) {
@@ -621,12 +670,12 @@ import { mixinPBRBRDF } from './brdf.js';
                         this.diffuse = pb.mix(this.diffuse, this.transmittedLight, this.data.transmissionFactor);
                     }
                     if (that.sheen) {
-                        this.diffuse = pb.mul(this.diffuse, this.data.sheenAlbedoScaling);
+                        this.diffuse = pb.mul(this.diffuse, this.sheenAlbedoScaling);
                     }
                     this.outColor = pb.add(this.outColor, this.diffuse);
                     if (that.sheen) {
                         this.$l.sheenD = that.D_Charlie(this, this.NoH, this.data.sheenRoughness);
-                        this.$l.sheenV = that.V_Ashikhmin(this, this.NoL, this.NoV);
+                        this.$l.sheenV = that.V_Sheen(this, this.NoL, this.NoV, this.data.sheenRoughness);
                         this.outColor = pb.add(this.outColor, pb.mul(this.lightColor, this.data.sheenColor, this.sheenD, this.sheenV));
                     }
                     if (that.clearcoat) {
@@ -858,6 +907,10 @@ import { mixinPBRBRDF } from './brdf.js';
                     this.$l.occlusion = envLightStrength;
                 }
                 this.$l.NoV = pb.clamp(pb.dot(this.normal, this.viewVec), 0.0001, 1);
+                if (that.sheen) {
+                    this.$l.sheenLutSample = pb.clamp(pb.textureSampleLevel(this.zSheenLut, pb.clamp(pb.vec2(this.NoV, this.data.sheenRoughness), pb.vec2(0), pb.vec2(1)), 0), pb.vec4(0), pb.vec4(1));
+                    this.$l.sheenAlbedoScaling = pb.sub(1, pb.mul(pb.max(pb.max(this.data.sheenColor.r, this.data.sheenColor.g), this.data.sheenColor.b), this.sheenLutSample.r));
+                }
                 this.$l.ggxLutSample = pb.clamp(pb.textureSampleLevel(this.zGGXLut, pb.clamp(pb.vec2(this.NoV, this.data.roughness), pb.vec2(0), pb.vec2(1)), 0), pb.vec4(0), pb.vec4(1));
                 this.$l.f_ab = this.ggxLutSample.rg;
                 this.$l.F0 = pb.mul(this.data.f0.rgb, this.specWeight);
@@ -869,9 +922,9 @@ import { mixinPBRBRDF } from './brdf.js';
                 }
                 if (outRoughness || ctx.env.light.envLight.hasRadiance()) {
                     this.$l.FssEss = pb.add(pb.mul(this.k_S, this.f_ab.x), pb.vec3(this.f_ab.y));
-                    this.$l.specularFactor = pb.mul(this.FssEss, this.occlusion);
+                    this.$l.specularFactor = pb.mul(this.FssEss, this.data.specularWeight, this.occlusion);
                     if (that.sheen) {
-                        this.specularFactor = pb.mul(this.specularFactor, this.data.sheenAlbedoScaling);
+                        this.specularFactor = pb.mul(this.specularFactor, this.sheenAlbedoScaling);
                     }
                     if (outRoughness) {
                         this.outRoughness = pb.vec4(this.specularFactor /*this.data.f0.rgb*/ , this.data.roughness);
@@ -895,9 +948,9 @@ import { mixinPBRBRDF } from './brdf.js';
                     this.$l.F_avg = pb.add(this.mixedF0, pb.div(pb.sub(pb.vec3(1), this.mixedF0), 21));
                     this.$l.FmsEms = pb.div(pb.mul(this.FssEss, this.F_avg, this.Ems), pb.sub(pb.vec3(1), pb.mul(this.F_avg, this.Ems)));
                     this.$l.k_D = pb.mul(this.data.diffuse.rgb, pb.add(pb.sub(pb.vec3(1), this.FssEss), this.FmsEms));
-                    this.$l.iblDiffuse = pb.mul(pb.add(this.FmsEms, this.k_D), pb.div(this.irradiance, Math.PI), this.occlusion);
+                    this.$l.iblDiffuse = pb.mul(pb.add(this.FmsEms, this.k_D), this.irradiance, this.occlusion);
                     if (that.sheen) {
-                        this.iblDiffuse = pb.mul(this.iblDiffuse, this.data.sheenAlbedoScaling);
+                        this.iblDiffuse = pb.mul(this.iblDiffuse, this.sheenAlbedoScaling);
                     }
                     if (that.transmission && that.drawContext.renderPass.type === RENDER_PASS_TYPE_LIGHT) {
                         this.$l.iblTransmission = that.getIBLVolumnRefraction(this, this.ggxLutSample.rg, this.normal, this.viewVec, this.data.roughness, this.data.diffuse.rgb, this.data.f0.rgb, this.data.f90, this.$inputs.worldPos, this.data.f0.a, this.data.thicknessFactor, this.data.attenuationColor, this.data.attenuationDistance);
@@ -905,10 +958,14 @@ import { mixinPBRBRDF } from './brdf.js';
                     }
                     this.outColor = pb.add(this.outColor, this.iblDiffuse);
                 }
-                if (that.sheen && ctx.env.light.envLight.hasIrradiance()) {
-                    this.$l.refl = pb.reflect(pb.neg(this.viewVec), this.normal);
-                    this.$l.sheenBRDF = pb.clamp(pb.textureSampleLevel(this.zGGXLut, pb.clamp(pb.vec2(this.NoV, this.data.sheenRoughness), pb.vec2(0), pb.vec2(1)), 0), pb.vec4(0), pb.vec4(1)).b;
-                    this.outColor = pb.add(this.outColor, pb.mul(this.data.sheenColor, this.irradiance.rgb, this.sheenBRDF));
+                if (that.sheen && (ctx.env.light.envLight.hasSheenRadiance() || ctx.env.light.envLight.hasIrradiance())) {
+                    this.$l.sheenBRDF = this.sheenLutSample.b;
+                    if (ctx.env.light.envLight.hasSheenRadiance()) {
+                        this.$l.sheenRadiance = ctx.env.light.envLight.getSheenRadiance(this, pb.reflect(pb.neg(this.viewVec), this.normal), this.data.sheenRoughness);
+                        this.outColor = pb.add(this.outColor, pb.mul(this.data.sheenColor, this.sheenRadiance, this.sheenBRDF, this.occlusion));
+                    } else {
+                        this.outColor = pb.add(this.outColor, pb.mul(this.data.sheenColor, this.irradiance.rgb, this.sheenBRDF, this.occlusion));
+                    }
                 }
                 if (that.clearcoat && ctx.env.light.envLight.hasRadiance()) {
                     this.$l.NoV = pb.clamp(pb.dot(this.data.ccNormal, this.viewVec), 0.0001, 1);