@onerjs/core 8.26.4 → 8.26.6

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

@@ -238,6 +238,7 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         state._excludeVariableName("finalColor");
         state._excludeVariableName("vClipSpacePosition");
         state._excludeVariableName("vDebugMode");
+        state._excludeVariableName("vViewDepth");
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this._initShaderSourceAsync(state.shaderLanguage);
     }
@@ -570,7 +571,7 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
                 break;
             }
             const onlyUpdateBuffersList = state.uniforms.indexOf("vLightData" + lightIndex) >= 0;
-            PrepareUniformsAndSamplersForLight(lightIndex, state.uniforms, state.samplers, defines["PROJECTEDLIGHTTEXTURE" + lightIndex], uniformBuffers, onlyUpdateBuffersList, defines["IESLIGHTTEXTURE" + lightIndex]);
+            PrepareUniformsAndSamplersForLight(lightIndex, state.uniforms, state.samplers, defines["PROJECTEDLIGHTTEXTURE" + lightIndex], uniformBuffers, onlyUpdateBuffersList, defines["IESLIGHTTEXTURE" + lightIndex], defines["CLUSTLIGHT" + lightIndex]);
         }
     }
     isReady(mesh, nodeMaterial, defines) {
@@ -663,6 +664,10 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
             state.compilationString += `${state._declareLocalVar("worldPos", NodeMaterialBlockConnectionPointTypes.Vector4)} = ${worldPos.associatedVariableName};\n`;
             if (this.view.isConnected) {
                 state.compilationString += `${state._declareLocalVar("view", NodeMaterialBlockConnectionPointTypes.Matrix)} = ${this.view.associatedVariableName};\n`;
+                state._emitVaryingFromString("vViewDepth", NodeMaterialBlockConnectionPointTypes.Float);
+                state.compilationString +=
+                    (state.shaderLanguage === 1 /* ShaderLanguage.WGSL */ ? "vertexOutputs." : "") +
+                        `vViewDepth = (${this.view.associatedVariableName} * ${worldPos.associatedVariableName}).z;\n`;
             }
             state.compilationString += state._emitCodeFromInclude("shadowsVertex", comments, {
                 repeatKey: "maxSimultaneousLights",
@@ -783,17 +788,21 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         const comments = `//${this.name}`;
         const normalShading = this.perturbedNormal;
         let worldPosVarName = this.worldPosition.associatedVariableName;
+        let worldPosVarName4 = this.worldPosition.associatedVariableName;
         let worldNormalVarName = this.worldNormal.associatedVariableName;
         if (this.generateOnlyFragmentCode) {
             worldPosVarName = state._getFreeVariableName("globalWorldPos");
-            state._emitFunction("pbr_globalworldpos", isWebGPU ? `var<private> ${worldPosVarName}:vec3${state.fSuffix};\n` : `vec3${state.fSuffix} ${worldPosVarName};\n`, comments);
+            state._emitFunction("pbr_globalworldpos", `${state._declareLocalVar(worldPosVarName, NodeMaterialBlockConnectionPointTypes.Vector3, false, true)};\n`, comments);
             state.compilationString += `${worldPosVarName} = ${this.worldPosition.associatedVariableName}.xyz;\n`;
+            worldPosVarName4 = state._getFreeVariableName("globalWorldPos4");
+            state._emitFunction("pbr_globalworldpos4", `${state._declareLocalVar(worldPosVarName4, NodeMaterialBlockConnectionPointTypes.Vector4, false, true)};\n`, comments);
+            state.compilationString += `${worldPosVarName4} = ${this.worldPosition.associatedVariableName};\n`;
             worldNormalVarName = state._getFreeVariableName("globalWorldNormal");
-            state._emitFunction("pbr_globalworldnorm", isWebGPU ? `var<private> ${worldNormalVarName}:vec4${state.fSuffix};\n` : `vec4${state.fSuffix} ${worldNormalVarName};\n`, comments);
+            state._emitFunction("pbr_globalworldnorm", `${state._declareLocalVar(worldNormalVarName, NodeMaterialBlockConnectionPointTypes.Vector4, false, true)};\n`, comments);
             state.compilationString += `${worldNormalVarName} = ${this.worldNormal.associatedVariableName};\n`;
             state.compilationString += state._emitCodeFromInclude("shadowsVertex", comments, {
                 repeatKey: "maxSimultaneousLights",
-                substitutionVars: this.generateOnlyFragmentCode ? `worldPos,${this.worldPosition.associatedVariableName}` : undefined,
+                substitutionVars: `worldPos,${this.worldPosition.associatedVariableName}`,
             });
             state.compilationString += `#if DEBUGMODE > 0\n`;
             state.compilationString += `${state._declareLocalVar("vClipSpacePosition", NodeMaterialBlockConnectionPointTypes.Vector4)} = vec4${state.fSuffix}((vec2${state.fSuffix}(${isWebGPU ? "fragmentInputs.position" : "gl_FragCoord.xy"}) / vec2${state.fSuffix}(1.0)) * 2.0 - 1.0, 0.0, 1.0);\n`;
@@ -827,6 +836,9 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         // Includes
         //
         if (!this.light) {
+            if (this.generateOnlyFragmentCode && this.view.isConnected) {
+                state.compilationString += `${state._declareLocalVar("vViewDepth", NodeMaterialBlockConnectionPointTypes.Float)} = (${this.view.associatedVariableName} * ${worldPosVarName4}).z;\n`;
+            }
             // Emit for all lights
             state._emitFunctionFromInclude(state.supportUniformBuffers ? "lightUboDeclaration" : "lightFragmentDeclaration", comments, {
                 repeatKey: "maxSimultaneousLights",
@@ -857,6 +869,10 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
         state._emitFunctionFromInclude("pbrBlockAmbientOcclusion", comments);
         state._emitFunctionFromInclude("pbrBlockAlphaFresnel", comments);
         state._emitFunctionFromInclude("pbrBlockAnisotropic", comments);
+        if (!isWebGPU) {
+            // In WebGPU, those functions are part of pbrDirectLightingFunctions
+            state._emitFunctionFromInclude("pbrClusteredLightingFunctions", comments);
+        }
         //
         // code
         //
@@ -1010,9 +1026,16 @@ export class PBRMetallicRoughnessBlock extends NodeMaterialBlock {
             });
         }
         else {
+            let substitutionVars = `vPositionW,${worldPosVarName}.xyz`;
+            if (isWebGPU) {
+                substitutionVars = "fragmentInputs." + substitutionVars;
+                if (this.generateOnlyFragmentCode) {
+                    substitutionVars += `,fragmentInputs.vViewDepth,vViewDepth`;
+                }
+            }
             state.compilationString += state._emitCodeFromInclude("lightFragment", comments, {
                 repeatKey: "maxSimultaneousLights",
-                substitutionVars: `${isWebGPU ? "fragmentInputs." : ""}vPositionW,${worldPosVarName}.xyz,uniforms.vReflectivityColor,vReflectivityColor`,
+                substitutionVars: substitutionVars + ",uniforms.vReflectivityColor,vReflectivityColor",
             });
         }
         // _____________________________ Compute Final Lit Components ________________________