From e9f348070b9b650bd766055530a73eb90239e5c1 Mon Sep 17 00:00:00 2001 From: hhhhkrx Date: Thu, 26 Dec 2024 19:52:53 +0800 Subject: [PATCH] fix: specular name --- packages/shader-shaderlab/src/shaders/shadingPBR/BRDF.glsl | 2 +- packages/shader-shaderlab/src/shaders/shadingPBR/BTDF.glsl | 2 +- .../src/shaders/shadingPBR/LightIndirectPBR.glsl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/shader-shaderlab/src/shaders/shadingPBR/BRDF.glsl b/packages/shader-shaderlab/src/shaders/shadingPBR/BRDF.glsl index 53abfee4b2..312898468d 100644 --- a/packages/shader-shaderlab/src/shaders/shadingPBR/BRDF.glsl +++ b/packages/shader-shaderlab/src/shaders/shadingPBR/BRDF.glsl @@ -395,7 +395,7 @@ void initBRDFData(SurfaceData surfaceData, out BRDFData brdfData){ brdfData.specularColor = specularColor; #endif brdfData.roughness = max(MIN_PERCEPTUAL_ROUGHNESS, min(roughness + getAARoughnessFactor(surfaceData.normal), 1.0)); - brdfData.specularDFG = envBRDFApprox(brdfData.specularColor, brdfData.roughness, surfaceData.dotNV); + brdfData.envSpecularDFG = envBRDFApprox(brdfData.specularColor, brdfData.roughness, surfaceData.dotNV); #ifdef MATERIAL_ENABLE_CLEAR_COAT brdfData.clearCoatRoughness = max(MIN_PERCEPTUAL_ROUGHNESS, min(surfaceData.clearCoatRoughness + getAARoughnessFactor(surfaceData.clearCoatNormal), 1.0)); diff --git a/packages/shader-shaderlab/src/shaders/shadingPBR/BTDF.glsl b/packages/shader-shaderlab/src/shaders/shadingPBR/BTDF.glsl index 815bc63191..bbc5fabde1 100644 --- a/packages/shader-shaderlab/src/shaders/shadingPBR/BTDF.glsl +++ b/packages/shader-shaderlab/src/shaders/shadingPBR/BTDF.glsl @@ -24,7 +24,7 @@ // Use specularFGD as an approximation of the fresnel effect // https://blog.selfshadow.com/publications/s2017-shading-course/imageworks/s2017_pbs_imageworks_slides_v2.pdf - vec3 specularDFG = brdfData.specularDFG; + vec3 specularDFG = brdfData.envSpecularDFG; refractionTransmitted *= (1.0 - specularDFG); diff --git a/packages/shader-shaderlab/src/shaders/shadingPBR/LightIndirectPBR.glsl b/packages/shader-shaderlab/src/shaders/shadingPBR/LightIndirectPBR.glsl index 32c6a6a081..f5909b683d 100644 --- a/packages/shader-shaderlab/src/shaders/shadingPBR/LightIndirectPBR.glsl +++ b/packages/shader-shaderlab/src/shaders/shadingPBR/LightIndirectPBR.glsl @@ -77,7 +77,7 @@ void evaluateSpecularIBL(Varyings varyings, SurfaceData surfaceData, BRDFData br vec3 speculaColor = brdfData.specularColor; #endif - outSpecularColor += surfaceData.specularAO * radianceAttenuation * radiance * brdfData.specularDFG; + outSpecularColor += surfaceData.specularAO * radianceAttenuation * radiance * brdfData.envSpecularDFG; } void evaluateSheenIBL(Varyings varyings, SurfaceData surfaceData, BRDFData brdfData, float radianceAttenuation, inout vec3 diffuseColor, inout vec3 specularColor){