fix: sheen

galacean · Dec 12, 2024 · 17ccc8e · 17ccc8e
1 parent 8650e81
commit 17ccc8e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/shaderlab/src/shaders/PBR.gs b/packages/shaderlab/src/shaders/PBR.gs
@@ -48,8 +48,8 @@ Shader "PBR.gs" {
       }
 
       Header("Sheen"){
-        UI_SheenIntensity("Intensity", Range(0, 1, 0.01)) = 0;
-        UI_SheenColor("Color", Color ) = (0, 0, 0, 0);
+        ui_SheenIntensity("Intensity", Range(0, 1, 0.01)) = 0;
+        ui_SheenColor("Color", Color ) = (0, 0, 0, 0);
         material_SheenRoughness("Roughness", Range(0, 1, 0.01)) = 0;
         material_SheenTexture("ColorTexture", Texture2D);
         material_SheenRoughnessTexture("RoughnessTexture", Texture2D);

diff --git a/packages/shaderlab/src/shaders/shadingPBR/BRDF.glsl b/packages/shaderlab/src/shaders/shadingPBR/BRDF.glsl
@@ -79,7 +79,7 @@ struct BRDFData{
     #endif
 
     #ifdef MATERIAL_ENABLE_SHEEN
-        float sheenRoughness;
+        float sheenPerceptualRoughness;
         float sheenScaling;
         float iblSheenDFG;
     #endif
@@ -402,8 +402,8 @@ void initBRDFData(SurfaceData surfaceData, out BRDFData brdfData){
 
     #ifdef MATERIAL_ENABLE_SHEEN
         float sheenRoughness = max(MIN_PERCEPTUAL_ROUGHNESS, min(surfaceData.sheenRoughness + getAARoughnessFactor(surfaceData.normal), 1.0));
-        brdfData.sheenRoughness = pow2(sheenRoughness);
-        brdfData.iblSheenDFG = iblSheenDFG(surfaceData, brdfData.sheenRoughness);
+        brdfData.sheenPerceptualRoughness = pow2(sheenRoughness);
+        brdfData.iblSheenDFG = iblSheenDFG(surfaceData, brdfData.sheenPerceptualRoughness);
         brdfData.sheenScaling = 1.0 - brdfData.iblSheenDFG * max(max(surfaceData.sheenColor.r, surfaceData.sheenColor.g), surfaceData.sheenColor.b);
     #endif
 }

diff --git a/packages/shaderlab/src/shaders/shadingPBR/ReflectionLobe.glsl b/packages/shaderlab/src/shaders/shadingPBR/ReflectionLobe.glsl
@@ -14,7 +14,7 @@ void sheenLobe(Varyings varyings, SurfaceData surfaceData, BRDFData brdfData, ve
         diffuseColor *= brdfData.sheenScaling;
         specularColor *= brdfData.sheenScaling;
 
-        specularColor += attenuationIrradiance * sheenBRDF(incidentDirection, surfaceData, surfaceData.sheenColor, brdfData.sheenRoughness);
+        specularColor += attenuationIrradiance * sheenBRDF(incidentDirection, surfaceData, surfaceData.sheenColor, brdfData.sheenPerceptualRoughness);
     #endif
 }