fix: name

galacean · Dec 19, 2024 · adfdfec · adfdfec
1 parent 1fc002e
commit adfdfec
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/packages/core/src/material/PBRMaterial.ts b/packages/core/src/material/PBRMaterial.ts
@@ -33,11 +33,11 @@ export class PBRMaterial extends PBRBaseMaterial {
 
   private _refractionEnabled = false;
   private static _refactionMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_ENABLE_SS_REFRACTION");
-  private static _transmissionProp = ShaderProperty.getByName("material_transmission");
+  private static _transmissionProp = ShaderProperty.getByName("material_Transmission");
   private static _transmissionTextureProp = ShaderProperty.getByName("material_TransmissionTexture");
-  private static _attenuationColorProp = ShaderProperty.getByName("material_attenuationColor");
-  private static _attenuationDistanceProp = ShaderProperty.getByName("material_attenuationDistance");
-  private static _thicknessProp = ShaderProperty.getByName("material_thickness");
+  private static _attenuationColorProp = ShaderProperty.getByName("material_AttenuationColor");
+  private static _attenuationDistanceProp = ShaderProperty.getByName("material_AttenuationDistance");
+  private static _thicknessProp = ShaderProperty.getByName("material_Thickness");
   private static _thicknessTextureProp = ShaderProperty.getByName("material_ThicknessTexture");
   /**
    * Index Of Refraction.

diff --git a/packages/shader-shaderlab/src/shaders/PBR.gs b/packages/shader-shaderlab/src/shaders/PBR.gs
@@ -54,6 +54,15 @@ Shader "PBR.gs" {
         material_SheenTexture("ColorTexture", Texture2D);
         material_SheenRoughnessTexture("RoughnessTexture", Texture2D);
       }
+
+      Header("Refraction"){
+        material_AttenuationColor("AttenuationColor", Color ) = (1, 1, 1, 1);
+        material_AttenuationDistance("AttenuationDistance", Range(0, 1, 0.01)) = 0;
+        material_Transmission("Transmission", Range(0, 1, 0.01)) = 0;
+        material_Thickness("Thickness", Range(0, 5, 0.01)) = 0;
+        material_TransmissionTexture("TransmissionTexture", Texture2D);
+        material_ThicknessTexture("ThicknessTexture", Texture2D);
+      }
 
       Header("Common") {
         material_AlphaCutoff( "AlphaCutoff", Range(0, 1, 0.01) ) = 0;

diff --git a/packages/shader-shaderlab/src/shaders/shadingPBR/FragmentPBR.glsl b/packages/shader-shaderlab/src/shaders/shadingPBR/FragmentPBR.glsl
@@ -63,18 +63,18 @@ float material_OcclusionTextureCoord;
 #endif
 
 #ifdef MATERIAL_ENABLE_SS_REFRACTION 
-    vec3 material_attenuationColor;
-    float material_attenuationDistance;
+    vec3 material_AttenuationColor;
+    float material_AttenuationDistance;
 
     #ifdef MATERIAL_HAS_TRANSMISSION
-    float material_transmission;
+    float material_Transmission;
         #ifdef MATERIAL_HAS_TRANSMISSION_TEXTURE
             sampler2D material_TransmissionTexture;
         #endif
     #endif
 
     #ifdef MATERIAL_HAS_THICKNESS
-        float material_thickness;
+        float material_Thickness;
         #ifdef MATERIAL_HAS_THICKNESS_TEXTURE
             sampler2D material_ThicknessTexture;
         #endif
@@ -312,12 +312,12 @@ SurfaceData getSurfaceData(Varyings v, vec2 aoUV, bool isFrontFacing){
     #endif
 
     #ifdef MATERIAL_ENABLE_SS_REFRACTION 
-        surfaceData.attenuationColor = material_attenuationColor;
+        surfaceData.attenuationColor = material_AttenuationColor;
         surfaceData.IOR = material_IOR;
-        surfaceData.attenuationDistance = max(material_attenuationDistance, 0.001);
+        surfaceData.attenuationDistance = max(material_AttenuationDistance, 0.001);
 
         #ifdef MATERIAL_HAS_TRANSMISSION
-            surfaceData.transmission = material_transmission;
+            surfaceData.transmission = material_Transmission;
             #ifdef MATERIAL_HAS_TRANSMISSION_TEXTURE
                 surfaceData.transmission *= texture2D(material_TransmissionTexture, uv).r;
             #endif
@@ -326,7 +326,7 @@ SurfaceData getSurfaceData(Varyings v, vec2 aoUV, bool isFrontFacing){
         #endif
 
         #ifdef MATERIAL_HAS_THICKNESS
-            surfaceData.thickness = max(material_thickness, 0.0);
+            surfaceData.thickness = max(material_Thickness, 0.0);
             #ifdef MATERIAL_HAS_THICKNESS_TEXTURE
                 surfaceData.thickness *= texture2D( material_ThicknessTexture, uv).g;
             #endif